Commit e052860d authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v5.6/ti-sysc-drop-pdata-signed' of... 

Merge tag 'omap-for-v5.6/ti-sysc-drop-pdata-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/dt

Drop more legacy platform data for omaps for v5.6 merge window

We can now probe devices with ti-sysc interconnect driver and dts
data, and can continue dropping the related platform data and custom
ti,hwmods dts property for various devices.

And related to that, we finally can remove the legacy sdma support in
favor of using the dmaengine driver only. I was planning to send the
sdma changes separately, but that would have produced a pile of
pointless merge conflicts, so I decided it's best to resolve it locally.
After all, the sdma series also ends up removing the related platform
data.

Note that this series is based on omap-for-v5.6/ti-sysc-dt-signed branch
as it depends for dts data being in place.

* tag 'omap-for-v5.6/ti-sysc-drop-pdata-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (56 commits)
  ARM: OMAP2+: Drop legacy platform data for sdma
  ARM: OMAP2+: Drop legacy init for sdma
  dmaengine: ti: omap-dma: Use cpu notifier to block idle for omap2
  dmaengine: ti: omap-dma: Allocate channels directly
  dmaengine: ti: omap-dma: Pass sdma auxdata to driver and use it
  dmaengine: ti: omap-dma: Configure global priority register directly
  ARM: OMAP5: hwmod-data: remove OMAP5 IOMMU hwmod data
  ARM: OMAP4: hwmod-data: remove OMAP4 IOMMU hwmod data
  ARM: OMAP2+: Drop legacy platform data for omap4 fdif
  ARM: OMAP2+: Drop legacy platform data for omap4 slimbus
  ARM: OMAP2+: Drop legacy platform data for omap5 kbd
  ARM: OMAP2+: Drop legacy platform data for omap4 kbd
  ARM: OMAP2+: Drop legacy platform data for dra7 smartreflex
  ARM: OMAP2+: Drop legacy platform data for omap4 smartreflex
  ARM: OMAP2+: Drop legacy platform data for omap4 hsi
  ARM: OMAP2+: Drop legacy platform data for am4 vpfe
  ARM: OMAP2+: Drop legacy platform data for dra7 ocp2scp
  ARM: OMAP2+: Drop legacy platform data for omap5 ocp2scp
  ARM: OMAP2+: Drop legacy platform data for omap4 ocp2scp
  ARM: OMAP2+: Drop legacy platform data for am4 ocp2scp
  ...

Link: https://lore.kernel.org/r/pull-1578420398-290837@atomide.com-4


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 785ca50f 9fc85a71

arch/arm/boot/dts/am33xx-l4.dtsi

+0 −16
Original line number Diff line number Diff line
@@ -225,7 +225,6 @@ i2c0: i2c@0 { 


		target-module@d000 {			/* 0x44e0d000, ap 20 38.0 */

			compatible = "ti,sysc-omap4", "ti,sysc";

			ti,hwmods = "adc_tsc";

			reg = <0xd000 0x4>,

			      <0xd010 0x4>;

			reg-names = "rev", "sysc";
@@ -1009,7 +1008,6 @@ i2c1: i2c@0 { 


		target-module@30000 {			/* 0x48030000, ap 77 08.0 */

			compatible = "ti,sysc-omap2", "ti,sysc";

			ti,hwmods = "spi0";

			reg = <0x30000 0x4>,

			      <0x30110 0x4>,

			      <0x30114 0x4>;
@@ -1134,7 +1132,6 @@ timer2: timer@0 { 


		target-module@42000 {			/* 0x48042000, ap 24 1c.0 */

			compatible = "ti,sysc-omap4-timer", "ti,sysc";

			ti,hwmods = "timer3";

			reg = <0x42000 0x4>,

			      <0x42010 0x4>,

			      <0x42014 0x4>;
@@ -1160,7 +1157,6 @@ timer3: timer@0 { 


		target-module@44000 {			/* 0x48044000, ap 26 26.0 */

			compatible = "ti,sysc-omap4-timer", "ti,sysc";

			ti,hwmods = "timer4";

			reg = <0x44000 0x4>,

			      <0x44010 0x4>,

			      <0x44014 0x4>;
@@ -1187,7 +1183,6 @@ timer4: timer@0 { 


		target-module@46000 {			/* 0x48046000, ap 28 28.0 */

			compatible = "ti,sysc-omap4-timer", "ti,sysc";

			ti,hwmods = "timer5";

			reg = <0x46000 0x4>,

			      <0x46010 0x4>,

			      <0x46014 0x4>;
@@ -1214,7 +1209,6 @@ timer5: timer@0 { 


		target-module@48000 {			/* 0x48048000, ap 30 22.0 */

			compatible = "ti,sysc-omap4-timer", "ti,sysc";

			ti,hwmods = "timer6";

			reg = <0x48000 0x4>,

			      <0x48010 0x4>,

			      <0x48014 0x4>;
@@ -1241,7 +1235,6 @@ timer6: timer@0 { 


		target-module@4a000 {			/* 0x4804a000, ap 85 60.0 */

			compatible = "ti,sysc-omap4-timer", "ti,sysc";

			ti,hwmods = "timer7";

			reg = <0x4a000 0x4>,

			      <0x4a010 0x4>,

			      <0x4a014 0x4>;
@@ -1344,7 +1337,6 @@ mmc1: mmc@0 { 


		target-module@80000 {			/* 0x48080000, ap 38 18.0 */

			compatible = "ti,sysc-omap2", "ti,sysc";

			ti,hwmods = "elm";

			reg = <0x80000 0x4>,

			      <0x80010 0x4>,

			      <0x80014 0x4>;
@@ -1412,7 +1404,6 @@ mbox_wkupm3: wkup_m3 { 


		target-module@ca000 {			/* 0x480ca000, ap 91 40.0 */

			compatible = "ti,sysc-omap2", "ti,sysc";

			ti,hwmods = "spinlock";

			reg = <0xca000 0x4>,

			      <0xca010 0x4>,

			      <0xca014 0x4>;
@@ -1533,7 +1524,6 @@ i2c2: i2c@0 { 


		target-module@a0000 {			/* 0x481a0000, ap 79 24.0 */

			compatible = "ti,sysc-omap2", "ti,sysc";

			ti,hwmods = "spi1";

			reg = <0xa0000 0x4>,

			      <0xa0110 0x4>,

			      <0xa0114 0x4>;
@@ -1749,7 +1739,6 @@ target-module@cc000 { /* 0x481cc000, ap 60 46.0 */ 
			compatible = "ti,sysc-omap4", "ti,sysc";

			reg = <0xcc020 0x4>;

			reg-names = "rev";

			ti,hwmods = "d_can0";

			/* Domains (P, C): per_pwrdm, l4ls_clkdm */

			clocks = <&l4ls_clkctrl AM3_L4LS_D_CAN0_CLKCTRL 0>,

				 <&dcan0_fck>;
@@ -1773,7 +1762,6 @@ target-module@d0000 { /* 0x481d0000, ap 62 42.0 */ 
			compatible = "ti,sysc-omap4", "ti,sysc";

			reg = <0xd0020 0x4>;

			reg-names = "rev";

			ti,hwmods = "d_can1";

			/* Domains (P, C): per_pwrdm, l4ls_clkdm */

			clocks = <&l4ls_clkctrl AM3_L4LS_D_CAN1_CLKCTRL 0>,

				 <&dcan1_fck>;
@@ -1863,7 +1851,6 @@ segment@300000 { /* 0x48300000 */ 


		target-module@0 {			/* 0x48300000, ap 66 48.0 */

			compatible = "ti,sysc-omap4", "ti,sysc";

			ti,hwmods = "epwmss0";

			reg = <0x0 0x4>,

			      <0x4 0x4>;

			reg-names = "rev", "sysc";
@@ -1916,7 +1903,6 @@ ehrpwm0: pwm@200 { 


		target-module@2000 {			/* 0x48302000, ap 68 52.0 */

			compatible = "ti,sysc-omap4", "ti,sysc";

			ti,hwmods = "epwmss1";

			reg = <0x2000 0x4>,

			      <0x2004 0x4>;

			reg-names = "rev", "sysc";
@@ -1969,7 +1955,6 @@ ehrpwm1: pwm@200 { 


		target-module@4000 {			/* 0x48304000, ap 70 44.0 */

			compatible = "ti,sysc-omap4", "ti,sysc";

			ti,hwmods = "epwmss2";

			reg = <0x4000 0x4>,

			      <0x4004 0x4>;

			reg-names = "rev", "sysc";
@@ -2022,7 +2007,6 @@ ehrpwm2: pwm@200 { 


		target-module@e000 {			/* 0x4830e000, ap 72 4a.0 */

			compatible = "ti,sysc-omap4", "ti,sysc";

			ti,hwmods = "lcdc";

			reg = <0xe000 0x4>,

			      <0xe054 0x4>;

			reg-names = "rev", "sysc";

arch/arm/boot/dts/am33xx.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -441,7 +441,6 @@ gpmc: gpmc@50000000 { 


		sham_target: target-module@53100000 {

			compatible = "ti,sysc-omap3-sham", "ti,sysc";

			ti,hwmods = "sham";

			reg = <0x53100100 0x4>,

			      <0x53100110 0x4>,

			      <0x53100114 0x4>;
@@ -470,7 +469,6 @@ sham: sham@0 { 


		aes_target: target-module@53500000 {

			compatible = "ti,sysc-omap2", "ti,sysc";

			ti,hwmods = "aes";

			reg = <0x53500080 0x4>,

			      <0x53500084 0x4>,

			      <0x53500088 0x4>;

arch/arm/boot/dts/am4372.dtsi

+0 −4
Original line number Diff line number Diff line
@@ -258,7 +258,6 @@ mmc3: mmc@0 { 


		sham_target: target-module@53100000 {

			compatible = "ti,sysc-omap3-sham", "ti,sysc";

			ti,hwmods = "sham";

			reg = <0x53100100 0x4>,

			      <0x53100110 0x4>,

			      <0x53100114 0x4>;
@@ -287,7 +286,6 @@ sham: sham@0 { 


		aes_target: target-module@53501000 {

			compatible = "ti,sysc-omap2", "ti,sysc";

			ti,hwmods = "aes";

			reg = <0x53501080 0x4>,

			      <0x53501084 0x4>,

			      <0x53501088 0x4>;
@@ -318,7 +316,6 @@ aes: aes@0 { 


		des_target: target-module@53701000 {

			compatible = "ti,sysc-omap2", "ti,sysc";

			ti,hwmods = "des";

			reg = <0x53701030 0x4>,

			      <0x53701034 0x4>,

			      <0x53701038 0x4>;
@@ -369,7 +366,6 @@ gpmc: gpmc@50000000 { 


		target-module@47900000 {

			compatible = "ti,sysc-omap4", "ti,sysc";

			ti,hwmods = "qspi";

			reg = <0x47900000 0x4>,

			      <0x47900010 0x4>;

			reg-names = "rev", "sysc";

arch/arm/boot/dts/am437x-l4.dtsi

+0 −29
Original line number Diff line number Diff line
@@ -225,7 +225,6 @@ i2c0: i2c@0 { 


		target-module@d000 {			/* 0x44e0d000, ap 20 38.0 */

			compatible = "ti,sysc-omap4", "ti,sysc";

			ti,hwmods = "adc_tsc";

			reg = <0xd000 0x4>,

			      <0xd010 0x4>;

			reg-names = "rev", "sysc";
@@ -763,7 +762,6 @@ i2c1: i2c@0 { 


		target-module@30000 {			/* 0x48030000, ap 65 08.0 */

			compatible = "ti,sysc-omap2", "ti,sysc";

			ti,hwmods = "spi0";

			reg = <0x30000 0x4>,

			      <0x30110 0x4>,

			      <0x30114 0x4>;
@@ -900,7 +898,6 @@ timer2: timer@0 { 


		target-module@42000 {			/* 0x48042000, ap 20 24.0 */

			compatible = "ti,sysc-omap4-timer", "ti,sysc";

			ti,hwmods = "timer3";

			reg = <0x42000 0x4>,

			      <0x42010 0x4>,

			      <0x42014 0x4>;
@@ -927,7 +924,6 @@ timer3: timer@0 { 


		target-module@44000 {			/* 0x48044000, ap 22 26.0 */

			compatible = "ti,sysc-omap4-timer", "ti,sysc";

			ti,hwmods = "timer4";

			reg = <0x44000 0x4>,

			      <0x44010 0x4>,

			      <0x44014 0x4>;
@@ -955,7 +951,6 @@ timer4: timer@0 { 


		target-module@46000 {			/* 0x48046000, ap 24 28.0 */

			compatible = "ti,sysc-omap4-timer", "ti,sysc";

			ti,hwmods = "timer5";

			reg = <0x46000 0x4>,

			      <0x46010 0x4>,

			      <0x46014 0x4>;
@@ -983,7 +978,6 @@ timer5: timer@0 { 


		target-module@48000 {			/* 0x48048000, ap 26 1a.0 */

			compatible = "ti,sysc-omap4-timer", "ti,sysc";

			ti,hwmods = "timer6";

			reg = <0x48000 0x4>,

			      <0x48010 0x4>,

			      <0x48014 0x4>;
@@ -1011,7 +1005,6 @@ timer6: timer@0 { 


		target-module@4a000 {			/* 0x4804a000, ap 71 48.0 */

			compatible = "ti,sysc-omap4-timer", "ti,sysc";

			ti,hwmods = "timer7";

			reg = <0x4a000 0x4>,

			      <0x4a010 0x4>,

			      <0x4a014 0x4>;
@@ -1107,7 +1100,6 @@ mmc1: mmc@0 { 


		target-module@80000 {			/* 0x48080000, ap 32 18.0 */

			compatible = "ti,sysc-omap2", "ti,sysc";

			ti,hwmods = "elm";

			reg = <0x80000 0x4>,

			      <0x80010 0x4>,

			      <0x80014 0x4>;
@@ -1169,7 +1161,6 @@ mbox_wkupm3: wkup_m3 { 


		target-module@ca000 {			/* 0x480ca000, ap 77 38.0 */

			compatible = "ti,sysc-omap2", "ti,sysc";

			ti,hwmods = "spinlock";

			reg = <0xca000 0x4>,

			      <0xca010 0x4>,

			      <0xca014 0x4>;
@@ -1282,7 +1273,6 @@ i2c2: i2c@0 { 


		target-module@a0000 {			/* 0x481a0000, ap 67 2c.0 */

			compatible = "ti,sysc-omap2", "ti,sysc";

			ti,hwmods = "spi1";

			reg = <0xa0000 0x4>,

			      <0xa0110 0x4>,

			      <0xa0114 0x4>;
@@ -1313,7 +1303,6 @@ spi1: spi@0 { 


		target-module@a2000 {			/* 0x481a2000, ap 69 2e.0 */

			compatible = "ti,sysc-omap2", "ti,sysc";

			ti,hwmods = "spi2";

			reg = <0xa2000 0x4>,

			      <0xa2110 0x4>,

			      <0xa2114 0x4>;
@@ -1344,7 +1333,6 @@ spi2: spi@0 { 


		target-module@a4000 {			/* 0x481a4000, ap 92 62.0 */

			compatible = "ti,sysc-omap2", "ti,sysc";

			ti,hwmods = "spi3";

			reg = <0xa4000 0x4>,

			      <0xa4110 0x4>,

			      <0xa4114 0x4>;
@@ -1527,7 +1515,6 @@ gpio3: gpio@0 { 


		target-module@c1000 {			/* 0x481c1000, ap 94 68.0 */

			compatible = "ti,sysc-omap4-timer", "ti,sysc";

			ti,hwmods = "timer8";

			reg = <0xc1000 0x4>,

			      <0xc1010 0x4>,

			      <0xc1014 0x4>;
@@ -1556,7 +1543,6 @@ target-module@cc000 { /* 0x481cc000, ap 50 46.0 */ 
			compatible = "ti,sysc-omap4", "ti,sysc";

			reg = <0xcc020 0x4>;

			reg-names = "rev";

			ti,hwmods = "d_can0";

			/* Domains (P, C): per_pwrdm, l4ls_clkdm */

			clocks = <&l4ls_clkctrl AM4_L4LS_D_CAN0_CLKCTRL 0>;

			clock-names = "fck";
@@ -1577,7 +1563,6 @@ target-module@d0000 { /* 0x481d0000, ap 52 3a.0 */ 
			compatible = "ti,sysc-omap4", "ti,sysc";

			reg = <0xd0020 0x4>;

			reg-names = "rev";

			ti,hwmods = "d_can1";

			/* Domains (P, C): per_pwrdm, l4ls_clkdm */

			clocks = <&l4ls_clkctrl AM4_L4LS_D_CAN1_CLKCTRL 0>;

			clock-names = "fck";
@@ -1695,7 +1680,6 @@ segment@300000 { /* 0x48300000 */ 


		target-module@0 {			/* 0x48300000, ap 56 40.0 */

			compatible = "ti,sysc-omap4", "ti,sysc";

			ti,hwmods = "epwmss0";

			reg = <0x0 0x4>,

			      <0x4 0x4>;

			reg-names = "rev", "sysc";
@@ -1748,7 +1732,6 @@ ehrpwm0: pwm@200 { 


		target-module@2000 {			/* 0x48302000, ap 58 4a.0 */

			compatible = "ti,sysc-omap4", "ti,sysc";

			ti,hwmods = "epwmss1";

			reg = <0x2000 0x4>,

			      <0x2004 0x4>;

			reg-names = "rev", "sysc";
@@ -1801,7 +1784,6 @@ ehrpwm1: pwm@200 { 


		target-module@4000 {			/* 0x48304000, ap 60 44.0 */

			compatible = "ti,sysc-omap4", "ti,sysc";

			ti,hwmods = "epwmss2";

			reg = <0x4000 0x4>,

			      <0x4004 0x4>;

			reg-names = "rev", "sysc";
@@ -1854,7 +1836,6 @@ ehrpwm2: pwm@200 { 


		target-module@6000 {			/* 0x48306000, ap 96 58.0 */

			compatible = "ti,sysc-omap4", "ti,sysc";

			ti,hwmods = "epwmss3";

			reg = <0x6000 0x4>,

			      <0x6004 0x4>;

			reg-names = "rev", "sysc";
@@ -1896,7 +1877,6 @@ ehrpwm3: pwm@200 { 


		target-module@8000 {			/* 0x48308000, ap 98 54.0 */

			compatible = "ti,sysc-omap4", "ti,sysc";

			ti,hwmods = "epwmss4";

			reg = <0x8000 0x4>,

			      <0x8004 0x4>;

			reg-names = "rev", "sysc";
@@ -1938,7 +1918,6 @@ ehrpwm4: pwm@48308200 { 


		target-module@a000 {			/* 0x4830a000, ap 100 60.0 */

			compatible = "ti,sysc-omap4", "ti,sysc";

			ti,hwmods = "epwmss5";

			reg = <0xa000 0x4>,

			      <0xa004 0x4>;

			reg-names = "rev", "sysc";
@@ -2086,7 +2065,6 @@ gpio5: gpio@0 { 


		target-module@26000 {			/* 0x48326000, ap 86 66.0 */

			compatible = "ti,sysc-omap4", "ti,sysc";

			ti,hwmods = "vpfe0";

			reg = <0x26000 0x4>,

			      <0x26104 0x4>;

			reg-names = "rev", "sysc";
@@ -2113,7 +2091,6 @@ vpfe0: vpfe@0 { 


		target-module@28000 {			/* 0x48328000, ap 75 0e.0 */

			compatible = "ti,sysc-omap4", "ti,sysc";

			ti,hwmods = "vpfe1";

			reg = <0x28000 0x4>,

			      <0x28104 0x4>;

			reg-names = "rev", "sysc";
@@ -2162,7 +2139,6 @@ target-module@2a000 { /* 0x4832a000, ap 88 3c.0 */ 


		target-module@3d000 {			/* 0x4833d000, ap 102 6e.0 */

			compatible = "ti,sysc-omap4-timer", "ti,sysc";

			ti,hwmods = "timer9";

			reg = <0x3d000 0x4>,

			      <0x3d010 0x4>,

			      <0x3d014 0x4>;
@@ -2189,7 +2165,6 @@ timer9: timer@0 { 


		target-module@3f000 {			/* 0x4833f000, ap 104 5c.0 */

			compatible = "ti,sysc-omap4-timer", "ti,sysc";

			ti,hwmods = "timer10";

			reg = <0x3f000 0x4>,

			      <0x3f010 0x4>,

			      <0x3f014 0x4>;
@@ -2216,7 +2191,6 @@ timer10: timer@0 { 


		target-module@41000 {			/* 0x48341000, ap 106 76.0 */

			compatible = "ti,sysc-omap4-timer", "ti,sysc";

			ti,hwmods = "timer11";

			reg = <0x41000 0x4>,

			      <0x41010 0x4>,

			      <0x41014 0x4>;
@@ -2243,7 +2217,6 @@ timer11: timer@0 { 


		target-module@45000 {			/* 0x48345000, ap 108 6a.0 */

			compatible = "ti,sysc-omap2", "ti,sysc";

			ti,hwmods = "spi4";

			reg = <0x45000 0x4>,

			      <0x45110 0x4>,

			      <0x45114 0x4>;
@@ -2358,7 +2331,6 @@ usb1: usb@10000 { 


		target-module@a8000 {			/* 0x483a8000, ap 125 6c.0 */

			compatible = "ti,sysc-omap4", "ti,sysc";

			ti,hwmods = "ocp2scp0";

			reg = <0xa8000 0x4>;

			reg-names = "rev";

			/* Domains (P, C): per_pwrdm, l4ls_clkdm */
@@ -2440,7 +2412,6 @@ usb2: usb@10000 { 


		target-module@e8000 {			/* 0x483e8000, ap 129 78.0 */

			compatible = "ti,sysc-omap4", "ti,sysc";

			ti,hwmods = "ocp2scp1";

			reg = <0xe8000 0x4>;

			reg-names = "rev";

			/* Domains (P, C): per_pwrdm, l4ls_clkdm */

arch/arm/boot/dts/dra7-l4.dtsi

+0 −23
Original line number Diff line number Diff line
@@ -186,7 +186,6 @@ cm_core_clockdomains: clockdomains { 


		target-module@56000 {			/* 0x4a056000, ap 9 02.0 */

			compatible = "ti,sysc-omap2", "ti,sysc";

			ti,hwmods = "dma_system";

			reg = <0x56000 0x4>,

			      <0x5602c 0x4>,

			      <0x56028 0x4>;
@@ -234,7 +233,6 @@ target-module@5e000 { /* 0x4a05e000, ap 11 1a.0 */ 


		target-module@80000 {			/* 0x4a080000, ap 13 20.0 */

			compatible = "ti,sysc-omap2", "ti,sysc";

			ti,hwmods = "ocp2scp1";

			reg = <0x80000 0x4>,

			      <0x80010 0x4>,

			      <0x80014 0x4>;
@@ -302,7 +300,6 @@ usb3_phy1: phy@4400 { 


		target-module@90000 {			/* 0x4a090000, ap 59 42.0 */

			compatible = "ti,sysc-omap2", "ti,sysc";

			ti,hwmods = "ocp2scp3";

			reg = <0x90000 0x4>,

			      <0x90010 0x4>,

			      <0x90014 0x4>;
@@ -394,7 +391,6 @@ target-module@a0000 { /* 0x4a0a0000, ap 15 40.0 */ 


		target-module@d9000 {			/* 0x4a0d9000, ap 17 72.0 */

			compatible = "ti,sysc-omap4-sr", "ti,sysc";

			ti,hwmods = "smartreflex_mpu";

			reg = <0xd9038 0x4>;

			reg-names = "sysc";

			ti,sysc-mask = <SYSC_OMAP3_SR_ENAWAKEUP>;
@@ -414,7 +410,6 @@ target-module@d9000 { /* 0x4a0d9000, ap 17 72.0 */ 


		target-module@dd000 {			/* 0x4a0dd000, ap 19 18.0 */

			compatible = "ti,sysc-omap4-sr", "ti,sysc";

			ti,hwmods = "smartreflex_core";

			reg = <0xdd038 0x4>;

			reg-names = "sysc";

			ti,sysc-mask = <SYSC_OMAP3_SR_ENAWAKEUP>;
@@ -471,7 +466,6 @@ mailbox1: mailbox@0 { 


		target-module@f6000 {			/* 0x4a0f6000, ap 25 78.0 */

			compatible = "ti,sysc-omap2", "ti,sysc";

			ti,hwmods = "spinlock";

			reg = <0xf6000 0x4>,

			      <0xf6010 0x4>,

			      <0xf6014 0x4>;
@@ -1233,7 +1227,6 @@ timer4: timer@0 { 


		target-module@3e000 {			/* 0x4803e000, ap 11 56.0 */

			compatible = "ti,sysc-omap4-timer", "ti,sysc";

			ti,hwmods = "timer9";

			reg = <0x3e000 0x4>,

			      <0x3e010 0x4>;

			reg-names = "rev", "sysc";
@@ -1748,7 +1741,6 @@ i2c2: i2c@0 { 


		target-module@78000 {			/* 0x48078000, ap 39 0a.0 */

			compatible = "ti,sysc-omap2", "ti,sysc";

			ti,hwmods = "elm";

			reg = <0x78000 0x4>,

			      <0x78010 0x4>,

			      <0x78014 0x4>;
@@ -1842,7 +1834,6 @@ i2c5: i2c@0 { 


		target-module@86000 {			/* 0x48086000, ap 41 5e.0 */

			compatible = "ti,sysc-omap4-timer", "ti,sysc";

			ti,hwmods = "timer10";

			reg = <0x86000 0x4>,

			      <0x86010 0x4>;

			reg-names = "rev", "sysc";
@@ -1870,7 +1861,6 @@ timer10: timer@0 { 


		target-module@88000 {			/* 0x48088000, ap 43 66.0 */

			compatible = "ti,sysc-omap4-timer", "ti,sysc";

			ti,hwmods = "timer11";

			reg = <0x88000 0x4>,

			      <0x88010 0x4>;

			reg-names = "rev", "sysc";
@@ -2046,7 +2036,6 @@ target-module@a4000 { /* 0x480a4000, ap 57 42.0 */ 


		des_target: target-module@a5000 {	/* 0x480a5000 */

			compatible = "ti,sysc-omap2", "ti,sysc";

			ti,hwmods = "des";

			reg = <0xa5030 0x4>,

			      <0xa5034 0x4>,

			      <0xa5038 0x4>;
@@ -2522,7 +2511,6 @@ atl: atl@0 { 


		target-module@3e000 {			/* 0x4843e000, ap 25 30.0 */

			compatible = "ti,sysc-omap4", "ti,sysc";

			ti,hwmods = "epwmss0";

			reg = <0x3e000 0x4>,

			      <0x3e004 0x4>;

			reg-names = "rev", "sysc";
@@ -2569,7 +2557,6 @@ ehrpwm0: pwm@200 { 


		target-module@40000 {			/* 0x48440000, ap 27 38.0 */

			compatible = "ti,sysc-omap4", "ti,sysc";

			ti,hwmods = "epwmss1";

			reg = <0x40000 0x4>,

			      <0x40004 0x4>;

			reg-names = "rev", "sysc";
@@ -2616,7 +2603,6 @@ ehrpwm1: pwm@200 { 


		target-module@42000 {			/* 0x48442000, ap 29 20.0 */

			compatible = "ti,sysc-omap4", "ti,sysc";

			ti,hwmods = "epwmss2";

			reg = <0x42000 0x4>,

			      <0x42004 0x4>;

			reg-names = "rev", "sysc";
@@ -3358,7 +3344,6 @@ target-module@1e000 { /* 0x4881e000, ap 93 2c.0 */ 


		target-module@20000 {			/* 0x48820000, ap 5 08.0 */

			compatible = "ti,sysc-omap4-timer", "ti,sysc";

			ti,hwmods = "timer5";

			reg = <0x20000 0x4>,

			      <0x20010 0x4>;

			reg-names = "rev", "sysc";
@@ -3386,7 +3371,6 @@ timer5: timer@0 { 


		target-module@22000 {			/* 0x48822000, ap 7 24.0 */

			compatible = "ti,sysc-omap4-timer", "ti,sysc";

			ti,hwmods = "timer6";

			reg = <0x22000 0x4>,

			      <0x22010 0x4>;

			reg-names = "rev", "sysc";
@@ -3414,7 +3398,6 @@ timer6: timer@0 { 


		target-module@24000 {			/* 0x48824000, ap 9 26.0 */

			compatible = "ti,sysc-omap4-timer", "ti,sysc";

			ti,hwmods = "timer7";

			reg = <0x24000 0x4>,

			      <0x24010 0x4>;

			reg-names = "rev", "sysc";
@@ -3442,7 +3425,6 @@ timer7: timer@0 { 


		target-module@26000 {			/* 0x48826000, ap 11 0c.0 */

			compatible = "ti,sysc-omap4-timer", "ti,sysc";

			ti,hwmods = "timer8";

			reg = <0x26000 0x4>,

			      <0x26010 0x4>;

			reg-names = "rev", "sysc";
@@ -3470,7 +3452,6 @@ timer8: timer@0 { 


		target-module@28000 {			/* 0x48828000, ap 13 16.0 */

			compatible = "ti,sysc-omap4-timer", "ti,sysc";

			ti,hwmods = "timer13";

			reg = <0x28000 0x4>,

			      <0x28010 0x4>;

			reg-names = "rev", "sysc";
@@ -3498,7 +3479,6 @@ timer13: timer@0 { 


		target-module@2a000 {			/* 0x4882a000, ap 15 10.0 */

			compatible = "ti,sysc-omap4-timer", "ti,sysc";

			ti,hwmods = "timer14";

			reg = <0x2a000 0x4>,

			      <0x2a010 0x4>;

			reg-names = "rev", "sysc";
@@ -3526,7 +3506,6 @@ timer14: timer@0 { 


		target-module@2c000 {			/* 0x4882c000, ap 17 02.0 */

			compatible = "ti,sysc-omap4-timer", "ti,sysc";

			ti,hwmods = "timer15";

			reg = <0x2c000 0x4>,

			      <0x2c010 0x4>;

			reg-names = "rev", "sysc";
@@ -3554,7 +3533,6 @@ timer15: timer@0 { 


		target-module@2e000 {			/* 0x4882e000, ap 19 14.0 */

			compatible = "ti,sysc-omap4-timer", "ti,sysc";

			ti,hwmods = "timer16";

			reg = <0x2e000 0x4>,

			      <0x2e010 0x4>;

			reg-names = "rev", "sysc";
@@ -4454,7 +4432,6 @@ segment@20000 { /* 0x4ae20000 */ 


		target-module@0 {			/* 0x4ae20000, ap 19 08.0 */

			compatible = "ti,sysc-omap4-timer", "ti,sysc";

			ti,hwmods = "timer12";

			reg = <0x0 0x4>,

			      <0x10 0x4>;

			reg-names = "rev", "sysc";