summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/am33xx.dtsi
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2019-10-24 23:31:27 +0300
committerOlof Johansson <olof@lixom.net>2019-10-24 23:31:28 +0300
commit960a02765a7d636bf09518c0b1bebcd2aaa0166e (patch)
treecb6dcbd7e144bb8495fb965e1b5c6d9165c0a6ca /arch/arm/boot/dts/am33xx.dtsi
parentfcf371fd7db5085d670aea8a5e4501f29ee74a2b (diff)
parentb08a0c577518a02ea08673f68881223a3ed35cc6 (diff)
downloadlinux-960a02765a7d636bf09518c0b1bebcd2aaa0166e.tar.xz
Merge tag 'omap-for-v5.5/ti-sysc-drop-pdata-v2-signed-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/dt
Drop legacy platform data for omaps for v5.5 This series of changes continues dropping legacy platform data for omaps. With the proper device tree configuration in place in the dts files for ti-sysc interconnect target module driver, we can drop the related platform data and legacy ti,hwmods custom property. Most of the patches in this series drop platform data and custom dts property one device class and one SoC at time. This way we can easily revert one patch at a time in case of unexpected issues if the fix is not trivial. For am335x musb, we need to first update the device tree to probe with ti-sysc interconnect target module driver. And then the following patches drop the legacy platform data. Note that this series depends on earlier ti-sysc related driver changes * tag 'omap-for-v5.5/ti-sysc-drop-pdata-v2-signed-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (40 commits) ARM: OMAP2+: Drop legacy platform data for am335x musb ARM: dts: Drop pointless status changing for am3 musb ARM: dts: Probe am335x musb with ti-sysc ARM: OMAP2+: Drop legacy platform data for musb on omap4 ARM: OMAP2+: Drop legacy platform data for omap4 mcasp ARM: OMAP2+: Drop legacy platform data for am3 and am4 mcasp ARM: OMAP2+: Drop legacy platform data for dra7 rng ARM: OMAP2+: Drop legacy platform data for am3 and am4 rng ARM: OMAP2+: Drop legacy platform data for omap4 hdq1w ARM: OMAP2+: Drop legacy platform data for dra7 hdq1w ARM: OMAP2+: Drop legacy platform data for am4 hdq1w ARM: OMAP2+: Drop legacy platform data for omap5 mcbsp ARM: OMAP2+: Drop legacy platform data for omap4 mcbsp ARM: OMAP2+: Drop legacy platform data for omap5 wdt ARM: OMAP2+: Drop legacy platform data for dra7 wdt ARM: OMAP2+: Drop legacy platform data for am3 and am4 wdt ARM: dts: Drop custom hwmod property for omap5 mmc ARM: dts: Drop custom hwmod property for am4 mmc ARM: dts: Drop custom hwmod property for am3 mmc ARM: dts: Drop custom hwmod property for omap5 i2c ... Link: https://lore.kernel.org/r/pull-1571934890-285615@atomide.com-3 Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/am33xx.dtsi')
-rw-r--r--arch/arm/boot/dts/am33xx.dtsi67
1 files changed, 32 insertions, 35 deletions
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 765963de5d41..ba26c71a38e3 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -236,7 +236,6 @@
target-module@47810000 {
compatible = "ti,sysc-omap2", "ti,sysc";
- ti,hwmods = "mmc3";
reg = <0x478102fc 0x4>,
<0x47810110 0x4>,
<0x47810114 0x4>;
@@ -263,37 +262,38 @@
};
};
- usb: usb@47400000 {
- compatible = "ti,am33xx-usb";
- reg = <0x47400000 0x1000>;
- ranges;
+ usb: target-module@47400000 {
+ compatible = "ti,sysc-omap4", "ti,sysc";
+ reg = <0x47400000 0x4>,
+ <0x47400010 0x4>;
+ reg-names = "rev", "sysc";
+ ti,sysc-mask = <(SYSC_OMAP4_FREEEMU |
+ SYSC_OMAP2_SOFTRESET)>;
+ ti,sysc-midle = <SYSC_IDLE_FORCE>,
+ <SYSC_IDLE_NO>,
+ <SYSC_IDLE_SMART>;
+ ti,sysc-sidle = <SYSC_IDLE_FORCE>,
+ <SYSC_IDLE_NO>,
+ <SYSC_IDLE_SMART>,
+ <SYSC_IDLE_SMART_WKUP>;
+ clocks = <&l3s_clkctrl AM3_L3S_USB_OTG_HS_CLKCTRL 0>;
+ clock-names = "fck";
#address-cells = <1>;
#size-cells = <1>;
- ti,hwmods = "usb_otg_hs";
- status = "disabled";
-
- usb_ctrl_mod: control@44e10620 {
- compatible = "ti,am335x-usb-ctrl-module";
- reg = <0x44e10620 0x10
- 0x44e10648 0x4>;
- reg-names = "phy_ctrl", "wakeup";
- status = "disabled";
- };
+ ranges = <0x0 0x47400000 0x5000>;
- usb0_phy: usb-phy@47401300 {
+ usb0_phy: usb-phy@1300 {
compatible = "ti,am335x-usb-phy";
- reg = <0x47401300 0x100>;
+ reg = <0x1300 0x100>;
reg-names = "phy";
- status = "disabled";
ti,ctrl_mod = <&usb_ctrl_mod>;
#phy-cells = <0>;
};
- usb0: usb@47401000 {
+ usb0: usb@1400 {
compatible = "ti,musb-am33xx";
- status = "disabled";
- reg = <0x47401400 0x400
- 0x47401000 0x200>;
+ reg = <0x1400 0x400>,
+ <0x1000 0x200>;
reg-names = "mc", "control";
interrupts = <18>;
@@ -329,20 +329,18 @@
"tx14", "tx15";
};
- usb1_phy: usb-phy@47401b00 {
+ usb1_phy: usb-phy@1b00 {
compatible = "ti,am335x-usb-phy";
- reg = <0x47401b00 0x100>;
+ reg = <0x1b00 0x100>;
reg-names = "phy";
- status = "disabled";
ti,ctrl_mod = <&usb_ctrl_mod>;
#phy-cells = <0>;
};
- usb1: usb@47401800 {
+ usb1: usb@1800 {
compatible = "ti,musb-am33xx";
- status = "disabled";
- reg = <0x47401c00 0x400
- 0x47401800 0x200>;
+ reg = <0x1c00 0x400>,
+ <0x1800 0x200>;
reg-names = "mc", "control";
interrupts = <19>;
interrupt-names = "mc";
@@ -377,19 +375,18 @@
"tx14", "tx15";
};
- cppi41dma: dma-controller@47402000 {
+ cppi41dma: dma-controller@2000 {
compatible = "ti,am3359-cppi41";
- reg = <0x47400000 0x1000
- 0x47402000 0x1000
- 0x47403000 0x1000
- 0x47404000 0x4000>;
+ reg = <0x0000 0x1000>,
+ <0x2000 0x1000>,
+ <0x3000 0x1000>,
+ <0x4000 0x4000>;
reg-names = "glue", "controller", "scheduler", "queuemgr";
interrupts = <17>;
interrupt-names = "glue";
#dma-cells = <2>;
#dma-channels = <30>;
#dma-requests = <256>;
- status = "disabled";
};
};