Update musb to probe with ti-sysc for omap3
Subsystems (5)
Tony Lindgren
maintainercover Update musb to probe with ti-sysc for omap3
Hi all,
After fixing the probe issues with [0], let's update omap3 to use ti-sysc for musb so the driver behaves the same way for all the SoCs.
Regards,
Tony
[0] https://lore.kernel.org/linux-usb/[email protected]/T/#u
Tony Lindgren (3):
bus: ti-sysc: Add otg quirk flags for omap3 musb
ARM: dts: Update omap3 musb to probe with ti-sysc
ARM: OMAP2+: Drop legacy hwmod data for omap3 otg
arch/arm/boot/dts/am3517.dtsi | 38 +++++++-- arch/arm/boot/dts/omap3.dtsi | 40 +++++++-- arch/arm/boot/dts/omap34xx.dtsi | 4 + arch/arm/boot/dts/omap36xx.dtsi | 4 + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 99 ---------------------- drivers/bus/ti-sysc.c | 6 ++ 6 files changed, 75 insertions(+), 116 deletions(-)
Signature · 1 line
2.38.1
Tony Lindgren
maintainerPATCH 1/3 bus: ti-sysc: Add otg quirk flags for omap3 musb
To prepare for probing omap3 musb with ti-sysc, these quirk flags are needed similar to what we have for omap4.
--- drivers/bus/ti-sysc.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/bus/ti-sysc.c +6 -0
@@ -1610,6 +1610,12 @@ static const struct sysc_revision_quirk sysc_revision_quirks[] = { SYSC_QUIRK_SWSUP_SIDLE | SYSC_QUIRK_SWSUP_MSTANDBY),SYSC_QUIRK ("usb_host_hs" ,0 ,0 ,0x10 , -ENODEV ,0x50700101 ,0xffffffff ,SYSC_QUIRK_SWSUP_SIDLE |SYSC_QUIRK_SWSUP_MSTANDBY ), +SYSC_QUIRK ("usb_otg_hs" ,0 ,0x400 ,0x404 ,0x408 ,0x00000033 , +0xffffffff ,SYSC_QUIRK_SWSUP_SIDLE |SYSC_QUIRK_SWSUP_MSTANDBY | +SYSC_MODULE_QUIRK_OTG ), +SYSC_QUIRK ("usb_otg_hs" ,0 ,0x400 ,0x404 ,0x408 ,0x00000040 , +0xffffffff ,SYSC_QUIRK_SWSUP_SIDLE |SYSC_QUIRK_SWSUP_MSTANDBY | +SYSC_MODULE_QUIRK_OTG ),SYSC_QUIRK ("usb_otg_hs" ,0 ,0x400 ,0x404 ,0x408 ,0x00000050 ,0xffffffff ,SYSC_QUIRK_SWSUP_SIDLE |SYSC_QUIRK_SWSUP_MSTANDBY | SYSC_MODULE_QUIRK_OTG),
Signature · 1 line
2.38.1
Re: [PATCH 1/3] bus: ti-sysc: Add otg quirk flags for omap3 musb
Quoted 7 lines · Tony Lindgren
To prepare for probing omap3 musb with ti-sysc, these quirk flags are needed similar to what we have for omap4.
Cc Greg Kroah-Hartman <[email protected]>Cc H. Nikolaus Schaller <[email protected]>Cc Sicelo Mhlongo <[email protected]>Signed-off-by Tony Lindgren <[email protected]>
Works fine for me on Nokia N900 (omap 3430).
Tony Lindgren
maintainerPATCH 2/3 ARM: dts: Update omap3 musb to probe with ti-sysc
In reply to Tony LindgrenWe can drop the legacy booting for the related musb driver if we update the omap3 SoCs variants to boot using ti-sysc interconnect target module.
--- arch/arm/boot/dts/am3517.dtsi | 38 ++++++++++++++++++++++++------- arch/arm/boot/dts/omap3.dtsi | 40 +++++++++++++++++++++++++-------- arch/arm/boot/dts/omap34xx.dtsi | 4 ++++ arch/arm/boot/dts/omap36xx.dtsi | 4 ++++ 4 files changed, 69 insertions(+), 17 deletions(-)
arch/arm/boot/dts/am3517.dtsi +30 -8
@@ -49,13 +49,35 @@ opp100-600000000 { }; ocp@68000000 { - am35x_otg_hs: am35x_otg_hs@5c040000 { - compatible = "ti,omap3-musb"; - ti,hwmods = "am35x_otg_hs"; - status = "disabled"; - reg = <0x5c040000 0x1000>; - interrupts = <71>; - interrupt-names = "mc"; + target-module@5c040000 { + compatible = "ti,sysc-omap2", "ti,sysc"; + reg = <0x5c040400 0x4>, + <0x5c040404 0x4>, + <0x5c040408 0x4>; + reg-names = "rev", "sysc", "syss"; + ti,sysc-mask = <(SYSC_OMAP2_ENAWAKEUP | + SYSC_OMAP2_SOFTRESET | + SYSC_OMAP2_AUTOIDLE)>; + ti,sysc-midle = <SYSC_IDLE_FORCE>, + <SYSC_IDLE_NO>, + <SYSC_IDLE_SMART>; + ti,sysc-sidle = <SYSC_IDLE_FORCE>, + <SYSC_IDLE_NO>, + <SYSC_IDLE_SMART>; + ti,syss-mask = <1>; + clocks = <&hsotgusb_ick_am35xx>; + clock-names = "fck"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x5c040000 0x1000>; + + am35x_otg_hs: am35x_otg_hs@0 { + compatible = "ti,omap3-musb"; + status = "disabled"; + reg = <0 0x1000>; + interrupts = <71>; + interrupt-names = "mc"; + }; }; davinci_emac: ethernet@5c000000 {
@@ -154,7 +176,7 @@ &rng_target { }; /* Table Table 5-79 of the TRM shows 480ab000 is reserved */ -&usb_otg_hs { +&usb_otg_target { status = "disabled"; };
arch/arm/boot/dts/omap3.dtsi +31 -9
@@ -893,15 +893,37 @@ gpmc: gpmc@6e000000 { #gpio-cells = <2>; }; - usb_otg_hs: usb_otg_hs@480ab000 { - compatible = "ti,omap3-musb"; - reg = <0x480ab000 0x1000>; - interrupts = <92>, <93>; - interrupt-names = "mc", "dma"; - ti,hwmods = "usb_otg_hs"; - multipoint = <1>; - num-eps = <16>; - ram-bits = <12>; + usb_otg_target: target-module@480ab000 { + compatible = "ti,sysc-omap2", "ti,sysc"; + reg = <0x480ab400 0x4>, + <0x480ab404 0x4>, + <0x480ab408 0x4>; + reg-names = "rev", "sysc", "syss"; + ti,sysc-mask = <(SYSC_OMAP2_ENAWAKEUP | + SYSC_OMAP2_SOFTRESET | + SYSC_OMAP2_AUTOIDLE)>; + ti,sysc-midle = <SYSC_IDLE_FORCE>, + <SYSC_IDLE_NO>, + <SYSC_IDLE_SMART>; + ti,sysc-sidle = <SYSC_IDLE_FORCE>, + <SYSC_IDLE_NO>, + <SYSC_IDLE_SMART>; + ti,syss-mask = <1>; + /* Clock defined in the SoC specific dtsi file */ + clock-names = "fck"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x480ab000 0x1000>; + + usb_otg_hs: usb@0 { + compatible = "ti,omap3-musb"; + reg = <0 0x1000>; + interrupts = <92>, <93>; + interrupt-names = "mc", "dma"; + multipoint = <1>; + num-eps = <16>; + ram-bits = <12>; + }; }; dss: dss@48050000 {
arch/arm/boot/dts/omap34xx.dtsi +4 -0
@@ -189,6 +189,10 @@ &ssi { "ssi_ick"; }; +&usb_otg_target { + clocks = <&hsotgusb_ick_3430es2>; +}; + /include/ "omap34xx-omap36xx-clocks.dtsi" /include/ "omap36xx-omap3430es2plus-clocks.dtsi" /include/ "omap36xx-am35xx-omap3430es2plus-clocks.dtsi"
arch/arm/boot/dts/omap36xx.dtsi +4 -0
@@ -240,6 +240,10 @@ &ssi { "ssi_ick"; }; +&usb_otg_target { + clocks = <&hsotgusb_ick_3430es2>; +}; + /include/ "omap34xx-omap36xx-clocks.dtsi" /include/ "omap36xx-omap3430es2plus-clocks.dtsi" /include/ "omap36xx-am35xx-omap3430es2plus-clocks.dtsi"
Signature · 1 line
2.38.1
Re: [PATCH 2/3] ARM: dts: Update omap3 musb to probe with ti-sysc
Quoted 7 lines · Tony Lindgren
We can drop the legacy booting for the related musb driver if we update the omap3 SoCs variants to boot using ti-sysc interconnect target module.
Cc H. Nikolaus Schaller <[email protected]>Cc Sicelo Mhlongo <[email protected]>Signed-off-by Tony Lindgren <[email protected]>
Tony Lindgren
maintainerPATCH 3/3 ARM: OMAP2+: Drop legacy hwmod data for omap3 otg
In reply to Tony LindgrenWith complete devicetree data available to probe with ti-sysc interconnect target module driver, we can now drop the related SoC data.
--- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 99 ---------------------- 1 file changed, 99 deletions(-)
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +0 -99
@@ -1135,65 +1135,6 @@ static struct omap_hwmod omap34xx_mcspi4 = { .class = &omap34xx_mcspi_class, }; -/* usbhsotg */ -static struct omap_hwmod_class_sysconfig omap3xxx_usbhsotg_sysc = { - .rev_offs =0x0400 , - .sysc_offs =0x0404 , - .syss_offs =0x0408 , - .sysc_flags = (SYSC_HAS_SIDLEMODE |SYSC_HAS_MIDLEMODE | -SYSC_HAS_ENAWAKEUP |SYSC_HAS_SOFTRESET | -SYSC_HAS_AUTOIDLE ), - .idlemodes = (SIDLE_FORCE |SIDLE_NO |SIDLE_SMART | -MSTANDBY_FORCE |MSTANDBY_NO |MSTANDBY_SMART ), - .sysc_fields = &omap_hwmod_sysc_type1, -}; - -static struct omap_hwmod_class usbotg_class = { - .name ="usbotg" , - .sysc = &omap3xxx_usbhsotg_sysc, -}; - -/* usb_otg_hs */ - -static struct omap_hwmod omap3xxx_usbhsotg_hwmod = { - .name ="usb_otg_hs" , - .main_clk ="hsotgusb_ick" , - .prcm = { - .omap2 = { - .module_offs =CORE_MOD , - .idlest_reg_id =1 , - .idlest_idle_bit =OMAP3430ES2_ST_HSOTGUSB_IDLE_SHIFT , - }, - }, - .class = &usbotg_class, - -/* -* Erratum ID: i479 idle_req / idle_ack mechanism potentially -* broken when autoidle is enabled -* workaround is to disable the autoidle bit at module level. -* -* Enabling the device in any other MIDLEMODE setting but force-idle -* causes core_pwrdm not enter idle states at least on OMAP3630. -* Note that musb has OTG_FORCESTDBY register that controls MSTANDBY -* signal when MIDLEMODE is set to force-idle. -*/ - .flags =HWMOD_NO_OCP_AUTOIDLE |HWMOD_SWSUP_SIDLE | -HWMOD_FORCE_MSTANDBY |HWMOD_RECONFIG_IO_CHAIN , -}; - -/* usb_otg_hs */ - -static struct omap_hwmod_class am35xx_usbotg_class = { - .name ="am35xx_usbotg" , -}; - -static struct omap_hwmod am35xx_usbhsotg_hwmod = { - .name ="am35x_otg_hs" , - .main_clk ="hsotgusb_fck" , - .class = &am35xx_usbotg_class, - .flags =HWMOD_NO_IDLEST , -}; -/* MMC/SD/SDIO common */ static struct omap_hwmod_class_sysconfig omap34xx_mmc_sysc = { .rev_offs =0x1fc ,
@@ -1561,22 +1502,6 @@ static struct omap_hwmod_ocp_if omap3xxx_dss__l3 = { .user = OCP_USER_MPU | OCP_USER_SDMA, }; -/* l3_core -> usbhsotg interface */ -static struct omap_hwmod_ocp_if omap3xxx_usbhsotg__l3 = { - .master = &omap3xxx_usbhsotg_hwmod, - .slave = &omap3xxx_l3_main_hwmod, - .clk ="core_l3_ick" , - .user =OCP_USER_MPU , -}; - -/* l3_core -> am35xx_usbhsotg interface */ -static struct omap_hwmod_ocp_if am35xx_usbhsotg__l3 = { - .master = &am35xx_usbhsotg_hwmod, - .slave = &omap3xxx_l3_main_hwmod, - .clk ="hsotgusb_ick" , - .user =OCP_USER_MPU , -}; -/* l3_core -> sad2d interface */ static struct omap_hwmod_ocp_if omap3xxx_sad2d__l3 = { .master = &omap3xxx_sad2d_hwmod,
@@ -1758,24 +1683,6 @@ static struct omap_hwmod_ocp_if omap36xx_l4_core__sr2 = { .user = OCP_USER_MPU, }; - -/* l4_core -> usbhsotg */ -static struct omap_hwmod_ocp_if omap3xxx_l4_core__usbhsotg = { - .master = &omap3xxx_l4_core_hwmod, - .slave = &omap3xxx_usbhsotg_hwmod, - .clk ="l4_ick" , - .user =OCP_USER_MPU , -}; - - -/* l4_core -> usbhsotg */ -static struct omap_hwmod_ocp_if am35xx_l4_core__usbhsotg = { - .master = &omap3xxx_l4_core_hwmod, - .slave = &am35xx_usbhsotg_hwmod, - .clk ="hsotgusb_ick" , - .user =OCP_USER_MPU , -}; -/* L4_WKUP -> L4_SEC interface */ static struct omap_hwmod_ocp_if omap3xxx_l4_wkup__l4_sec = { .master = &omap3xxx_l4_wkup_hwmod,
@@ -2465,8 +2372,6 @@ static struct omap_hwmod_ocp_if *omap3430es1_hwmod_ocp_ifs[] __initdata = {static struct omap_hwmod_ocp_if *omap3430es2plus_hwmod_ocp_ifs[]__initdata = { &omap3xxx_dss__l3, &omap3xxx_l4_core__dss, - &omap3xxx_usbhsotg__l3, - &omap3xxx_l4_core__usbhsotg, &omap3xxx_usb_host_hs__l3_main_2, &omap3xxx_l4_core__usb_host_hs, &omap3xxx_l4_core__usb_tll_hs,
@@ -2509,8 +2414,6 @@ static struct omap_hwmod_ocp_if *omap36xx_hwmod_ocp_ifs[] __initdata = { &omap3xxx_l4_core__dss, &omap36xx_l4_core__sr1, &omap36xx_l4_core__sr2, - &omap3xxx_usbhsotg__l3, - &omap3xxx_l4_core__usbhsotg, &omap3xxx_l4_core__mailbox, &omap3xxx_usb_host_hs__l3_main_2, &omap3xxx_l4_core__usb_host_hs,
@@ -2528,8 +2431,6 @@ static struct omap_hwmod_ocp_if *omap36xx_hwmod_ocp_ifs[] __initdata = {static struct omap_hwmod_ocp_if *am35xx_hwmod_ocp_ifs[]__initdata = { &omap3xxx_dss__l3, &omap3xxx_l4_core__dss, - &am35xx_usbhsotg__l3, - &am35xx_l4_core__usbhsotg, &am35xx_l4_core__uart4, &omap3xxx_usb_host_hs__l3_main_2, &omap3xxx_l4_core__usb_host_hs,
Signature · 1 line
2.38.1
Re: [PATCH 3/3] ARM: OMAP2+: Drop legacy hwmod data for omap3 otg
Quoted 6 lines · Tony Lindgren
With complete devicetree data available to probe with ti-sysc interconnect target module driver, we can now drop the related SoC data.
Cc H. Nikolaus Schaller <[email protected]>Cc Sicelo Mhlongo <[email protected]>Signed-off-by Tony Lindgren <[email protected]>
Tested working on Nokia N900 (omap 3430).
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel