| Message ID | 20190326181324.32140-2-tony@atomide.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drop selected platform data for am3 and am4 | expand |
On 3/26/19 1:13 PM, Tony Lindgren wrote: > 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 <tony@atomide.com> > --- 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?
Hi, * David Lechner <david@lechnology.com> [190721 02:43]: > On 3/26/19 1:13 PM, Tony Lindgren wrote: > > 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 <tony@atomide.com> > > --- > > 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. > 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< ---------- diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi --- a/arch/arm/boot/dts/am33xx-l4.dtsi +++ b/arch/arm/boot/dts/am33xx-l4.dtsi @@ -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>; diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi --- a/arch/arm/boot/dts/am33xx.dtsi +++ b/arch/arm/boot/dts/am33xx.dtsi @@ -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 { diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi --- a/arch/arm/boot/dts/am4372.dtsi +++ b/arch/arm/boot/dts/am4372.dtsi @@ -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 { diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi --- a/arch/arm/boot/dts/am437x-l4.dtsi +++ b/arch/arm/boot/dts/am437x-l4.dtsi @@ -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>;
* Tony Lindgren <tony@atomide.com> [190722 06:10]: > * David Lechner <david@lechnology.com> [190721 02:43]: > > On 3/26/19 1:13 PM, Tony Lindgren wrote: > > > 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 <tony@atomide.com> > > > --- > > > > 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. > > > 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? 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< ------------- diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi --- a/arch/arm/boot/dts/am33xx.dtsi +++ b/arch/arm/boot/dts/am33xx.dtsi @@ -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 { diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi --- a/arch/arm/boot/dts/am4372.dtsi +++ b/arch/arm/boot/dts/am4372.dtsi @@ -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 {
On 7/22/19 2:54 AM, Tony Lindgren wrote: > * Tony Lindgren <tony@atomide.com> [190722 06:10]: >> * David Lechner <david@lechnology.com> [190721 02:43]: >>> On 3/26/19 1:13 PM, Tony Lindgren wrote: >>>> 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 <tony@atomide.com> >>>> --- >>> >>> 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. >> >>> 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? > > 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< ------------- > diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi > --- a/arch/arm/boot/dts/am33xx.dtsi > +++ b/arch/arm/boot/dts/am33xx.dtsi > @@ -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 { > diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi > --- a/arch/arm/boot/dts/am4372.dtsi > +++ b/arch/arm/boot/dts/am4372.dtsi > @@ -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 { > This fixes wifi on BeagleBone Blue for me in v5.2. Tested-by: David Lechner <david@lechnology.com>
On 7/22/19 1:09 AM, Tony Lindgren wrote: > Hi, > > * David Lechner <david@lechnology.com> [190721 02:43]: >> On 3/26/19 1:13 PM, Tony Lindgren wrote: >>> 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 <tony@atomide.com> >>> --- >> >> 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. > >> 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< ---------- > diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi > --- a/arch/arm/boot/dts/am33xx-l4.dtsi > +++ b/arch/arm/boot/dts/am33xx-l4.dtsi > @@ -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>; > diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi > --- a/arch/arm/boot/dts/am33xx.dtsi > +++ b/arch/arm/boot/dts/am33xx.dtsi > @@ -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 { > diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi > --- a/arch/arm/boot/dts/am4372.dtsi > +++ b/arch/arm/boot/dts/am4372.dtsi > @@ -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 { > diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi > --- a/arch/arm/boot/dts/am437x-l4.dtsi > +++ b/arch/arm/boot/dts/am437x-l4.dtsi > @@ -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>; > 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
Hi, * David Lechner <david@lechnology.com> [190722 14:55]: > 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
* David Lechner <david@lechnology.com> [190722 14:27]: > On 7/22/19 2:54 AM, Tony Lindgren wrote: > > 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. ... > This fixes wifi on BeagleBone Blue for me in v5.2. > > Tested-by: David Lechner <david@lechnology.com> OK great, thanks for testing. Regards, Tony
diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h b/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h --- a/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h +++ b/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h @@ -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; diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c --- a/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c @@ -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, diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c --- a/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c @@ -16,7 +16,6 @@ #include <linux/types.h> -#include <linux/platform_data/hsmmc-omap.h> #include "omap_hwmod.h" #include "i2c.h" #include "wd_timer.h" @@ -760,76 +759,6 @@ struct omap_hwmod am33xx_mcasp1_hwmod = { }, }; -/* 'mmc' class */ -static struct omap_hwmod_class_sysconfig am33xx_mmc_sysc = { - .rev_offs = 0x2fc, - .sysc_offs = 0x110, - .syss_offs = 0x114, - .sysc_flags = (SYSC_HAS_CLOCKACTIVITY | SYSC_HAS_SIDLEMODE | - SYSC_HAS_ENAWAKEUP | SYSC_HAS_SOFTRESET | - SYSC_HAS_AUTOIDLE | SYSS_HAS_RESET_STATUS), - .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART), - .sysc_fields = &omap_hwmod_sysc_type1, -}; - -static struct omap_hwmod_class am33xx_mmc_hwmod_class = { - .name = "mmc", - .sysc = &am33xx_mmc_sysc, -}; - -/* mmc0 */ -static struct omap_hsmmc_dev_attr am33xx_mmc0_dev_attr = { - .flags = OMAP_HSMMC_SUPPORTS_DUAL_VOLT, -}; - -struct omap_hwmod am33xx_mmc0_hwmod = { - .name = "mmc1", - .class = &am33xx_mmc_hwmod_class, - .clkdm_name = "l4ls_clkdm", - .main_clk = "mmc_clk", - .prcm = { - .omap4 = { - .modulemode = MODULEMODE_SWCTRL, - }, - }, - .dev_attr = &am33xx_mmc0_dev_attr, -}; - -/* mmc1 */ -static struct omap_hsmmc_dev_attr am33xx_mmc1_dev_attr = { - .flags = OMAP_HSMMC_SUPPORTS_DUAL_VOLT, -}; - -struct omap_hwmod am33xx_mmc1_hwmod = { - .name = "mmc2", - .class = &am33xx_mmc_hwmod_class, - .clkdm_name = "l4ls_clkdm", - .main_clk = "mmc_clk", - .prcm = { - .omap4 = { - .modulemode = MODULEMODE_SWCTRL, - }, - }, - .dev_attr = &am33xx_mmc1_dev_attr, -}; - -/* mmc2 */ -static struct omap_hsmmc_dev_attr am33xx_mmc2_dev_attr = { - .flags = OMAP_HSMMC_SUPPORTS_DUAL_VOLT, -}; -struct omap_hwmod am33xx_mmc2_hwmod = { - .name = "mmc3", - .class = &am33xx_mmc_hwmod_class, - .clkdm_name = "l3s_clkdm", - .main_clk = "mmc_clk", - .prcm = { - .omap4 = { - .modulemode = MODULEMODE_SWCTRL, - }, - }, - .dev_attr = &am33xx_mmc2_dev_attr, -}; - /* * 'rtc' class * rtc subsystem @@ -1282,8 +1211,6 @@ static void omap_hwmod_am33xx_clkctrl(void) CLKCTRL(am33xx_mailbox_hwmod, AM33XX_CM_PER_MAILBOX0_CLKCTRL_OFFSET); CLKCTRL(am33xx_mcasp0_hwmod, AM33XX_CM_PER_MCASP0_CLKCTRL_OFFSET); CLKCTRL(am33xx_mcasp1_hwmod, AM33XX_CM_PER_MCASP1_CLKCTRL_OFFSET); - CLKCTRL(am33xx_mmc0_hwmod, AM33XX_CM_PER_MMC0_CLKCTRL_OFFSET); - CLKCTRL(am33xx_mmc1_hwmod, AM33XX_CM_PER_MMC1_CLKCTRL_OFFSET); CLKCTRL(am33xx_spi0_hwmod, AM33XX_CM_PER_SPI0_CLKCTRL_OFFSET); CLKCTRL(am33xx_spi1_hwmod, AM33XX_CM_PER_SPI1_CLKCTRL_OFFSET); CLKCTRL(am33xx_spinlock_hwmod, AM33XX_CM_PER_SPINLOCK_CLKCTRL_OFFSET); @@ -1303,7 +1230,6 @@ static void omap_hwmod_am33xx_clkctrl(void) CLKCTRL(am33xx_wd_timer1_hwmod, AM33XX_CM_WKUP_WDT1_CLKCTRL_OFFSET); CLKCTRL(am33xx_rtc_hwmod, AM33XX_CM_RTC_RTC_CLKCTRL_OFFSET); PRCM_FLAGS(am33xx_rtc_hwmod, HWMOD_OMAP4_ZERO_CLKCTRL_OFFSET); - CLKCTRL(am33xx_mmc2_hwmod, AM33XX_CM_PER_MMC2_CLKCTRL_OFFSET); CLKCTRL(am33xx_gpmc_hwmod, AM33XX_CM_PER_GPMC_CLKCTRL_OFFSET); CLKCTRL(am33xx_l4_ls_hwmod, AM33XX_CM_PER_L4LS_CLKCTRL_OFFSET); CLKCTRL(am33xx_l4_wkup_hwmod, AM33XX_CM_WKUP_L4WKUP_CLKCTRL_OFFSET); @@ -1357,8 +1283,6 @@ static void omap_hwmod_am43xx_clkctrl(void) CLKCTRL(am33xx_mailbox_hwmod, AM43XX_CM_PER_MAILBOX0_CLKCTRL_OFFSET); CLKCTRL(am33xx_mcasp0_hwmod, AM43XX_CM_PER_MCASP0_CLKCTRL_OFFSET); CLKCTRL(am33xx_mcasp1_hwmod, AM43XX_CM_PER_MCASP1_CLKCTRL_OFFSET); - CLKCTRL(am33xx_mmc0_hwmod, AM43XX_CM_PER_MMC0_CLKCTRL_OFFSET); - CLKCTRL(am33xx_mmc1_hwmod, AM43XX_CM_PER_MMC1_CLKCTRL_OFFSET); CLKCTRL(am33xx_spi0_hwmod, AM43XX_CM_PER_SPI0_CLKCTRL_OFFSET); CLKCTRL(am33xx_spi1_hwmod, AM43XX_CM_PER_SPI1_CLKCTRL_OFFSET); CLKCTRL(am33xx_spinlock_hwmod, AM43XX_CM_PER_SPINLOCK_CLKCTRL_OFFSET); @@ -1377,7 +1301,6 @@ static void omap_hwmod_am43xx_clkctrl(void) CLKCTRL(am33xx_i2c1_hwmod, AM43XX_CM_WKUP_I2C0_CLKCTRL_OFFSET); CLKCTRL(am33xx_wd_timer1_hwmod, AM43XX_CM_WKUP_WDT1_CLKCTRL_OFFSET); CLKCTRL(am33xx_rtc_hwmod, AM43XX_CM_RTC_RTC_CLKCTRL_OFFSET); - CLKCTRL(am33xx_mmc2_hwmod, AM43XX_CM_PER_MMC2_CLKCTRL_OFFSET); CLKCTRL(am33xx_gpmc_hwmod, AM43XX_CM_PER_GPMC_CLKCTRL_OFFSET); CLKCTRL(am33xx_l4_ls_hwmod, AM43XX_CM_PER_L4LS_CLKCTRL_OFFSET); CLKCTRL(am33xx_l4_wkup_hwmod, AM43XX_CM_WKUP_L4WKUP_CLKCTRL_OFFSET); diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c --- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c @@ -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, diff --git a/arch/arm/mach-omap2/omap_hwmod_43xx_data.c b/arch/arm/mach-omap2/omap_hwmod_43xx_data.c --- a/arch/arm/mach-omap2/omap_hwmod_43xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_43xx_data.c @@ -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,
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 <tony@atomide.com> --- .../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(-)