Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: Update omap3 musb to probe with ti-sysc

We can drop the legacy booting for the related musb driver if we update
the omap3 SoCs variants to boot using ti-sysc interconnect target module.

devicetree@vger.kernel.org
Cc: H. Nikolaus Schaller <hns@goldelico.com>
Tested-by: Sicelo A. Mhlongo <absicsz@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

+69 -17
+30 -8
arch/arm/boot/dts/am3517.dtsi
··· 49 49 }; 50 50 51 51 ocp@68000000 { 52 - am35x_otg_hs: am35x_otg_hs@5c040000 { 53 - compatible = "ti,omap3-musb"; 54 - ti,hwmods = "am35x_otg_hs"; 55 - status = "disabled"; 56 - reg = <0x5c040000 0x1000>; 57 - interrupts = <71>; 58 - interrupt-names = "mc"; 52 + target-module@5c040000 { 53 + compatible = "ti,sysc-omap2", "ti,sysc"; 54 + reg = <0x5c040400 0x4>, 55 + <0x5c040404 0x4>, 56 + <0x5c040408 0x4>; 57 + reg-names = "rev", "sysc", "syss"; 58 + ti,sysc-mask = <(SYSC_OMAP2_ENAWAKEUP | 59 + SYSC_OMAP2_SOFTRESET | 60 + SYSC_OMAP2_AUTOIDLE)>; 61 + ti,sysc-midle = <SYSC_IDLE_FORCE>, 62 + <SYSC_IDLE_NO>, 63 + <SYSC_IDLE_SMART>; 64 + ti,sysc-sidle = <SYSC_IDLE_FORCE>, 65 + <SYSC_IDLE_NO>, 66 + <SYSC_IDLE_SMART>; 67 + ti,syss-mask = <1>; 68 + clocks = <&hsotgusb_ick_am35xx>; 69 + clock-names = "fck"; 70 + #address-cells = <1>; 71 + #size-cells = <1>; 72 + ranges = <0x0 0x5c040000 0x1000>; 73 + 74 + am35x_otg_hs: am35x_otg_hs@0 { 75 + compatible = "ti,omap3-musb"; 76 + status = "disabled"; 77 + reg = <0 0x1000>; 78 + interrupts = <71>; 79 + interrupt-names = "mc"; 80 + }; 59 81 }; 60 82 61 83 davinci_emac: ethernet@5c000000 { ··· 176 154 }; 177 155 178 156 /* Table Table 5-79 of the TRM shows 480ab000 is reserved */ 179 - &usb_otg_hs { 157 + &usb_otg_target { 180 158 status = "disabled"; 181 159 }; 182 160
+31 -9
arch/arm/boot/dts/omap3.dtsi
··· 893 893 #gpio-cells = <2>; 894 894 }; 895 895 896 - usb_otg_hs: usb_otg_hs@480ab000 { 897 - compatible = "ti,omap3-musb"; 898 - reg = <0x480ab000 0x1000>; 899 - interrupts = <92>, <93>; 900 - interrupt-names = "mc", "dma"; 901 - ti,hwmods = "usb_otg_hs"; 902 - multipoint = <1>; 903 - num-eps = <16>; 904 - ram-bits = <12>; 896 + usb_otg_target: target-module@480ab000 { 897 + compatible = "ti,sysc-omap2", "ti,sysc"; 898 + reg = <0x480ab400 0x4>, 899 + <0x480ab404 0x4>, 900 + <0x480ab408 0x4>; 901 + reg-names = "rev", "sysc", "syss"; 902 + ti,sysc-mask = <(SYSC_OMAP2_ENAWAKEUP | 903 + SYSC_OMAP2_SOFTRESET | 904 + SYSC_OMAP2_AUTOIDLE)>; 905 + ti,sysc-midle = <SYSC_IDLE_FORCE>, 906 + <SYSC_IDLE_NO>, 907 + <SYSC_IDLE_SMART>; 908 + ti,sysc-sidle = <SYSC_IDLE_FORCE>, 909 + <SYSC_IDLE_NO>, 910 + <SYSC_IDLE_SMART>; 911 + ti,syss-mask = <1>; 912 + /* Clock defined in the SoC specific dtsi file */ 913 + clock-names = "fck"; 914 + #address-cells = <1>; 915 + #size-cells = <1>; 916 + ranges = <0x0 0x480ab000 0x1000>; 917 + 918 + usb_otg_hs: usb@0 { 919 + compatible = "ti,omap3-musb"; 920 + reg = <0 0x1000>; 921 + interrupts = <92>, <93>; 922 + interrupt-names = "mc", "dma"; 923 + multipoint = <1>; 924 + num-eps = <16>; 925 + ram-bits = <12>; 926 + }; 905 927 }; 906 928 907 929 dss: dss@48050000 {
+4
arch/arm/boot/dts/omap34xx.dtsi
··· 189 189 "ssi_ick"; 190 190 }; 191 191 192 + &usb_otg_target { 193 + clocks = <&hsotgusb_ick_3430es2>; 194 + }; 195 + 192 196 /include/ "omap34xx-omap36xx-clocks.dtsi" 193 197 /include/ "omap36xx-omap3430es2plus-clocks.dtsi" 194 198 /include/ "omap36xx-am35xx-omap3430es2plus-clocks.dtsi"
+4
arch/arm/boot/dts/omap36xx.dtsi
··· 240 240 "ssi_ick"; 241 241 }; 242 242 243 + &usb_otg_target { 244 + clocks = <&hsotgusb_ick_3430es2>; 245 + }; 246 + 243 247 /include/ "omap34xx-omap36xx-clocks.dtsi" 244 248 /include/ "omap36xx-omap3430es2plus-clocks.dtsi" 245 249 /include/ "omap36xx-am35xx-omap3430es2plus-clocks.dtsi"