Skip to contentSkip to conversation

Probe am335x musb with ti-sysc and drop platform data

PATCH New Tony Lindgren 1 participant 4 messages Oct 21, 2019

Subsystems (5)
lore
Share & tools
lore

Tony Lindgren

author maintainer
#0 lore raw

cover Probe am335x musb with ti-sysc and drop platform data

Hi all,

This series of changes updates am335x musb to probe with ti-sysc interconnect target module driver, removes some unnecessary board specific boiler plate, and then drops the legacy platform data for musb.

Note that this patch depends on the following two patches:

[PATCH] bus: ti-sysc: Handle mstandby quirk and use it for musb [PATCH] bus: ti-sysc: Use swsup quirks also for am335x musb

Regards,

Tony

Tony Lindgren (3):
ARM: dts: Probe am335x musb with ti-sysc
ARM: dts: Drop pointless status changing for am3 musb
ARM: OMAP2+: Drop legacy platform data for am335x musb

 arch/arm/boot/dts/am335x-baltos.dtsi          | 12 ----
 arch/arm/boot/dts/am335x-bone-common.dtsi     | 22 -------
 arch/arm/boot/dts/am335x-boneblue.dts         | 22 -------
 arch/arm/boot/dts/am335x-chiliboard.dts       | 18 -----
 arch/arm/boot/dts/am335x-cm-t335.dts          | 20 ------
 arch/arm/boot/dts/am335x-evm.dts              | 25 -------
 arch/arm/boot/dts/am335x-evmsk.dts            | 25 -------
 arch/arm/boot/dts/am335x-guardian.dts         | 22 -------
 arch/arm/boot/dts/am335x-igep0033.dtsi        | 25 -------
 arch/arm/boot/dts/am335x-lxm.dts              | 22 -------
 .../boot/dts/am335x-moxa-uc-2100-common.dtsi  | 17 -----
 .../arm/boot/dts/am335x-moxa-uc-8100-me-t.dts | 22 -------
 arch/arm/boot/dts/am335x-osd3358-sm-red.dts   | 22 -------
 arch/arm/boot/dts/am335x-pcm-953.dtsi         | 25 -------
 arch/arm/boot/dts/am335x-pdu001.dts           | 28 --------
 arch/arm/boot/dts/am335x-pepper.dts           | 20 ------
 arch/arm/boot/dts/am335x-pocketbeagle.dts     | 22 -------
 arch/arm/boot/dts/am335x-regor.dtsi           | 21 ------
 arch/arm/boot/dts/am335x-shc.dts              | 17 -----
 arch/arm/boot/dts/am335x-sl50.dts             | 22 -------
 arch/arm/boot/dts/am335x-wega.dtsi            | 26 --------
 arch/arm/boot/dts/am33xx-l4.dtsi              |  7 ++
 arch/arm/boot/dts/am33xx.dtsi                 | 66 +++++++++----------
 arch/arm/mach-omap2/omap_hwmod_33xx_data.c    | 44 -------------
 24 files changed, 39 insertions(+), 533 deletions(-)
Signature · 1 line
2.23.0
author maintainer
#1 lore raw

PATCH 1/3 ARM: dts: Probe am335x musb with ti-sysc

We can now probe musb with ti-sysc interconnect driver and dts data with the following changes:

1. Swap the old ti,am33xx-usb compatible wrapper to generic ti-sysc driver. This means later on we can also remove the old wrapper driver drivers/usb/musb/musb_am335x.c

2. Update the child nodes to use the ranges provided by ti-sysc

3. Drop unneeded status = "enabled" tinkering for SoC internal devices. This allows us to remove some useless board specific boilerplate code in the following patches

---
 arch/arm/boot/dts/am33xx-l4.dtsi |  7 ++++
 arch/arm/boot/dts/am33xx.dtsi    | 66 ++++++++++++++++----------------
 2 files changed, 39 insertions(+), 34 deletions(-)
arch/arm/boot/dts/am33xx-l4.dtsi +7 -0
@@ -303,6 +303,13 @@
 					};
 				};
 
+				usb_ctrl_mod: control@620 {
+					compatible = "ti,am335x-usb-ctrl-module";
+					reg = <0x620 0x10>,
+					      <0x648 0x4>;
+					reg-names = "phy_ctrl", "wakeup";
+				};
+
 				wkup_m3_ipc: wkup_m3_ipc@1324 {
 					compatible = "ti,am3352-wkup-m3-ipc";
 					reg = <0x1324 0x24>;
arch/arm/boot/dts/am33xx.dtsi +32 -34

108 lines not on this page · raw message

Signature · 1 line
2.23.0
author maintainer
#2 lore raw

PATCH 2/3 ARM: dts: Drop pointless status changing for am3 musb

In reply to Tony Lindgren

The default is enabled, and there should be no need to reconfigure the status for SoC internal devices in the board specific files.

Only the USB PHY used needs to be configured in the board specific files.

---
 arch/arm/boot/dts/am335x-baltos.dtsi          | 12 --------
 arch/arm/boot/dts/am335x-bone-common.dtsi     | 22 ---------------
 arch/arm/boot/dts/am335x-boneblue.dts         | 22 ---------------
 arch/arm/boot/dts/am335x-chiliboard.dts       | 18 ------------
 arch/arm/boot/dts/am335x-cm-t335.dts          | 20 -------------
 arch/arm/boot/dts/am335x-evm.dts              | 25 -----------------
 arch/arm/boot/dts/am335x-evmsk.dts            | 25 -----------------
 arch/arm/boot/dts/am335x-guardian.dts         | 22 ---------------
 arch/arm/boot/dts/am335x-igep0033.dtsi        | 25 -----------------
 arch/arm/boot/dts/am335x-lxm.dts              | 22 ---------------
 .../boot/dts/am335x-moxa-uc-2100-common.dtsi  | 17 -----------
 .../arm/boot/dts/am335x-moxa-uc-8100-me-t.dts | 22 ---------------
 arch/arm/boot/dts/am335x-osd3358-sm-red.dts   | 22 ---------------
 arch/arm/boot/dts/am335x-pcm-953.dtsi         | 25 -----------------
 arch/arm/boot/dts/am335x-pdu001.dts           | 28 -------------------
 arch/arm/boot/dts/am335x-pepper.dts           | 20 -------------
 arch/arm/boot/dts/am335x-pocketbeagle.dts     | 22 ---------------
 arch/arm/boot/dts/am335x-regor.dtsi           | 21 --------------
 arch/arm/boot/dts/am335x-shc.dts              | 17 -----------
 arch/arm/boot/dts/am335x-sl50.dts             | 22 ---------------
 arch/arm/boot/dts/am335x-wega.dtsi            | 26 -----------------
 21 files changed, 455 deletions(-)
arch/arm/boot/dts/am335x-baltos.dtsi +0 -12
@@ -258,18 +258,6 @@
 	};
 };
 
-&usb {
-	status = "okay";
-};
-
-&usb_ctrl_mod {
-	status = "okay";
-};
-
-&cppi41dma  {
-	status = "okay";
-};
-
 #include "tps65910.dtsi"
 
 &tps {
arch/arm/boot/dts/am335x-bone-common.dtsi +0 -22
@@ -191,38 +191,16 @@
 	status = "okay";
 };
 
-&usb {
-	status = "okay";
-};
-
-&usb_ctrl_mod {
-	status = "okay";
-};
-
-&usb0_phy {
-	status = "okay";
-};
-
-&usb1_phy {
-	status = "okay";
-};
-
 &usb0 {
-	status = "okay";
 	dr_mode = "peripheral";
 	interrupts-extended = <&intc 18 &tps 0>;
 	interrupt-names = "mc", "vbus";
 };
 
 &usb1 {
-	status = "okay";
 	dr_mode = "host";
 };
 
-&cppi41dma  {
-	status = "okay";
-};
-
 &i2c0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2c0_pins>;
arch/arm/boot/dts/am335x-boneblue.dts +0 -22
@@ -278,38 +278,16 @@
 	status = "okay";
 };
 
-&usb {
-	status = "okay";
-};
-
-&usb_ctrl_mod {
-	status = "okay";
-};
-
-&usb0_phy {
-	status = "okay";
-};
-
-&usb1_phy {
-	status = "okay";
-};
-
 &usb0 {
-	status = "okay";
 	dr_mode = "peripheral";
 	interrupts-extended = <&intc 18 &tps 0>;
 	interrupt-names = "mc", "vbus";
 };
 
 &usb1 {
-	status = "okay";
 	dr_mode = "host";
 };
 
-&cppi41dma  {
-	status = "okay";
-};
-
 &i2c0 {
 	baseboard_eeprom: baseboard_eeprom@50 {
 		compatible = "atmel,24c256";
arch/arm/boot/dts/am335x-chiliboard.dts +0 -18
@@ -153,30 +153,12 @@
 };
 
 /* USB */
-&usb {
-	status = "okay";
-};
-
-&usb_ctrl_mod {
-	status = "okay";
-};
-
-&usb1_phy {
-	status = "okay";
-};
-
 &usb1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&usb1_drvvbus>;
-
-	status = "okay";
 	dr_mode = "host";
 };
 
-&cppi41dma  {
-	status = "okay";
-};
-
 /* microSD */
 &mmc1 {
 	pinctrl-names = "default";
arch/arm/boot/dts/am335x-cm-t335.dts +0 -20
@@ -330,26 +330,6 @@ status = "okay";
 	};
 };
 
-&usb {
-	status = "okay";
-};
-
-&usb_ctrl_mod {
-	status = "okay";
-};
-
-&usb0_phy {
-	status = "okay";
-};
-
-&usb0 {
-	status = "okay";
-};
-
-&cppi41dma  {
-	status = "okay";
-};
-
 &epwmss0 {
 	status = "okay";
 
arch/arm/boot/dts/am335x-evm.dts +0 -25
@@ -433,35 +433,10 @@
 	};
 };
 
-&usb {
-	status = "okay";
-};
-
-&usb_ctrl_mod {
-	status = "okay";
-};
-
-&usb0_phy {
-	status = "okay";
-};
-
-&usb1_phy {
-	status = "okay";
-};
-
-&usb0 {
-	status = "okay";
-};
-
 &usb1 {
-	status = "okay";
 	dr_mode = "host";
 };
 
-&cppi41dma  {
-	status = "okay";
-};
-
 &i2c1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2c1_pins>;
arch/arm/boot/dts/am335x-evmsk.dts +0 -25
@@ -523,35 +523,10 @@
 	};
 };
 
-&usb {
-	status = "okay";
-};
-
-&usb_ctrl_mod {
-	status = "okay";
-};
-
-&usb0_phy {
-	status = "okay";
-};
-
-&usb1_phy {
-	status = "okay";
-};
-
-&usb0 {
-	status = "okay";
-};
-
 &usb1 {
-	status = "okay";
 	dr_mode = "host";
 };
 
-&cppi41dma  {
-	status = "okay";
-};
-
 &epwmss2 {
 	status = "okay";
 
arch/arm/boot/dts/am335x-guardian.dts +0 -22
@@ -115,10 +115,6 @@
 	};
 };
 
-&cppi41dma  {
-	status = "okay";
-};
-
 &elm {
 	status = "okay";
 };
@@ -328,30 +324,12 @@
 	status = "okay";
 };
 
-&usb {
-	status = "okay";
-};
-
-&usb_ctrl_mod {
-	status = "okay";
-};
-
 &usb0 {
 	dr_mode = "peripheral";
-	status = "okay";
-};
-
-&usb0_phy {
-	status = "okay";
 };
 
 &usb1 {
 	dr_mode = "host";
-	status = "okay";
-};
-
-&usb1_phy {
-	status = "okay";
 };
 
 &am33xx_pinmux {
arch/arm/boot/dts/am335x-igep0033.dtsi +0 -25
@@ -217,35 +217,10 @@
 	pinctrl-0 = <&uart0_pins>;
 };
 
-&usb {
-	status = "okay";
-};
-
-&usb_ctrl_mod {
-	status = "okay";
-};
-
-&usb0_phy {
-	status = "okay";
-};
-
-&usb1_phy {
-	status = "okay";
-};
-
-&usb0 {
-	status = "okay";
-};
-
 &usb1 {
-	status = "okay";
 	dr_mode = "host";
 };
 
-&cppi41dma  {
-	status = "okay";
-};
-
 #include "tps65910.dtsi"
 
 &tps {
arch/arm/boot/dts/am335x-lxm.dts +0 -22
@@ -283,36 +283,14 @@
 	status = "okay";
 };
 
-&usb {
-	status = "okay";
-};
-
-&usb_ctrl_mod {
-	status = "okay";
-};
-
-&usb0_phy {
-	status = "okay";
-};
-
-&usb1_phy {
-	status = "okay";
-};
-
 &usb0 {
-	status = "okay";
 	dr_mode = "host";
 };
 
 &usb1 {
-	status = "okay";
 	dr_mode = "host";
 };
 
-&cppi41dma  {
-	status = "okay";
-};
-
 &cpsw_emac0 {
 	phy-handle = <&ethphy0>;
 	phy-mode = "rmii";
arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi +0 -17
@@ -111,27 +111,10 @@
 	};
 };
 
-&usb {
-	status = "okay";
-};
-
-&usb_ctrl_mod {
-	status = "okay";
-};
-
-&usb0_phy {
-	status = "okay";
-};
-
 &usb0 {
-	status = "okay";
 	dr_mode = "host";
 };
 
-&cppi41dma  {
-	status = "okay";
-};
-
 /* Power */
 &vbat {
 	regulator-name = "vbat";
arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts +0 -22
@@ -290,36 +290,14 @@
 	};
 };
 
-&usb {
-	status = "okay";
-};
-
-&usb_ctrl_mod {
-	status = "okay";
-};
-
-&usb0_phy {
-	status = "okay";
-};
-
-&usb1_phy {
-	status = "okay";
-};
-
 &usb0 {
-	status = "okay";
 	dr_mode = "host";
 };
 
 &usb1 {
-	status = "okay";
 	dr_mode = "host";
 };
 
-&cppi41dma  {
-	status = "okay";
-};
-
 #include "tps65910.dtsi"
 
 &tps {
arch/arm/boot/dts/am335x-osd3358-sm-red.dts +0 -22
@@ -384,38 +384,16 @@
 	status = "okay";
 };
 
-&usb {
-	status = "okay";
-};
-
-&usb_ctrl_mod {
-	status = "okay";
-};
-
-&usb0_phy {
-	status = "okay";
-};
-
-&usb1_phy {
-	status = "okay";
-};
-
 &usb0 {
-	status = "okay";
 	dr_mode = "peripheral";
 	interrupts-extended = <&intc 18 &tps 0>;
 	interrupt-names = "mc", "vbus";
 };
 
 &usb1 {
-	status = "okay";
 	dr_mode = "host";
 };
 
-&cppi41dma  {
-	status = "okay";
-};
-
 &i2c2 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2c2_pins>;
arch/arm/boot/dts/am335x-pcm-953.dtsi +0 -25
@@ -237,31 +237,6 @@
 };
 
 /* USB */
-&cppi41dma {
-	status = "okay";
-};
-
-&usb_ctrl_mod {
-	status = "okay";
-};
-
-&usb {
-	status = "okay";
-};
-
-&usb0 {
-	status = "okay";
-};
-
-&usb0_phy {
-	status = "okay";
-};
-
 &usb1 {
-	status = "okay";
 	dr_mode = "host";
 };
-
-&usb1_phy {
-	status = "okay";
-};
arch/arm/boot/dts/am335x-pdu001.dts +0 -28
@@ -384,34 +384,6 @@
 	};
 };
 
-&usb {
-	status = "okay";
-};
-
-&usb_ctrl_mod {
-	status = "okay";
-};
-
-&usb0_phy {
-	status = "okay";
-};
-
-&usb1_phy {
-	status = "okay";
-};
-
-&usb0 {
-	status = "okay";
-};
-
-&usb1 {
-	status = "okay";
-};
-
-&cppi41dma  {
-	status = "okay";
-};
-
 /*
  * Disable soc's rtc as we have no VBAT for it. This makes the board
  * rtc (Microchip MCP79400) the default rtc device 'rtc0'.
arch/arm/boot/dts/am335x-pepper.dts +0 -20
@@ -552,38 +552,18 @@
 
 /* USB */
 &usb {
-	status = "okay";
-
 	pinctrl-names = "default";
 	pinctrl-0 = <&usb_pins>;
 };
 
-&usb_ctrl_mod {
-	status = "okay";
-};
-
-&usb0_phy {
-	status = "okay";
-};
-
-&usb1_phy {
-	status = "okay";
-};
-
 &usb0 {
-	status = "okay";
         dr_mode = "host";
 };
 
 &usb1 {
-	status = "okay";
         dr_mode = "host";
 };
 
-&cppi41dma {
-	status = "okay";
-};
-
 &am33xx_pinmux {
 	usb_pins: pinmux_usb {
 		pinctrl-single,pins = <
arch/arm/boot/dts/am335x-pocketbeagle.dts +0 -22
@@ -206,32 +206,10 @@
 	status = "okay";
 };
 
-&usb {
-	status = "okay";
-};
-
-&usb_ctrl_mod {
-	status = "okay";
-};
-
-&usb0_phy {
-	status = "okay";
-};
-
 &usb0 {
-	status = "okay";
 	dr_mode = "otg";
 };
 
-&usb1_phy {
-	status = "okay";
-};
-
 &usb1 {
-	status = "okay";
 	dr_mode = "host";
 };
-
-&cppi41dma  {
-	status = "okay";
-};
arch/arm/boot/dts/am335x-regor.dtsi +0 -21
@@ -200,24 +200,3 @@
 	status = "okay";
 	linux,rs485-enabled-at-boot-time;
 };
-
-/* USB */
-&cppi41dma {
-	status = "okay";
-};
-
-&usb_ctrl_mod {
-	status = "okay";
-};
-
-&usb {
-	status = "okay";
-};
-
-&usb0 {
-	status = "okay";
-};
-
-&usb0_phy {
-	status = "okay";
-};
arch/arm/boot/dts/am335x-shc.dts +0 -17
@@ -117,10 +117,6 @@
 	status = "okay";
 };
 
-&cppi41dma  {
-	status = "okay";
-};
-
 &davinci_mdio {
 	pinctrl-names = "default", "sleep";
 	pinctrl-0 = <&davinci_mdio_default>;
@@ -358,20 +354,7 @@
 	status = "okay";
 };
 
-&usb {
-	status = "okay";
-};
-
-&usb_ctrl_mod {
-	status = "okay";
-};
-
-&usb1_phy {
-	status = "okay";
-};
-
 &usb1 {
-	status = "okay";
 	dr_mode = "host";
 };
 
arch/arm/boot/dts/am335x-sl50.dts +0 -22
@@ -512,36 +512,14 @@
 	status = "disabled";
 };
 
-&usb {
-	status = "okay";
-};
-
-&usb_ctrl_mod {
-	status = "okay";
-};
-
-&usb0_phy {
-	status = "okay";
-};
-
-&usb1_phy {
-	status = "okay";
-};
-
 &usb0 {
-	status = "okay";
 	dr_mode = "otg";
 };
 
 &usb1 {
-	status = "okay";
 	dr_mode = "host";
 };
 
-&cppi41dma  {
-	status = "okay";
-};
-
 &mmc1 {
 	status = "okay";
 	pinctrl-names = "default";
arch/arm/boot/dts/am335x-wega.dtsi +0 -26
@@ -191,32 +191,6 @@
 	status = "okay";
 };
 
-/* USB */
-&cppi41dma {
-	status = "okay";
-};
-
-&usb_ctrl_mod {
-	status = "okay";
-};
-
-&usb {
-	status = "okay";
-};
-
-&usb0 {
-	status = "okay";
-};
-
-&usb0_phy {
-	status = "okay";
-};
-
 &usb1 {
 	dr_mode = "host";
-	status = "okay";
-};
-
-&usb1_phy {
-	status = "okay";
 };
Signature · 1 line
2.23.0
author maintainer
#3 lore raw

PATCH 3/3 ARM: OMAP2+: Drop legacy platform data for am335x musb

In reply to Tony Lindgren

We can now probe devices with ti-sysc interconnect driver and dts data. Let's drop the related platform data and custom ti,hwmods dts property.

---
 arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 44 ----------------------
 1 file changed, 44 deletions(-)
arch/arm/mach-omap2/omap_hwmod_33xx_data.c +0 -44
@@ -254,39 +254,6 @@ static struct omap_hwmod am33xx_lcdc_hwmod = {
 	},
 };
 
-/*
- * 'usb_otg' class
- * high-speed on-the-go universal serial bus (usb_otg) controller
- */
-static struct omap_hwmod_class_sysconfig am33xx_usbhsotg_sysc = {
-	.rev_offs	= 0x0,
-	.sysc_offs	= 0x10,
-	.sysc_flags	= (SYSC_HAS_SIDLEMODE | SYSC_HAS_MIDLEMODE),
-	.idlemodes	= (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
-			  MSTANDBY_FORCE | MSTANDBY_NO | MSTANDBY_SMART),
-	.sysc_fields	= &omap_hwmod_sysc_type2,
-};
-
-static struct omap_hwmod_class am33xx_usbotg_class = {
-	.name		= "usbotg",
-	.sysc		= &am33xx_usbhsotg_sysc,
-};
-
-static struct omap_hwmod am33xx_usbss_hwmod = {
-	.name		= "usb_otg_hs",
-	.class		= &am33xx_usbotg_class,
-	.clkdm_name	= "l3s_clkdm",
-	.flags		= HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY,
-	.main_clk	= "usbotg_fck",
-	.prcm		= {
-		.omap4	= {
-			.clkctrl_offs	= AM33XX_CM_PER_USB0_CLKCTRL_OFFSET,
-			.modulemode	= MODULEMODE_SWCTRL,
-		},
-	},
-};
-
-
 /*
  * Interfaces
  */
@@ -386,16 +353,6 @@ static struct omap_hwmod_ocp_if am33xx_l4_wkup__timer1 = {
 	.user		= OCP_USER_MPU,
 };
 
-/* usbss */
-/* l3 s -> USBSS interface */
-static struct omap_hwmod_ocp_if am33xx_l3_s__usbss = {
-	.master		= &am33xx_l3_s_hwmod,
-	.slave		= &am33xx_usbss_hwmod,
-	.clk		= "l3s_gclk",
-	.user		= OCP_USER_MPU,
-	.flags		= OCPIF_SWSUP_IDLE,
-};
-
 static struct omap_hwmod_ocp_if *am33xx_hwmod_ocp_ifs[] __initdata = {
 	&am33xx_l3_main__emif,
 	&am33xx_mpu__l3_main,
@@ -441,7 +398,6 @@ static struct omap_hwmod_ocp_if *am33xx_hwmod_ocp_ifs[] __initdata = {
 	&am33xx_l3_main__tptc1,
 	&am33xx_l3_main__tptc2,
 	&am33xx_l3_main__ocmc,
-	&am33xx_l3_s__usbss,
 	&am33xx_l3_main__sha0,
 	&am33xx_l3_main__aes0,
 	NULL,
Signature · 1 line
2.23.0