diff options
| author | Andreas Dannenberg <dannenberg@ti.com> | 2019-06-04 18:08:13 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-17 11:12:54 -0400 |
| commit | 9bbdfdf209027f0fd71af159dc37ec40209081f1 (patch) | |
| tree | dd5d21dd76fac73ec4eb86d5b17c4bc28cf9407e | |
| parent | 4fd4c898f03079eac5c983ed82bcbeb30e565329 (diff) | |
| download | u-boot-9bbdfdf209027f0fd71af159dc37ec40209081f1.zip u-boot-9bbdfdf209027f0fd71af159dc37ec40209081f1.tar.gz u-boot-9bbdfdf209027f0fd71af159dc37ec40209081f1.tar.bz2 | |
arm: dts: k3-am65: Move pinctrl nodes out of U-Boot specific dtsi
Only U-Boot specifc DT properties or overrides, must be in -u-boot.dtsi.
Pinctrl nodes does not belong here. Now that pinctrl nodes are in kernel
DT, there is no reason to be keep these in -u-boot.dtsi. Move them to
proper places so that it would ease copying DT entries from kernel DT.
Signed-off-by: Vignesh R <vigneshr@ti.com>
Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
| -rw-r--r-- | arch/arm/dts/k3-am65-main.dtsi | 8 | ||||
| -rw-r--r-- | arch/arm/dts/k3-am65-wakeup.dtsi | 8 | ||||
| -rw-r--r-- | arch/arm/dts/k3-am654-base-board-u-boot.dtsi | 15 |
3 files changed, 16 insertions, 15 deletions
diff --git a/arch/arm/dts/k3-am65-main.dtsi b/arch/arm/dts/k3-am65-main.dtsi index 84fed12..a97872f 100644 --- a/arch/arm/dts/k3-am65-main.dtsi +++ b/arch/arm/dts/k3-am65-main.dtsi @@ -78,6 +78,14 @@ pinctrl-single,function-mask = <0xffffffff>; }; + main_pmx1: pinmux@11c2e8 { + compatible = "pinctrl-single"; + reg = <0x0 0x11c2e8 0x0 0x24>; + #pinctrl-cells = <1>; + pinctrl-single,register-width = <32>; + pinctrl-single,function-mask = <0xffffffff>; + }; + sdhci0: sdhci@4f80000 { compatible = "ti,am654-sdhci-5.1"; reg = <0x0 0x4f80000 0x0 0x260>, <0x0 0x4f90000 0x0 0x134>; diff --git a/arch/arm/dts/k3-am65-wakeup.dtsi b/arch/arm/dts/k3-am65-wakeup.dtsi index 1f591ef..1b67747 100644 --- a/arch/arm/dts/k3-am65-wakeup.dtsi +++ b/arch/arm/dts/k3-am65-wakeup.dtsi @@ -34,6 +34,14 @@ }; }; + wkup_pmx0: pinmux@4301c000 { + compatible = "pinctrl-single"; + reg = <0x4301c000 0x118>; + #pinctrl-cells = <1>; + pinctrl-single,register-width = <32>; + pinctrl-single,function-mask = <0xffffffff>; + }; + wkup_uart0: serial@42300000 { compatible = "ti,am654-uart"; reg = <0x42300000 0x100>; diff --git a/arch/arm/dts/k3-am654-base-board-u-boot.dtsi b/arch/arm/dts/k3-am654-base-board-u-boot.dtsi index 71d6c31..5d9ecb6 100644 --- a/arch/arm/dts/k3-am654-base-board-u-boot.dtsi +++ b/arch/arm/dts/k3-am654-base-board-u-boot.dtsi @@ -21,14 +21,6 @@ &cbass_main{ u-boot,dm-spl; - main_pmx1: pinmux@11c2e8 { - compatible = "pinctrl-single"; - reg = <0x0 0x11c2e8 0x0 0x24>; - #pinctrl-cells = <1>; - pinctrl-single,register-width = <32>; - pinctrl-single,function-mask = <0xffffffff>; - }; - sdhci1: sdhci@04FA0000 { compatible = "ti,am654-sdhci-5.1"; reg = <0x0 0x4FA0000 0x0 0x1000>, @@ -44,13 +36,6 @@ &cbass_mcu { u-boot,dm-spl; - wkup_pmx0: pinmux@4301c000 { - compatible = "pinctrl-single"; - reg = <0x0 0x4301c000 0x0 0x118>; - #pinctrl-cells = <1>; - pinctrl-single,register-width = <32>; - pinctrl-single,function-mask = <0xffffffff>; - }; navss_mcu: navss-mcu { compatible = "simple-bus"; |