| Message ID | 1399617068-19826-1-git-send-email-george.cherian@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* George Cherian <george.cherian@ti.com> [140508 23:34]: > Re arrange the USB dt for AM33xx to take it a bit closer > to the hardware configuration. > > The USBSS is designed as follows > > USB control Module 0x44e10_0620 > > USBSS 0x4740_0000 > > USB0 0x4740_1000 > USB0_PHY 0x4740_1300 > USB0_CORE 0x4740_1400 > > USB1 0x4740_1800 > USB1_PHY 0x4740_1b00 > USB1_CORE 0x4740_1c00 > > CPPI DMA Controller 0x4740_2000 > CPPI DMA Scheduler 0x4740_3000 > Queue Manager 0x4740_4000 > > So model the DT as follows > USBSS { > usb_ctrl_mod: { > 0x44e10_0620 > } > usb0: { > 0x4740_1000 > 0x4740_1400 > } > usb0_phy:{ > 0x4740_1300 > } > usb1:{ > 0x4740_1800 > 0x4740_1c00 > } > usb1_phy: { > 0x4740_1b00 > } > cppi41dma: { > 0x4740_2000 > 0x4740_3000 > 0x4740_4000 > } > } Is this just a cosmetic change or is this trying to workaround some edma related init order issue? Regards, Tony
Hi Tony, On 5/15/2014 3:20 AM, Tony Lindgren wrote: > * George Cherian <george.cherian@ti.com> [140508 23:34]: >> Re arrange the USB dt for AM33xx to take it a bit closer >> to the hardware configuration. >> >> The USBSS is designed as follows >> >> USB control Module 0x44e10_0620 >> >> USBSS 0x4740_0000 >> >> USB0 0x4740_1000 >> USB0_PHY 0x4740_1300 >> USB0_CORE 0x4740_1400 >> >> USB1 0x4740_1800 >> USB1_PHY 0x4740_1b00 >> USB1_CORE 0x4740_1c00 >> >> CPPI DMA Controller 0x4740_2000 >> CPPI DMA Scheduler 0x4740_3000 >> Queue Manager 0x4740_4000 >> >> So model the DT as follows >> USBSS { >> usb_ctrl_mod: { >> 0x44e10_0620 >> } >> usb0: { >> 0x4740_1000 >> 0x4740_1400 >> } >> usb0_phy:{ >> 0x4740_1300 >> } >> usb1:{ >> 0x4740_1800 >> 0x4740_1c00 >> } >> usb1_phy: { >> 0x4740_1b00 >> } >> cppi41dma: { >> 0x4740_2000 >> 0x4740_3000 >> 0x4740_4000 >> } >> } > Is this just a cosmetic change or is this trying to workaround > some edma related init order issue? Please ignore this patch. Was trying to workaround some dma and phy related issues. The same got fixed with following http://www.spinics.net/lists/linux-usb/msg107244.html > > Regards, > > Tony
Hello Tony, On 14 May 02:50 PM, Tony Lindgren wrote: > * George Cherian <george.cherian@ti.com> [140508 23:34]: > > Re arrange the USB dt for AM33xx to take it a bit closer > > to the hardware configuration. > > [..] > > Is this just a cosmetic change or is this trying to workaround > some edma related init order issue? > This was an attempt from George to workaround an that happens when the musb_am335x module is removed. However, we've agreed to prevent the removal instead. I've just (re)sent a patch for it: See: [PATCH for v3.15] usb: musb: Fix panic upon musb_am335x module removal AFAIK, this fixes a serious problem so I've marked it for stable. For the DMA init order issue, I've done a new patch that forces the probe order in the driver. I'll post that soon.
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi index cb6811e..d33a1e7 100644 --- a/arch/arm/boot/dts/am33xx.dtsi +++ b/arch/arm/boot/dts/am33xx.dtsi @@ -461,14 +461,6 @@ status = "disabled"; }; - usb0_phy: usb-phy@47401300 { - compatible = "ti,am335x-usb-phy"; - reg = <0x47401300 0x100>; - reg-names = "phy"; - status = "disabled"; - ti,ctrl_mod = <&usb_ctrl_mod>; - }; - usb0: usb@47401000 { compatible = "ti,musb-am33xx"; status = "disabled"; @@ -509,9 +501,9 @@ "tx14", "tx15"; }; - usb1_phy: usb-phy@47401b00 { + usb0_phy: usb-phy@47401300 { compatible = "ti,am335x-usb-phy"; - reg = <0x47401b00 0x100>; + reg = <0x47401300 0x100>; reg-names = "phy"; status = "disabled"; ti,ctrl_mod = <&usb_ctrl_mod>; @@ -556,6 +548,14 @@ "tx14", "tx15"; }; + usb1_phy: usb-phy@47401b00 { + compatible = "ti,am335x-usb-phy"; + reg = <0x47401b00 0x100>; + reg-names = "phy"; + status = "disabled"; + ti,ctrl_mod = <&usb_ctrl_mod>; + }; + cppi41dma: dma-controller@47402000 { compatible = "ti,am3359-cppi41"; reg = <0x47400000 0x1000
Re arrange the USB dt for AM33xx to take it a bit closer to the hardware configuration. The USBSS is designed as follows USB control Module 0x44e10_0620 USBSS 0x4740_0000 USB0 0x4740_1000 USB0_PHY 0x4740_1300 USB0_CORE 0x4740_1400 USB1 0x4740_1800 USB1_PHY 0x4740_1b00 USB1_CORE 0x4740_1c00 CPPI DMA Controller 0x4740_2000 CPPI DMA Scheduler 0x4740_3000 Queue Manager 0x4740_4000 So model the DT as follows USBSS { usb_ctrl_mod: { 0x44e10_0620 } usb0: { 0x4740_1000 0x4740_1400 } usb0_phy:{ 0x4740_1300 } usb1:{ 0x4740_1800 0x4740_1c00 } usb1_phy: { 0x4740_1b00 } cppi41dma: { 0x4740_2000 0x4740_3000 0x4740_4000 } } Signed-off-by: George Cherian <george.cherian@ti.com> --- arch/arm/boot/dts/am33xx.dtsi | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)