drop selected platform data for am3 and am4
Subsystems (5)
Tony Lindgren
maintainercover drop selected platform data for am3 and am4
With the pending patches for ti-sysc interconnect target module driver, we can now drop legacy platform data for selected devices.
This series depends on the following pathces:
[PATCH 0/7] omap changes to allocate struct omap_hwmod dynamically [PATCH 00/14] ti-sysc changes to probe devices with dts data only
Additionally am3 depends on the following fix:
[PATCH] ARM: dts: Fix dcan clkctrl clock for am3
Tony Lindgren (4):
ARM: OMAP2+: Drop mmc platform data for am330x and am43xx
ARM: OMAP2+: Drop i2c platform data for am33xx and am43xx
ARM: OMAP2+: Drop gpio platform data for am33xx and am43xx
ARM: OMAP2+: Drop uart platform data for am33xx and am43xx
.../omap_hwmod_33xx_43xx_common_data.h | 29 -- .../omap_hwmod_33xx_43xx_interconnect_data.c | 103 ------- .../omap_hwmod_33xx_43xx_ipblock_data.c | 253 ------------------ arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 64 ----- arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 113 -------- 5 files changed, 562 deletions(-)
Signature · 1 line
2.21.0
Tony Lindgren
maintainerPATCH 1/4 ARM: OMAP2+: Drop mmc platform data for am330x and am43xx
We can now drop legacy platform data one interconnect target module at a time in favor of the device tree based data that has been added earlier.
--- .../omap_hwmod_33xx_43xx_common_data.h | 6 -- .../omap_hwmod_33xx_43xx_interconnect_data.c | 24 ------ .../omap_hwmod_33xx_43xx_ipblock_data.c | 77 ------------------- arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 3 - arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 3 - 5 files changed, 113 deletions(-)
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h +0 -6
@@ -45,9 +45,6 @@ extern struct omap_hwmod_ocp_if am33xx_l4_per__mailbox;extern struct omap_hwmod_ocp_if am33xx_l4_ls__spinlock;extern struct omap_hwmod_ocp_if am33xx_l4_ls__mcasp0;extern struct omap_hwmod_ocp_if am33xx_l4_ls__mcasp1; -extern struct omap_hwmod_ocp_if am33xx_l4_ls__mmc0; -extern struct omap_hwmod_ocp_if am33xx_l4_ls__mmc1; -extern struct omap_hwmod_ocp_if am33xx_l3_s__mmc2;extern struct omap_hwmod_ocp_if am33xx_l4_ls__mcspi0;extern struct omap_hwmod_ocp_if am33xx_l4_ls__mcspi1;extern struct omap_hwmod_ocp_if am33xx_l4_ls__timer2;
@@ -103,9 +100,6 @@ extern struct omap_hwmod am33xx_i2c3_hwmod;extern struct omap_hwmod am33xx_mailbox_hwmod;extern struct omap_hwmod am33xx_mcasp0_hwmod;extern struct omap_hwmod am33xx_mcasp1_hwmod; -extern struct omap_hwmod am33xx_mmc0_hwmod; -extern struct omap_hwmod am33xx_mmc1_hwmod; -extern struct omap_hwmod am33xx_mmc2_hwmod;extern struct omap_hwmod am33xx_rtc_hwmod;extern struct omap_hwmod am33xx_spi0_hwmod;extern struct omap_hwmod am33xx_spi1_hwmod;
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c +0 -24
@@ -235,30 +235,6 @@ struct omap_hwmod_ocp_if am33xx_l4_ls__mcasp1 = { .user = OCP_USER_MPU, }; -/* l4 ls -> mmc0 */ -struct omap_hwmod_ocp_if am33xx_l4_ls__mmc0 = { - .master = &am33xx_l4_ls_hwmod, - .slave = &am33xx_mmc0_hwmod, - .clk ="l4ls_gclk" , - .user =OCP_USER_MPU , -}; - -/* l4 ls -> mmc1 */ -struct omap_hwmod_ocp_if am33xx_l4_ls__mmc1 = { - .master = &am33xx_l4_ls_hwmod, - .slave = &am33xx_mmc1_hwmod, - .clk ="l4ls_gclk" , - .user =OCP_USER_MPU , -}; - -/* l3 s -> mmc2 */ -struct omap_hwmod_ocp_if am33xx_l3_s__mmc2 = { - .master = &am33xx_l3_s_hwmod, - .slave = &am33xx_mmc2_hwmod, - .clk ="l3s_gclk" , - .user =OCP_USER_MPU , -}; -/* l4 ls -> mcspi0 */ struct omap_hwmod_ocp_if am33xx_l4_ls__mcspi0 = { .master = &am33xx_l4_ls_hwmod,
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c +0 -77
113 lines not on this page · raw message
arch/arm/mach-omap2/omap_hwmod_33xx_data.c +0 -3
@@ -497,9 +497,6 @@ static struct omap_hwmod_ocp_if *am33xx_hwmod_ocp_ifs[] __initdata = { &am33xx_l4_per__mailbox, &am33xx_l4_ls__mcasp0, &am33xx_l4_ls__mcasp1, - &am33xx_l4_ls__mmc0, - &am33xx_l4_ls__mmc1, - &am33xx_l3_s__mmc2, &am33xx_l4_ls__timer2, &am33xx_l4_ls__timer3, &am33xx_l4_ls__timer4,
arch/arm/mach-omap2/omap_hwmod_43xx_data.c +0 -3
@@ -945,9 +945,6 @@ static struct omap_hwmod_ocp_if *am43xx_hwmod_ocp_ifs[] __initdata = { &am33xx_l4_per__rng, &am33xx_l4_ls__mcasp0, &am33xx_l4_ls__mcasp1, - &am33xx_l4_ls__mmc0, - &am33xx_l4_ls__mmc1, - &am33xx_l3_s__mmc2, &am33xx_l4_ls__timer2, &am33xx_l4_ls__timer3, &am33xx_l4_ls__timer4,
Signature · 1 line
2.21.0
Re: [PATCH 1/4] ARM: OMAP2+: Drop mmc platform data for am330x and am43xx
Quoted 5 lines · Tony Lindgren
We can now drop legacy platform data one interconnect target module at a time in favor of the device tree based data that has been added earlier.
Signed-off-by Tony Lindgren <[email protected]>---
This breaks wifi on BeagleBone Blue (found via git bisect). In dmesg, I see:
platform 47810000.mmc: Cannot lookup hwmod 'mmc3'
How can we fix it?
Tony Lindgren
maintainerRe: [PATCH 1/4] ARM: OMAP2+: Drop mmc platform data for am330x and am43xx
Hi,
Quoted 10 lines · David Lechner
Quoted 5 lines · Tony Lindgren
We can now drop legacy platform data one interconnect target module at a time in favor of the device tree based data that has been added earlier.
Signed-off-by Tony Lindgren <[email protected]>---
This breaks wifi on BeagleBone Blue (found via git bisect). In dmesg, I see:
platform 47810000.mmc: Cannot lookup hwmod 'mmc3'
Thanks for letting me know and sorry for breaking it.
Quoted 1 line
How can we fix it?
The warning you pasted above hints that we're still trying to probe mmc3 using platform data, and that data no longer exists.
Looks like I've completely missed updating the dts file for mmc3 that is directly on the l3 interconnect instead of l4 like all the other mmc instances. The same applies for am4 too, and I've also left some "ti,hwmods" properties around too..
Care to try the following patch and see if it fixes the issue for you?
I've only boot tested on bbb and am437x-idk and made sure the mmc instance probes. But my beaglebone blue lost it's serial connector and pads so I have not been testing on it.
Regards,
Tony
8< ----------
arch/arm/boot/dts/am33xx-l4.dtsi +0 -2
@@ -1312,7 +1312,6 @@ target-module@60000 { /* 0x48060000, ap 36 0c.0 */ compatible = "ti,sysc-omap2", "ti,sysc"; - ti,hwmods = "mmc1"; reg = <0x602fc 0x4>, <0x60110 0x4>, <0x60114 0x4>;
@@ -1802,7 +1801,6 @@ target-module@d8000 { /* 0x481d8000, ap 64 66.0 */ compatible = "ti,sysc-omap2", "ti,sysc"; - ti,hwmods = "mmc2"; reg = <0xd82fc 0x4>, <0xd8110 0x4>, <0xd8114 0x4>;
arch/arm/boot/dts/am33xx.dtsi +26 -7
@@ -234,13 +234,32 @@ interrupt-names = "edma3_tcerrint"; }; - mmc3: mmc@47810000 { - compatible = "ti,omap4-hsmmc"; - ti,hwmods = "mmc3"; - ti,needs-special-reset; - interrupts = <29>; - reg = <0x47810000 0x1000>; - status = "disabled"; + target-module@47810000 { + compatible = "ti,sysc-omap2", "ti,sysc"; + reg = <0x478102fc 0x4>, + <0x47810110 0x4>, + <0x47810114 0x4>; + reg-names = "rev", "sysc", "syss"; + ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY | + SYSC_OMAP2_ENAWAKEUP | + SYSC_OMAP2_SOFTRESET | + SYSC_OMAP2_AUTOIDLE)>; + ti,sysc-sidle = <SYSC_IDLE_FORCE>, + <SYSC_IDLE_NO>, + <SYSC_IDLE_SMART>; + ti,syss-mask = <1>; + clocks = <&l3s_clkctrl AM3_L3S_MMC3_CLKCTRL 0>; + clock-names = "fck"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x47810000 0x1000>; + + mmc3: mmc@0 { + compatible = "ti,omap4-hsmmc"; + ti,needs-special-reset; + interrupts = <29>; + reg = <0x0 0x1000>; + }; }; usb: usb@47400000 {
arch/arm/boot/dts/am4372.dtsi +26 -7
@@ -228,13 +228,32 @@ interrupt-names = "edma3_tcerrint"; }; - mmc3: mmc@47810000 { - compatible = "ti,omap4-hsmmc"; - reg = <0x47810000 0x1000>; - ti,hwmods = "mmc3"; - ti,needs-special-reset; - interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>; - status = "disabled"; + target-module@47810000 { + compatible = "ti,sysc-omap2", "ti,sysc"; + reg = <0x478102fc 0x4>, + <0x47810110 0x4>, + <0x47810114 0x4>; + reg-names = "rev", "sysc", "syss"; + ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY | + SYSC_OMAP2_ENAWAKEUP | + SYSC_OMAP2_SOFTRESET | + SYSC_OMAP2_AUTOIDLE)>; + ti,sysc-sidle = <SYSC_IDLE_FORCE>, + <SYSC_IDLE_NO>, + <SYSC_IDLE_SMART>; + ti,syss-mask = <1>; + clocks = <&l3s_clkctrl AM4_L3S_MMC3_CLKCTRL 0>; + clock-names = "fck"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x47810000 0x1000>; + + mmc3: mmc@0 { + compatible = "ti,omap4-hsmmc"; + ti,needs-special-reset; + interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>; + reg = <0x0 0x1000>; + }; }; sham: sham@53100000 {
arch/arm/boot/dts/am437x-l4.dtsi +0 -2
@@ -1085,7 +1085,6 @@ target-module@60000 { /* 0x48060000, ap 30 14.0 */ compatible = "ti,sysc-omap2", "ti,sysc"; - ti,hwmods = "mmc1"; reg = <0x602fc 0x4>, <0x60110 0x4>, <0x60114 0x4>;
@@ -1612,7 +1611,6 @@ target-module@d8000 { /* 0x481d8000, ap 54 5e.0 */ compatible = "ti,sysc-omap2", "ti,sysc"; - ti,hwmods = "mmc2"; reg = <0xd82fc 0x4>, <0xd8110 0x4>, <0xd8114 0x4>;
Signature · 1 line
2.21.0
Tony Lindgren
maintainerRe: [PATCH 1/4] ARM: OMAP2+: Drop mmc platform data for am330x and am43xx
Quoted 19 lines · Tony Lindgren
Quoted 10 lines · David Lechner
Quoted 5 lines · Tony Lindgren
We can now drop legacy platform data one interconnect target module at a time in favor of the device tree based data that has been added earlier.
Signed-off-by Tony Lindgren <[email protected]>---
This breaks wifi on BeagleBone Blue (found via git bisect). In dmesg, I see:
platform 47810000.mmc: Cannot lookup hwmod 'mmc3'Thanks for letting me know and sorry for breaking it.
Quoted 1 line
How can we fix it?
The warning you pasted above hints that we're still trying to probe mmc3 using platform data, and that data no longer exists.
Quoted 7 lines
Looks like I've completely missed updating the dts file for mmc3 that is directly on the l3 interconnect instead of l4 like all the other mmc instances. The same applies for am4 too, and I've also left some "ti,hwmods" properties around too..
Care to try the following patch and see if it fixes the issue for you?
Oh I just noticed this needs to be fixed in v5.2, not in v5.3-rc series. It's best to keep the "ti,hwmods" property still around as there may be dependencies to ti-sysc driver changes in v5.3-rc series for dropping it. Below is a more minimal fix to try.
Regards,
Tony
8< -------------
arch/arm/boot/dts/am33xx.dtsi +26 -6
@@ -234,13 +234,33 @@ interrupt-names = "edma3_tcerrint"; }; - mmc3: mmc@47810000 { - compatible = "ti,omap4-hsmmc"; + target-module@47810000 { + compatible = "ti,sysc-omap2", "ti,sysc"; ti,hwmods = "mmc3"; - ti,needs-special-reset; - interrupts = <29>; - reg = <0x47810000 0x1000>; - status = "disabled"; + reg = <0x478102fc 0x4>, + <0x47810110 0x4>, + <0x47810114 0x4>; + reg-names = "rev", "sysc", "syss"; + ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY | + SYSC_OMAP2_ENAWAKEUP | + SYSC_OMAP2_SOFTRESET | + SYSC_OMAP2_AUTOIDLE)>; + ti,sysc-sidle = <SYSC_IDLE_FORCE>, + <SYSC_IDLE_NO>, + <SYSC_IDLE_SMART>; + ti,syss-mask = <1>; + clocks = <&l3s_clkctrl AM3_L3S_MMC3_CLKCTRL 0>; + clock-names = "fck"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x47810000 0x1000>; + + mmc3: mmc@0 { + compatible = "ti,omap4-hsmmc"; + ti,needs-special-reset; + interrupts = <29>; + reg = <0x0 0x1000>; + }; }; usb: usb@47400000 {
arch/arm/boot/dts/am4372.dtsi +26 -6
@@ -228,13 +228,33 @@ interrupt-names = "edma3_tcerrint"; }; - mmc3: mmc@47810000 { - compatible = "ti,omap4-hsmmc"; - reg = <0x47810000 0x1000>; + target-module@47810000 { + compatible = "ti,sysc-omap2", "ti,sysc"; ti,hwmods = "mmc3"; - ti,needs-special-reset; - interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>; - status = "disabled"; + reg = <0x478102fc 0x4>, + <0x47810110 0x4>, + <0x47810114 0x4>; + reg-names = "rev", "sysc", "syss"; + ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY | + SYSC_OMAP2_ENAWAKEUP | + SYSC_OMAP2_SOFTRESET | + SYSC_OMAP2_AUTOIDLE)>; + ti,sysc-sidle = <SYSC_IDLE_FORCE>, + <SYSC_IDLE_NO>, + <SYSC_IDLE_SMART>; + ti,syss-mask = <1>; + clocks = <&l3s_clkctrl AM4_L3S_MMC3_CLKCTRL 0>; + clock-names = "fck"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x47810000 0x1000>; + + mmc3: mmc@0 { + compatible = "ti,omap4-hsmmc"; + ti,needs-special-reset; + interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>; + reg = <0x0 0x1000>; + }; }; sham: sham@53100000 {
Signature · 1 line
2.21.0
David Lechner
Tested-byRe: [PATCH 1/4] ARM: OMAP2+: Drop mmc platform data for am330x and am43xx
Quoted 115 lines · Tony Lindgren
Quoted 19 lines · Tony Lindgren
Quoted 10 lines · David Lechner
Quoted 5 lines · Tony Lindgren
We can now drop legacy platform data one interconnect target module at a time in favor of the device tree based data that has been added earlier.
Signed-off-by Tony Lindgren <[email protected]>---
This breaks wifi on BeagleBone Blue (found via git bisect). In dmesg, I see:
platform 47810000.mmc: Cannot lookup hwmod 'mmc3'Thanks for letting me know and sorry for breaking it.
Quoted 1 line
How can we fix it?
The warning you pasted above hints that we're still trying to probe mmc3 using platform data, and that data no longer exists.
Quoted 7 lines
Looks like I've completely missed updating the dts file for mmc3 that is directly on the l3 interconnect instead of l4 like all the other mmc instances. The same applies for am4 too, and I've also left some "ti,hwmods" properties around too..
Care to try the following patch and see if it fixes the issue for you?
Oh I just noticed this needs to be fixed in v5.2, not in v5.3-rc series. It's best to keep the "ti,hwmods" property still around as there may be dependencies to ti-sysc driver changes in v5.3-rc series for dropping it. Below is a more minimal fix to try.
Regards,
Tony
8< -------------
arch/arm/boot/dts/am33xx.dtsi +26
-6@@ -234,13 +234,33 @@ interrupt-names = "edma3_tcerrint"; }; - mmc3: mmc@47810000 { - compatible = "ti,omap4-hsmmc"; + target-module@47810000 { + compatible = "ti,sysc-omap2", "ti,sysc"; ti,hwmods = "mmc3"; - ti,needs-special-reset; - interrupts = <29>; - reg = <0x47810000 0x1000>; - status = "disabled"; + reg = <0x478102fc 0x4>, + <0x47810110 0x4>, + <0x47810114 0x4>; + reg-names = "rev", "sysc", "syss"; + ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY | + SYSC_OMAP2_ENAWAKEUP | + SYSC_OMAP2_SOFTRESET | + SYSC_OMAP2_AUTOIDLE)>; + ti,sysc-sidle = <SYSC_IDLE_FORCE>, + <SYSC_IDLE_NO>, + <SYSC_IDLE_SMART>; + ti,syss-mask = <1>; + clocks = <&l3s_clkctrl AM3_L3S_MMC3_CLKCTRL 0>; + clock-names = "fck"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x47810000 0x1000>; + + mmc3: mmc@0 { + compatible = "ti,omap4-hsmmc"; + ti,needs-special-reset; + interrupts = <29>; + reg = <0x0 0x1000>; + }; }; usb: usb@47400000 {arch/arm/boot/dts/am4372.dtsi +19
-6@@ -228,13 +228,33 @@ interrupt-names = "edma3_tcerrint"; }; - mmc3: mmc@47810000 { - compatible = "ti,omap4-hsmmc"; - reg = <0x47810000 0x1000>; + target-module@47810000 { + compatible = "ti,sysc-omap2", "ti,sysc"; ti,hwmods = "mmc3"; - ti,needs-special-reset; - interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>; - status = "disabled"; + reg = <0x478102fc 0x4>, + <0x47810110 0x4>, + <0x47810114 0x4>; + reg-names = "rev", "sysc", "syss"; + ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY | + SYSC_OMAP2_ENAWAKEUP | + SYSC_OMAP2_SOFTRESET | + SYSC_OMAP2_AUTOIDLE)>; + ti,sysc-sidle = <SYSC_IDLE_FORCE>, + <SYSC_IDLE_NO>, + <SYSC_IDLE_SMART>; + ti,syss-mask = <1>; + clocks = <&l3s_clkctrl AM4_L3S_MMC3_CLKCTRL 0>; + clock-names = "fck"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x47810000 0x1000>;
arch/arm/boot/dts/am4372.dtsi line 260
Quoted 10 lines
arch/arm/boot/dts/am4372.dtsi +7
-0+ + mmc3: mmc@0 { + compatible = "ti,omap4-hsmmc"; + ti,needs-special-reset; + interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>; + reg = <0x0 0x1000>; + }; }; sham: sham@53100000 {
This fixes wifi on BeagleBone Blue for me in v5.2.
Tony Lindgren
maintainerRe: [PATCH 1/4] ARM: OMAP2+: Drop mmc platform data for am330x and am43xx
Quoted 5 lines · David Lechner
Quoted 4 lines · Tony Lindgren
Oh I just noticed this needs to be fixed in v5.2, not in v5.3-rc series. It's best to keep the "ti,hwmods" property still around as there may be dependencies to ti-sysc driver changes in v5.3-rc series for dropping it. Below is a more minimal fix to try.
...
Quoted 3 lines
This fixes wifi on BeagleBone Blue for me in v5.2.
Tested-by David Lechner <[email protected]>
OK great, thanks for testing.
Regards,
Tony
Re: [PATCH 1/4] ARM: OMAP2+: Drop mmc platform data for am330x and am43xx
In reply to Tony LindgrenQuoted 156 lines · Tony Lindgren
Hi,
Quoted 10 lines · David Lechner
Quoted 5 lines · Tony Lindgren
We can now drop legacy platform data one interconnect target module at a time in favor of the device tree based data that has been added earlier.
Signed-off-by Tony Lindgren <[email protected]>---
This breaks wifi on BeagleBone Blue (found via git bisect). In dmesg, I see:
platform 47810000.mmc: Cannot lookup hwmod 'mmc3'Thanks for letting me know and sorry for breaking it.
Quoted 1 line
How can we fix it?
The warning you pasted above hints that we're still trying to probe mmc3 using platform data, and that data no longer exists.
Looks like I've completely missed updating the dts file for mmc3 that is directly on the l3 interconnect instead of l4 like all the other mmc instances. The same applies for am4 too, and I've also left some "ti,hwmods" properties around too..
Care to try the following patch and see if it fixes the issue for you?
I've only boot tested on bbb and am437x-idk and made sure the mmc instance probes. But my beaglebone blue lost it's serial connector and pads so I have not been testing on it.
Regards,
Tony
8< ----------
arch/arm/boot/dts/am33xx-l4.dtsi +0
-2@@ -1312,7 +1312,6 @@ target-module@60000 { /* 0x48060000, ap 36 0c.0 */ compatible = "ti,sysc-omap2", "ti,sysc"; - ti,hwmods = "mmc1"; reg = <0x602fc 0x4>, <0x60110 0x4>, <0x60114 0x4>;@@ -1802,7 +1801,6 @@ target-module@d8000 { /* 0x481d8000, ap 64 66.0 */ compatible = "ti,sysc-omap2", "ti,sysc"; - ti,hwmods = "mmc2"; reg = <0xd82fc 0x4>, <0xd8110 0x4>, <0xd8114 0x4>;arch/arm/boot/dts/am33xx.dtsi +26
-7@@ -234,13 +234,32 @@ interrupt-names = "edma3_tcerrint"; }; - mmc3: mmc@47810000 { - compatible = "ti,omap4-hsmmc"; - ti,hwmods = "mmc3"; - ti,needs-special-reset; - interrupts = <29>; - reg = <0x47810000 0x1000>; - status = "disabled"; + target-module@47810000 { + compatible = "ti,sysc-omap2", "ti,sysc"; + reg = <0x478102fc 0x4>, + <0x47810110 0x4>, + <0x47810114 0x4>; + reg-names = "rev", "sysc", "syss"; + ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY | + SYSC_OMAP2_ENAWAKEUP | + SYSC_OMAP2_SOFTRESET | + SYSC_OMAP2_AUTOIDLE)>; + ti,sysc-sidle = <SYSC_IDLE_FORCE>, + <SYSC_IDLE_NO>, + <SYSC_IDLE_SMART>; + ti,syss-mask = <1>; + clocks = <&l3s_clkctrl AM3_L3S_MMC3_CLKCTRL 0>; + clock-names = "fck"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x47810000 0x1000>; + + mmc3: mmc@0 { + compatible = "ti,omap4-hsmmc"; + ti,needs-special-reset; + interrupts = <29>; + reg = <0x0 0x1000>; + }; }; usb: usb@47400000 {arch/arm/boot/dts/am4372.dtsi +26
-7@@ -228,13 +228,32 @@ interrupt-names = "edma3_tcerrint"; }; - mmc3: mmc@47810000 { - compatible = "ti,omap4-hsmmc"; - reg = <0x47810000 0x1000>; - ti,hwmods = "mmc3"; - ti,needs-special-reset; - interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>; - status = "disabled"; + target-module@47810000 { + compatible = "ti,sysc-omap2", "ti,sysc"; + reg = <0x478102fc 0x4>, + <0x47810110 0x4>, + <0x47810114 0x4>; + reg-names = "rev", "sysc", "syss"; + ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY | + SYSC_OMAP2_ENAWAKEUP | + SYSC_OMAP2_SOFTRESET | + SYSC_OMAP2_AUTOIDLE)>; + ti,sysc-sidle = <SYSC_IDLE_FORCE>, + <SYSC_IDLE_NO>, + <SYSC_IDLE_SMART>; + ti,syss-mask = <1>; + clocks = <&l3s_clkctrl AM4_L3S_MMC3_CLKCTRL 0>; + clock-names = "fck"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x47810000 0x1000>; + + mmc3: mmc@0 { + compatible = "ti,omap4-hsmmc"; + ti,needs-special-reset; + interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>; + reg = <0x0 0x1000>; + }; }; sham: sham@53100000 {arch/arm/boot/dts/am437x-l4.dtsi +0
-1@@ -1085,7 +1085,6 @@ target-module@60000 { /* 0x48060000, ap 30 14.0 */ compatible = "ti,sysc-omap2", "ti,sysc"; - ti,hwmods = "mmc1"; reg = <0x602fc 0x4>, <0x60110 0x4>, <0x60114 0x4>;
arch/arm/boot/dts/am437x-l4.dtsi line 1616
Quoted 7 lines
arch/arm/boot/dts/am437x-l4.dtsi +0
-1@@ -1612,7 +1611,6 @@ target-module@d8000 { /* 0x481d8000, ap 54 5e.0 */ compatible = "ti,sysc-omap2", "ti,sysc"; - ti,hwmods = "mmc2"; reg = <0xd82fc 0x4>, <0xd8110 0x4>, <0xd8114 0x4>;
Not sure if this is related, but this is what I get on v5.3-rc1 with this patch (wifi still not working, obviously):
[ 21.952767] wlcore: wl18xx HW: 183x or 180x, PG 2.2 (ROM 0x11) [ 22.011340] ------------[ cut here ]------------ [ 22.016402] WARNING: CPU: 0 PID: 65 at /home/david/work/ev3dev2/ev3dev-kernel/net/wireless/core.c:868 wiphy_register+0x860/0xba0 [cfg80211] [ 22.029148] Modules linked in: wl18xx wlcore mac80211 libarc4 sha256_generic usb_f_mass_storage usb_f_acm u_serial usb_f_ecm sha256_arm cfg80211 usb_f_rndis u_ether evdev musb_dsps musb_hdrc libcomposite udc_core phy_am335x phy_generic cppi41 usbcore usb_common phy_am335x_control ti_am335x_adc kfifo_buf pm33xx ti_emif_sram hci_uart btbcm omap_rng rng_core ti_eqep_cnt counter bluetooth ecdh_generic bmp280_spi ecc bmp280_i2c bmp280 omap_mailbox industrialio c_can_platform c_can wlcore_sdio can_dev tps65218_pwrbutton rtc_omap wkup_m3_ipc wkup_m3_rproc remoteproc virtio musb_am335x virtio_ring at24 omap_wdt watchdog ti_am335x_tscadc leds_gpio led_class cpufreq_dt pwm_tiehrpwm autofs4 [ 22.089844] CPU: 0 PID: 65 Comm: kworker/0:3 Not tainted 5.3.0-rc1-00001-gea45fc3153f2-dirty #78 [ 22.098670] Hardware name: Generic AM33XX (Flattened Device Tree) [ 22.104818] Workqueue: events request_firmware_work_func [ 22.110187] [<c01121ac>] (unwind_backtrace) from [<c010c974>] (show_stack+0x10/0x14) [ 22.117974] [<c010c974>] (show_stack) from [<c08ae4e0>] (dump_stack+0xb4/0xd0) [ 22.125243] [<c08ae4e0>] (dump_stack) from [<c0139b3c>] (__warn+0xe4/0x110) [ 22.132244] [<c0139b3c>] (__warn) from [<c0139c80>] (warn_slowpath_null+0x3c/0x48) [ 22.140075] [<c0139c80>] (warn_slowpath_null) from [<bf254560>] (wiphy_register+0x860/0xba0 [cfg80211]) [ 22.150094] [<bf254560>] (wiphy_register [cfg80211]) from [<bf2e4eb4>] (ieee80211_register_hw+0x4d4/0xb9c [mac80211]) [ 22.161089] [<bf2e4eb4>] (ieee80211_register_hw [mac80211]) from [<bf1c8778>] (wlcore_nvs_cb+0x81c/0xae8 [wlcore]) [ 22.171553] [<bf1c8778>] (wlcore_nvs_cb [wlcore]) from [<00000000>] (0x0) [ 22.178560] ---[ end trace ae64a3cf8494a74b ]--- [ 22.183273] wlcore: ERROR unable to register mac80211 hw: -22
Tony Lindgren
maintainerRe: [PATCH 1/4] ARM: OMAP2+: Drop mmc platform data for am330x and am43xx
Hi,
Quoted 6 lines · David Lechner
Not sure if this is related, but this is what I get on v5.3-rc1 with this patch (wifi still not working, obviously):
[ 21.952767] wlcore: wl18xx HW: 183x or 180x, PG 2.2 (ROM 0x11) [ 22.011340] ------------[ cut here ]------------ [ 22.016402] WARNING: CPU: 0 PID: 65 at /home/david/work/ev3dev2/ev3dev-kernel/net/wireless/core.c:868 wiphy_register+0x860/0xba0 [cfg80211]
This one is fixed in Linux next but missed -rc1, see thread "nl80211 wlcore regression in next".
Regards,
Tony
Tony Lindgren
maintainerPATCH 2/4 ARM: OMAP2+: Drop i2c platform data for am33xx and am43xx
In reply to Tony LindgrenWe can now drop legacy platform data one interconnect target module at a time in favor of the device tree based data that has been added earlier.
--- .../omap_hwmod_33xx_43xx_common_data.h | 5 -- .../omap_hwmod_33xx_43xx_interconnect_data.c | 15 ---- .../omap_hwmod_33xx_43xx_ipblock_data.c | 68 ------------------- arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 14 ---- arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 10 --- 5 files changed, 112 deletions(-)
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h +0 -5
@@ -39,8 +39,6 @@ extern struct omap_hwmod_ocp_if am33xx_l4_ls__epwmss0;extern struct omap_hwmod_ocp_if am33xx_l4_ls__epwmss1;extern struct omap_hwmod_ocp_if am33xx_l4_ls__epwmss2;extern struct omap_hwmod_ocp_if am33xx_l3_s__gpmc; -extern struct omap_hwmod_ocp_if am33xx_l4_per__i2c2; -extern struct omap_hwmod_ocp_if am33xx_l4_per__i2c3;extern struct omap_hwmod_ocp_if am33xx_l4_per__mailbox;extern struct omap_hwmod_ocp_if am33xx_l4_ls__spinlock;extern struct omap_hwmod_ocp_if am33xx_l4_ls__mcasp0;
@@ -94,9 +92,6 @@ extern struct omap_hwmod am33xx_gpio1_hwmod;extern struct omap_hwmod am33xx_gpio2_hwmod;extern struct omap_hwmod am33xx_gpio3_hwmod;extern struct omap_hwmod am33xx_gpmc_hwmod; -extern struct omap_hwmod am33xx_i2c1_hwmod; -extern struct omap_hwmod am33xx_i2c2_hwmod; -extern struct omap_hwmod am33xx_i2c3_hwmod;extern struct omap_hwmod am33xx_mailbox_hwmod;extern struct omap_hwmod am33xx_mcasp0_hwmod;extern struct omap_hwmod am33xx_mcasp1_hwmod;
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c +0 -15
@@ -188,21 +188,6 @@ struct omap_hwmod_ocp_if am33xx_l3_s__gpmc = { .user = OCP_USER_MPU, }; -/* i2c2 */ -struct omap_hwmod_ocp_if am33xx_l4_per__i2c2 = { - .master = &am33xx_l4_ls_hwmod, - .slave = &am33xx_i2c2_hwmod, - .clk ="l4ls_gclk" , - .user =OCP_USER_MPU , -}; - -struct omap_hwmod_ocp_if am33xx_l4_per__i2c3 = { - .master = &am33xx_l4_ls_hwmod, - .slave = &am33xx_i2c3_hwmod, - .clk ="l4ls_gclk" , - .user =OCP_USER_MPU , -}; -/* l4 ls -> mailbox */ struct omap_hwmod_ocp_if am33xx_l4_per__mailbox = { .master = &am33xx_l4_ls_hwmod,
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c +0 -68
104 lines not on this page · raw message
arch/arm/mach-omap2/omap_hwmod_33xx_data.c +0 -14
@@ -14,8 +14,6 @@* GNU General Public License for more details. */ -#include <linux/platform_data/i2c-omap.h> -#include "omap_hwmod.h" #include "omap_hwmod_common_data.h"
@@ -23,7 +21,6 @@#include "cm33xx.h" #include "prm33xx.h" #include "prm-regbits-33xx.h" -#include "i2c.h" #include "wd_timer.h" #include "omap_hwmod_33xx_43xx_common_data.h"
@@ -388,14 +385,6 @@ static struct omap_hwmod_ocp_if am33xx_l4_wkup__control = { .user = OCP_USER_MPU, }; -/* L4 WKUP -> I2C1 */ -static struct omap_hwmod_ocp_if am33xx_l4_wkup__i2c1 = { - .master = &am33xx_l4_wkup_hwmod, - .slave = &am33xx_i2c1_hwmod, - .clk ="dpll_core_m4_div2_ck" , - .user =OCP_USER_MPU , -}; -/* L4 WKUP -> GPIO1 */ static struct omap_hwmod_ocp_if am33xx_l4_wkup__gpio0 = { .master = &am33xx_l4_wkup_hwmod,
@@ -482,7 +471,6 @@ static struct omap_hwmod_ocp_if *am33xx_hwmod_ocp_ifs[] __initdata = { &am33xx_l4_wkup__uart1, &am33xx_l4_wkup__timer1, &am33xx_l4_wkup__rtc, - &am33xx_l4_wkup__i2c1, &am33xx_l4_wkup__gpio0, &am33xx_l4_wkup__adc_tsc, &am33xx_l4_wkup__wd_timer1,
@@ -492,8 +480,6 @@ static struct omap_hwmod_ocp_if *am33xx_hwmod_ocp_ifs[] __initdata = { &am33xx_l4_per__gpio1, &am33xx_l4_per__gpio2, &am33xx_l4_per__gpio3, - &am33xx_l4_per__i2c2, - &am33xx_l4_per__i2c3, &am33xx_l4_per__mailbox, &am33xx_l4_ls__mcasp0, &am33xx_l4_ls__mcasp1,
arch/arm/mach-omap2/omap_hwmod_43xx_data.c +0 -10
@@ -650,13 +650,6 @@ static struct omap_hwmod_ocp_if am43xx_l4_wkup__control = { .user = OCP_USER_MPU, }; -static struct omap_hwmod_ocp_if am43xx_l4_wkup__i2c1 = { - .master = &am33xx_l4_wkup_hwmod, - .slave = &am33xx_i2c1_hwmod, - .clk ="sys_clkin_ck" , - .user =OCP_USER_MPU , -}; -static struct omap_hwmod_ocp_if am43xx_l4_wkup__gpio0 = { .master = &am33xx_l4_wkup_hwmod, .slave = &am43xx_gpio0_hwmod,
@@ -929,7 +922,6 @@ static struct omap_hwmod_ocp_if *am43xx_hwmod_ocp_ifs[] __initdata = { &am43xx_l4_wkup__smartreflex1, &am43xx_l4_wkup__uart1, &am43xx_l4_wkup__timer1, - &am43xx_l4_wkup__i2c1, &am43xx_l4_wkup__gpio0, &am43xx_l4_wkup__wd_timer1, &am43xx_l4_wkup__adc_tsc,
@@ -939,8 +931,6 @@ static struct omap_hwmod_ocp_if *am43xx_hwmod_ocp_ifs[] __initdata = { &am33xx_l4_per__gpio1, &am33xx_l4_per__gpio2, &am33xx_l4_per__gpio3, - &am33xx_l4_per__i2c2, - &am33xx_l4_per__i2c3, &am33xx_l4_per__mailbox, &am33xx_l4_per__rng, &am33xx_l4_ls__mcasp0,
Signature · 1 line
2.21.0
Tony Lindgren
maintainerPATCH 3/4 ARM: OMAP2+: Drop gpio platform data for am33xx and am43xx
In reply to Tony LindgrenWe can now drop legacy platform data one interconnect target module at a time in favor of the device tree based data that has been added earlier.
--- .../omap_hwmod_33xx_43xx_common_data.h | 7 -- .../omap_hwmod_33xx_43xx_interconnect_data.c | 24 ----- arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 33 ------- arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 87 ------------------- 4 files changed, 151 deletions(-)
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h +0 -7
@@ -30,9 +30,6 @@ extern struct omap_hwmod_ocp_if am33xx_l3_main__gfx;extern struct omap_hwmod_ocp_if am33xx_l4_wkup__rtc;extern struct omap_hwmod_ocp_if am33xx_l4_per__dcan0;extern struct omap_hwmod_ocp_if am33xx_l4_per__dcan1; -extern struct omap_hwmod_ocp_if am33xx_l4_per__gpio1; -extern struct omap_hwmod_ocp_if am33xx_l4_per__gpio2; -extern struct omap_hwmod_ocp_if am33xx_l4_per__gpio3;extern struct omap_hwmod_ocp_if am33xx_cpgmac0__mdio;extern struct omap_hwmod_ocp_if am33xx_l4_ls__elm;extern struct omap_hwmod_ocp_if am33xx_l4_ls__epwmss0;
@@ -88,9 +85,6 @@ extern struct omap_hwmod am33xx_elm_hwmod;extern struct omap_hwmod am33xx_epwmss0_hwmod;extern struct omap_hwmod am33xx_epwmss1_hwmod;extern struct omap_hwmod am33xx_epwmss2_hwmod; -extern struct omap_hwmod am33xx_gpio1_hwmod; -extern struct omap_hwmod am33xx_gpio2_hwmod; -extern struct omap_hwmod am33xx_gpio3_hwmod;extern struct omap_hwmod am33xx_gpmc_hwmod;extern struct omap_hwmod am33xx_mailbox_hwmod;extern struct omap_hwmod am33xx_mcasp0_hwmod;
@@ -122,7 +116,6 @@ extern struct omap_hwmod_class am33xx_emif_hwmod_class;extern struct omap_hwmod_class am33xx_l4_hwmod_class;extern struct omap_hwmod_class am33xx_wkup_m3_hwmod_class;extern struct omap_hwmod_class am33xx_control_hwmod_class; -extern struct omap_hwmod_class am33xx_gpio_hwmod_class;extern struct omap_hwmod_class am33xx_timer_hwmod_class;extern struct omap_hwmod_class am33xx_epwmss_hwmod_class;extern struct omap_hwmod_class am33xx_ehrpwm_hwmod_class;
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c +0 -24
@@ -122,30 +122,6 @@ struct omap_hwmod_ocp_if am33xx_l4_per__dcan1 = { .user = OCP_USER_MPU | OCP_USER_SDMA, }; -/* l4 per/ls -> GPIO2 */ -struct omap_hwmod_ocp_if am33xx_l4_per__gpio1 = { - .master = &am33xx_l4_ls_hwmod, - .slave = &am33xx_gpio1_hwmod, - .clk ="l4ls_gclk" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4 per/ls -> gpio3 */ -struct omap_hwmod_ocp_if am33xx_l4_per__gpio2 = { - .master = &am33xx_l4_ls_hwmod, - .slave = &am33xx_gpio2_hwmod, - .clk ="l4ls_gclk" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; - -/* l4 per/ls -> gpio4 */ -struct omap_hwmod_ocp_if am33xx_l4_per__gpio3 = { - .master = &am33xx_l4_ls_hwmod, - .slave = &am33xx_gpio3_hwmod, - .clk ="l4ls_gclk" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; -struct omap_hwmod_ocp_if am33xx_cpgmac0__mdio = { .master = &am33xx_cpgmac0_hwmod, .slave = &am33xx_mdio_hwmod,
arch/arm/mach-omap2/omap_hwmod_33xx_data.c +0 -33
@@ -227,27 +227,6 @@ static struct omap_hwmod am33xx_control_hwmod = { }, }; -/* gpio0 */ -static struct omap_hwmod_opt_clk gpio0_opt_clks[] = { - { .role ="dbclk" , .clk ="gpio0_dbclk" }, -}; - -static struct omap_hwmod am33xx_gpio0_hwmod = { - .name ="gpio1" , - .class = &am33xx_gpio_hwmod_class, - .clkdm_name ="l4_wkup_clkdm" , - .flags =HWMOD_CONTROL_OPT_CLKS_IN_RESET , - .main_clk ="dpll_core_m4_div2_ck" , - .prcm = { - .omap4 = { - .clkctrl_offs =AM33XX_CM_WKUP_GPIO0_CLKCTRL_OFFSET , - .modulemode =MODULEMODE_SWCTRL , - }, - }, - .opt_clks = gpio0_opt_clks, - .opt_clks_cnt =ARRAY_SIZE (gpio0_opt_clks), -}; -/* lcdc */ static struct omap_hwmod_class_sysconfig lcdc_sysc = { .rev_offs =0x0 ,
@@ -385,14 +364,6 @@ static struct omap_hwmod_ocp_if am33xx_l4_wkup__control = { .user = OCP_USER_MPU, }; -/* L4 WKUP -> GPIO1 */ -static struct omap_hwmod_ocp_if am33xx_l4_wkup__gpio0 = { - .master = &am33xx_l4_wkup_hwmod, - .slave = &am33xx_gpio0_hwmod, - .clk ="dpll_core_m4_div2_ck" , - .user =OCP_USER_MPU |OCP_USER_SDMA , -}; -/* L4 WKUP -> ADC_TSC */ static struct omap_hwmod_ocp_if am33xx_l4_wkup__adc_tsc = { .master = &am33xx_l4_wkup_hwmod,
@@ -471,15 +442,11 @@ static struct omap_hwmod_ocp_if *am33xx_hwmod_ocp_ifs[] __initdata = { &am33xx_l4_wkup__uart1, &am33xx_l4_wkup__timer1, &am33xx_l4_wkup__rtc, - &am33xx_l4_wkup__gpio0, &am33xx_l4_wkup__adc_tsc, &am33xx_l4_wkup__wd_timer1, &am33xx_l4_hs__pruss, &am33xx_l4_per__dcan0, &am33xx_l4_per__dcan1, - &am33xx_l4_per__gpio1, - &am33xx_l4_per__gpio2, - &am33xx_l4_per__gpio3, &am33xx_l4_per__mailbox, &am33xx_l4_ls__mcasp0, &am33xx_l4_ls__mcasp1,
arch/arm/mach-omap2/omap_hwmod_43xx_data.c +0 -87
128 lines not on this page · raw message
Signature · 1 line
2.21.0
Tony Lindgren
maintainerPATCH 4/4 ARM: OMAP2+: Drop uart platform data for am33xx and am43xx
In reply to Tony LindgrenWe can now drop legacy platform data one interconnect target module at a time in favor of the device tree based data that has been added earlier.
--- .../omap_hwmod_33xx_43xx_common_data.h | 11 -- .../omap_hwmod_33xx_43xx_interconnect_data.c | 40 ------- .../omap_hwmod_33xx_43xx_ipblock_data.c | 108 ------------------ arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 14 --- arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 13 --- 5 files changed, 186 deletions(-)
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h +0 -11
@@ -52,11 +52,6 @@ extern struct omap_hwmod_ocp_if am33xx_l3_main__tpcc;extern struct omap_hwmod_ocp_if am33xx_l3_main__tptc0;extern struct omap_hwmod_ocp_if am33xx_l3_main__tptc1;extern struct omap_hwmod_ocp_if am33xx_l3_main__tptc2; -extern struct omap_hwmod_ocp_if am33xx_l4_ls__uart2; -extern struct omap_hwmod_ocp_if am33xx_l4_ls__uart3; -extern struct omap_hwmod_ocp_if am33xx_l4_ls__uart4; -extern struct omap_hwmod_ocp_if am33xx_l4_ls__uart5; -extern struct omap_hwmod_ocp_if am33xx_l4_ls__uart6;extern struct omap_hwmod_ocp_if am33xx_l3_main__ocmc;extern struct omap_hwmod_ocp_if am33xx_l3_main__sha0;extern struct omap_hwmod_ocp_if am33xx_l3_main__aes0;
@@ -104,12 +99,6 @@ extern struct omap_hwmod am33xx_tpcc_hwmod;extern struct omap_hwmod am33xx_tptc0_hwmod;extern struct omap_hwmod am33xx_tptc1_hwmod;extern struct omap_hwmod am33xx_tptc2_hwmod; -extern struct omap_hwmod am33xx_uart1_hwmod; -extern struct omap_hwmod am33xx_uart2_hwmod; -extern struct omap_hwmod am33xx_uart3_hwmod; -extern struct omap_hwmod am33xx_uart4_hwmod; -extern struct omap_hwmod am33xx_uart5_hwmod; -extern struct omap_hwmod am33xx_uart6_hwmod;extern struct omap_hwmod am33xx_wd_timer1_hwmod;extern struct omap_hwmod_class am33xx_emif_hwmod_class;
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c +0 -40
@@ -292,46 +292,6 @@ struct omap_hwmod_ocp_if am33xx_l3_main__tptc2 = { .user = OCP_USER_MPU, }; -/* l4 ls -> uart2 */ -struct omap_hwmod_ocp_if am33xx_l4_ls__uart2 = { - .master = &am33xx_l4_ls_hwmod, - .slave = &am33xx_uart2_hwmod, - .clk ="l4ls_gclk" , - .user =OCP_USER_MPU , -}; - -/* l4 ls -> uart3 */ -struct omap_hwmod_ocp_if am33xx_l4_ls__uart3 = { - .master = &am33xx_l4_ls_hwmod, - .slave = &am33xx_uart3_hwmod, - .clk ="l4ls_gclk" , - .user =OCP_USER_MPU , -}; - -/* l4 ls -> uart4 */ -struct omap_hwmod_ocp_if am33xx_l4_ls__uart4 = { - .master = &am33xx_l4_ls_hwmod, - .slave = &am33xx_uart4_hwmod, - .clk ="l4ls_gclk" , - .user =OCP_USER_MPU , -}; - -/* l4 ls -> uart5 */ -struct omap_hwmod_ocp_if am33xx_l4_ls__uart5 = { - .master = &am33xx_l4_ls_hwmod, - .slave = &am33xx_uart5_hwmod, - .clk ="l4ls_gclk" , - .user =OCP_USER_MPU , -}; - -/* l4 ls -> uart6 */ -struct omap_hwmod_ocp_if am33xx_l4_ls__uart6 = { - .master = &am33xx_l4_ls_hwmod, - .slave = &am33xx_uart6_hwmod, - .clk ="l4ls_gclk" , - .user =OCP_USER_MPU , -}; -/* l3 main -> ocmc */ struct omap_hwmod_ocp_if am33xx_l3_main__ocmc = { .master = &am33xx_l3_main_hwmod,
arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c +0 -108
138 lines not on this page · raw message
arch/arm/mach-omap2/omap_hwmod_33xx_data.c +0 -14
@@ -394,14 +394,6 @@ static struct omap_hwmod_ocp_if am33xx_l4_wkup__timer1 = { .user = OCP_USER_MPU, }; -/* l4 wkup -> uart1 */ -static struct omap_hwmod_ocp_if am33xx_l4_wkup__uart1 = { - .master = &am33xx_l4_wkup_hwmod, - .slave = &am33xx_uart1_hwmod, - .clk ="dpll_core_m4_div2_ck" , - .user =OCP_USER_MPU , -}; -/* l4 wkup -> wd_timer1 */ static struct omap_hwmod_ocp_if am33xx_l4_wkup__wd_timer1 = { .master = &am33xx_l4_wkup_hwmod,
@@ -439,7 +431,6 @@ static struct omap_hwmod_ocp_if *am33xx_hwmod_ocp_ifs[] __initdata = { &am33xx_l4_wkup__control, &am33xx_l4_wkup__smartreflex0, &am33xx_l4_wkup__smartreflex1, - &am33xx_l4_wkup__uart1, &am33xx_l4_wkup__timer1, &am33xx_l4_wkup__rtc, &am33xx_l4_wkup__adc_tsc,
@@ -457,11 +448,6 @@ static struct omap_hwmod_ocp_if *am33xx_hwmod_ocp_ifs[] __initdata = { &am33xx_l4_ls__timer6, &am33xx_l4_ls__timer7, &am33xx_l3_main__tpcc, - &am33xx_l4_ls__uart2, - &am33xx_l4_ls__uart3, - &am33xx_l4_ls__uart4, - &am33xx_l4_ls__uart5, - &am33xx_l4_ls__uart6, &am33xx_l4_ls__spinlock, &am33xx_l4_ls__elm, &am33xx_l4_ls__epwmss0,
arch/arm/mach-omap2/omap_hwmod_43xx_data.c +0 -13
@@ -611,13 +611,6 @@ static struct omap_hwmod_ocp_if am43xx_l4_wkup__timer1 = { .user = OCP_USER_MPU, }; -static struct omap_hwmod_ocp_if am43xx_l4_wkup__uart1 = { - .master = &am33xx_l4_wkup_hwmod, - .slave = &am33xx_uart1_hwmod, - .clk ="sys_clkin_ck" , - .user =OCP_USER_MPU , -}; -static struct omap_hwmod_ocp_if am43xx_l4_wkup__wd_timer1 = { .master = &am33xx_l4_wkup_hwmod, .slave = &am33xx_wd_timer1_hwmod,
@@ -837,7 +830,6 @@ static struct omap_hwmod_ocp_if *am43xx_hwmod_ocp_ifs[] __initdata = { &am43xx_l4_wkup__control, &am43xx_l4_wkup__smartreflex0, &am43xx_l4_wkup__smartreflex1, - &am43xx_l4_wkup__uart1, &am43xx_l4_wkup__timer1, &am43xx_l4_wkup__wd_timer1, &am43xx_l4_wkup__adc_tsc,
@@ -855,11 +847,6 @@ static struct omap_hwmod_ocp_if *am43xx_hwmod_ocp_ifs[] __initdata = { &am33xx_l4_ls__timer6, &am33xx_l4_ls__timer7, &am33xx_l3_main__tpcc, - &am33xx_l4_ls__uart2, - &am33xx_l4_ls__uart3, - &am33xx_l4_ls__uart4, - &am33xx_l4_ls__uart5, - &am33xx_l4_ls__uart6, &am33xx_l4_ls__spinlock, &am33xx_l4_ls__elm, &am33xx_l4_ls__epwmss0,
Signature · 1 line
2.21.0