public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Andreas Dannenberg <dannenberg@ti.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 03/18] arm: dts: k3-am65: Move pinctrl nodes out of U-Boot specific dtsi
Date: Wed, 8 May 2019 16:37:36 -0500	[thread overview]
Message-ID: <20190508213751.23179-4-dannenberg@ti.com> (raw)
In-Reply-To: <20190508213751.23179-1-dannenberg@ti.com>

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>
---
 arch/arm/dts/k3-am65-main.dtsi               | 16 ++++++++++++++
 arch/arm/dts/k3-am65-wakeup.dtsi             |  8 +++++++
 arch/arm/dts/k3-am654-base-board-u-boot.dtsi | 23 --------------------
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/arch/arm/dts/k3-am65-main.dtsi b/arch/arm/dts/k3-am65-main.dtsi
index adcd6341e4..f7c2a60d5c 100644
--- a/arch/arm/dts/k3-am65-main.dtsi
+++ b/arch/arm/dts/k3-am65-main.dtsi
@@ -69,4 +69,20 @@
 		clock-frequency = <48000000>;
 		current-speed = <115200>;
 	};
+
+	main_pmx0: pinmux at 11c000 {
+		compatible = "pinctrl-single";
+		reg = <0x0 0x11c000 0x0 0x2e4>;
+		#pinctrl-cells = <1>;
+		pinctrl-single,register-width = <32>;
+		pinctrl-single,function-mask = <0xffffffff>;
+	};
+
+	main_pmx1: pinmux at 11c2e8 {
+		compatible = "pinctrl-single";
+		reg = <0x0 0x11c2e8 0x0 0x24>;
+		#pinctrl-cells = <1>;
+		pinctrl-single,register-width = <32>;
+		pinctrl-single,function-mask = <0xffffffff>;
+	};
 };
diff --git a/arch/arm/dts/k3-am65-wakeup.dtsi b/arch/arm/dts/k3-am65-wakeup.dtsi
index 1f591ef8bb..1b67747dfe 100644
--- a/arch/arm/dts/k3-am65-wakeup.dtsi
+++ b/arch/arm/dts/k3-am65-wakeup.dtsi
@@ -34,6 +34,14 @@
 		};
 	};
 
+	wkup_pmx0: pinmux at 4301c000 {
+		compatible = "pinctrl-single";
+		reg = <0x4301c000 0x118>;
+		#pinctrl-cells = <1>;
+		pinctrl-single,register-width = <32>;
+		pinctrl-single,function-mask = <0xffffffff>;
+	};
+
 	wkup_uart0: serial at 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 f5c8253831..c802f0b2b7 100644
--- a/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
+++ b/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
@@ -19,22 +19,6 @@
 &cbass_main{
 	u-boot,dm-spl;
 
-	main_pmx0: pinmux at 11c000 {
-		compatible = "pinctrl-single";
-		reg = <0x0 0x11c000 0x0 0x2e4>;
-		#pinctrl-cells = <1>;
-		pinctrl-single,register-width = <32>;
-		pinctrl-single,function-mask = <0xffffffff>;
-	};
-
-	main_pmx1: pinmux at 11c2e8 {
-		compatible = "pinctrl-single";
-		reg = <0x0 0x11c2e8 0x0 0x24>;
-		#pinctrl-cells = <1>;
-		pinctrl-single,register-width = <32>;
-		pinctrl-single,function-mask = <0xffffffff>;
-	};
-
 	sdhci0: sdhci at 04F80000 {
 		compatible = "arasan,sdhci-5.1";
 		reg = <0x0 0x4F80000 0x0 0x1000>,
@@ -57,13 +41,6 @@
 
 &cbass_mcu {
 	u-boot,dm-spl;
-	wkup_pmx0: pinmux at 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";
-- 
2.17.1

  parent reply	other threads:[~2019-05-08 21:37 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-08 21:37 [U-Boot] [PATCH 00/18] Add EEPROM-based board detect support for TI Andreas Dannenberg
2019-05-08 21:37 ` [U-Boot] [PATCH 01/18] i2c: omap24xx_i2c: Adapt driver to support K3 devices Andreas Dannenberg
2019-05-09 11:19   ` Heiko Schocher
2019-05-08 21:37 ` [U-Boot] [PATCH 02/18] arm: omap_i2c: Remove unwanted header file inclusion Andreas Dannenberg
2019-05-09 11:20   ` Heiko Schocher
2019-05-08 21:37 ` Andreas Dannenberg [this message]
2019-05-08 21:37 ` [U-Boot] [PATCH 04/18] arm: dts: k3-am65: Add I2C nodes Andreas Dannenberg
2019-05-08 21:37 ` [U-Boot] [PATCH 05/18] arm: dts: k3-am654-base-board: Enable wkup_i2c0 across all boot stages Andreas Dannenberg
2019-05-08 21:37 ` [U-Boot] [PATCH 06/18] configs: am65x_evm_defconfig: Enable I2C support Andreas Dannenberg
2019-05-08 21:37 ` [U-Boot] [PATCH 07/18] configs: am65x_hs_evm_defconfig: " Andreas Dannenberg
2019-05-08 21:53   ` Andrew F. Davis
2019-05-08 21:37 ` [U-Boot] [PATCH 08/18] arm64: dts: k3-am654-base-board: Add I2C GPIO expander @ 0x38 Andreas Dannenberg
2019-05-08 21:37 ` [U-Boot] [PATCH 09/18] configs: am65x_evm_a53: Enable PCA953X-type GPIO driver Andreas Dannenberg
2019-05-08 21:37 ` [U-Boot] [PATCH 10/18] configs: am65x_hs_evm_a53: " Andreas Dannenberg
2019-05-08 21:37 ` [U-Boot] [PATCH 11/18] configs: am65x_evm_a53: Increase malloc pool before relocation Andreas Dannenberg
2019-05-08 21:37 ` [U-Boot] [PATCH 12/18] configs: am65x_hs_evm_a53: " Andreas Dannenberg
2019-05-08 21:37 ` [U-Boot] [PATCH 13/18] arm: K3: am654: Map common EEPROM data into SRAM scratch space Andreas Dannenberg
2019-05-09  3:52   ` Lokesh Vutla
2019-05-09 16:03     ` Andrew F. Davis
2019-05-09 16:27       ` Andreas Dannenberg
2019-05-15 20:11         ` Andreas Dannenberg
2019-05-08 21:37 ` [U-Boot] [PATCH 14/18] ti: common: am6: Add support for board description EEPROM Andreas Dannenberg
2019-05-08 21:37 ` [U-Boot] [PATCH 15/18] ti: common: am6: Add support for setting MAC addresses Andreas Dannenberg
2019-05-08 21:37 ` [U-Boot] [PATCH 16/18] board: ti: am654: Use EEPROM-based board detection Andreas Dannenberg
2019-05-08 21:37 ` [U-Boot] [PATCH 17/18] configs: am65x_evm: Add support for applying overlays Andreas Dannenberg
2019-05-08 21:37 ` [U-Boot] [PATCH 18/18] configs: am65x_hs_evm: " Andreas Dannenberg
2019-05-16 20:25 ` [U-Boot] [PATCH 00/18] Add EEPROM-based board detect support for TI Lokesh Vutla

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190508213751.23179-4-dannenberg@ti.com \
    --to=dannenberg@ti.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox