[U-Boot] [RFC PATCH 6/7] ARM: dts: UniPhier: add nodes for pinctrl devices and pin configs

15 Jul 2015

Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
---
arch/arm/dts/uniphier-ph1-ld4.dtsi  | 30 ++++++++++++++
 arch/arm/dts/uniphier-ph1-pro4.dtsi | 34 ++++++++++++++++
 arch/arm/dts/uniphier-ph1-sld8.dtsi | 30 ++++++++++++++
 arch/arm/dts/uniphier-pinctrl.dtsi  | 80 +++++++++++++++++++++++++++++++++++++
 4 files changed, 174 insertions(+)
 create mode 100644 arch/arm/dts/uniphier-pinctrl.dtsi

diff --git a/arch/arm/dts/uniphier-ph1-ld4.dtsi b/arch/arm/dts/uniphier-ph1-ld4.dtsi
index 5a1d10c..356f637 100644
--- a/arch/arm/dts/uniphier-ph1-ld4.dtsi
+++ b/arch/arm/dts/uniphier-ph1-ld4.dtsi
@@ -47,6 +47,8 @@
    		compatible = "socionext,uniphier-uart";
    		status = "disabled";
    		reg = <0x54006800 0x20>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_uart0>;
    		clock-frequency = <36864000>;
    	};
@@ -54,6 +56,8 @@
    		compatible = "socionext,uniphier-uart";
    		status = "disabled";
    		reg = <0x54006900 0x20>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_uart1>;
    		clock-frequency = <36864000>;
    	};
@@ -61,6 +65,8 @@
    		compatible = "socionext,uniphier-uart";
    		status = "disabled";
    		reg = <0x54006a00 0x20>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_uart2>;
    		clock-frequency = <36864000>;
    	};
@@ -68,6 +74,8 @@
    		compatible = "socionext,uniphier-uart";
    		status = "disabled";
    		reg = <0x54006b00 0x20>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_uart3>;
    		clock-frequency = <36864000>;
    	};
@@ -84,6 +92,8 @@
    		#address-cells = <1>;
    		#size-cells = <0>;
    		reg = <0x58400000 0x40>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_i2c0>;
    		clock-frequency = <100000>;
    		status = "disabled";
    	};
@@ -93,6 +103,8 @@
    		#address-cells = <1>;
    		#size-cells = <0>;
    		reg = <0x58480000 0x40>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_i2c1>;
    		clock-frequency = <100000>;
    		status = "disabled";
    	};
@@ -102,6 +114,8 @@
    		#address-cells = <1>;
    		#size-cells = <0>;
    		reg = <0x58500000 0x40>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_i2c2>;
    		clock-frequency = <100000>;
    		status = "disabled";
    	};
@@ -111,6 +125,8 @@
    		#address-cells = <1>;
    		#size-cells = <0>;
    		reg = <0x58580000 0x40>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_i2c3>;
    		clock-frequency = <100000>;
    		status = "disabled";
    	};
@@ -137,18 +153,30 @@
    		compatible = "socionext,uniphier-ehci", "generic-ehci";
    		status = "disabled";
    		reg = <0x5a800100 0x100>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_usb0>;
    	};
usb1: usb@5a810100 {
    		compatible = "socionext,uniphier-ehci", "generic-ehci";
    		status = "disabled";
    		reg = <0x5a810100 0x100>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_usb1>;
    	};
usb2: usb@5a820100 {
    		compatible = "socionext,uniphier-ehci", "generic-ehci";
    		status = "disabled";
    		reg = <0x5a820100 0x100>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_usb2>;
+		};
+
+		pinctrl: pinctrl@5f801000 {
+			compatible = "socionext,ph1-ld4-pinctrl",
+				     "syscon";
+			reg = <0x5f801000 0xe00>;
    	};
timer@60000200 {
@@ -180,3 +208,5 @@
    	};
    };
 };
+
+/include/ "uniphier-pinctrl.dtsi"
diff --git a/arch/arm/dts/uniphier-ph1-pro4.dtsi b/arch/arm/dts/uniphier-ph1-pro4.dtsi
index 88fc48c..fa006fd 100644
--- a/arch/arm/dts/uniphier-ph1-pro4.dtsi
+++ b/arch/arm/dts/uniphier-ph1-pro4.dtsi
@@ -54,6 +54,8 @@
    		compatible = "socionext,uniphier-uart";
    		status = "disabled";
    		reg = <0x54006800 0x20>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_uart0>;
    		clock-frequency = <73728000>;
    	};
@@ -61,6 +63,8 @@
    		compatible = "socionext,uniphier-uart";
    		status = "disabled";
    		reg = <0x54006900 0x20>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_uart1>;
    		clock-frequency = <73728000>;
    	};
@@ -68,6 +72,8 @@
    		compatible = "socionext,uniphier-uart";
    		status = "disabled";
    		reg = <0x54006a00 0x20>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_uart2>;
    		clock-frequency = <73728000>;
    	};
@@ -75,6 +81,8 @@
    		compatible = "socionext,uniphier-uart";
    		status = "disabled";
    		reg = <0x54006b00 0x20>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_uart3>;
    		clock-frequency = <73728000>;
    	};
@@ -91,6 +99,8 @@
    		#address-cells = <1>;
    		#size-cells = <0>;
    		reg = <0x58780000 0x80>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_i2c0>;
    		clock-frequency = <100000>;
    		status = "disabled";
    	};
@@ -100,6 +110,8 @@
    		#address-cells = <1>;
    		#size-cells = <0>;
    		reg = <0x58781000 0x80>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_i2c1>;
    		clock-frequency = <100000>;
    		status = "disabled";
    	};
@@ -109,6 +121,8 @@
    		#address-cells = <1>;
    		#size-cells = <0>;
    		reg = <0x58782000 0x80>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_i2c2>;
    		clock-frequency = <100000>;
    		status = "disabled";
    	};
@@ -118,6 +132,8 @@
    		#address-cells = <1>;
    		#size-cells = <0>;
    		reg = <0x58783000 0x80>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_i2c3>;
    		clock-frequency = <100000>;
    		status = "disabled";
    	};
@@ -138,6 +154,8 @@
    		#address-cells = <1>;
    		#size-cells = <0>;
    		reg = <0x58786000 0x80>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_i2c6>;
    		clock-frequency = <400000>;
    		status = "ok";
    	};
@@ -170,24 +188,38 @@
    		compatible = "socionext,uniphier-ehci", "generic-ehci";
    		status = "disabled";
    		reg = <0x5a800100 0x100>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_usb2>;
    	};
usb3: usb@5a810100 {
    		compatible = "socionext,uniphier-ehci", "generic-ehci";
    		status = "disabled";
    		reg = <0x5a810100 0x100>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_usb3>;
+		};
+
+		pinctrl: pinctrl@5f801000 {
+			compatible = "socionext,ph1-pro4-pinctrl",
+				     "syscon";
+			reg = <0x5f801000 0xe00>;
    	};
usb0: usb@65a00000 {
    		compatible = "socionext,uniphier-xhci", "generic-xhci";
    		status = "disabled";
    		reg = <0x65a00000 0x100>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_usb0>;
    	};
usb1: usb@65c00000 {
    		compatible = "socionext,uniphier-xhci", "generic-xhci";
    		status = "disabled";
    		reg = <0x65c00000 0x100>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_usb1>;
    	};
timer@60000200 {
@@ -219,3 +251,5 @@
    	};
    };
 };
+
+/include/ "uniphier-pinctrl.dtsi"
diff --git a/arch/arm/dts/uniphier-ph1-sld8.dtsi b/arch/arm/dts/uniphier-ph1-sld8.dtsi
index f8d42bb..023d3f2 100644
--- a/arch/arm/dts/uniphier-ph1-sld8.dtsi
+++ b/arch/arm/dts/uniphier-ph1-sld8.dtsi
@@ -47,6 +47,8 @@
    		compatible = "socionext,uniphier-uart";
    		status = "disabled";
    		reg = <0x54006800 0x20>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_uart0>;
    		clock-frequency = <80000000>;
    	};
@@ -54,6 +56,8 @@
    		compatible = "socionext,uniphier-uart";
    		status = "disabled";
    		reg = <0x54006900 0x20>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_uart1>;
    		clock-frequency = <80000000>;
    	};
@@ -61,6 +65,8 @@
    		compatible = "socionext,uniphier-uart";
    		status = "disabled";
    		reg = <0x54006a00 0x20>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_uart2>;
    		clock-frequency = <80000000>;
    	};
@@ -68,6 +74,8 @@
    		compatible = "socionext,uniphier-uart";
    		status = "disabled";
    		reg = <0x54006b00 0x20>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_uart3>;
    		clock-frequency = <80000000>;
    	};
@@ -84,6 +92,8 @@
    		#address-cells = <1>;
    		#size-cells = <0>;
    		reg = <0x58400000 0x40>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_i2c0>;
    		clock-frequency = <100000>;
    		status = "disabled";
    	};
@@ -93,6 +103,8 @@
    		#address-cells = <1>;
    		#size-cells = <0>;
    		reg = <0x58480000 0x40>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_i2c1>;
    		clock-frequency = <100000>;
    		status = "disabled";
    	};
@@ -102,6 +114,8 @@
    		#address-cells = <1>;
    		#size-cells = <0>;
    		reg = <0x58500000 0x40>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_i2c2>;
    		clock-frequency = <100000>;
    		status = "disabled";
    	};
@@ -111,6 +125,8 @@
    		#address-cells = <1>;
    		#size-cells = <0>;
    		reg = <0x58580000 0x40>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_i2c3>;
    		clock-frequency = <100000>;
    		status = "disabled";
    	};
@@ -137,18 +153,30 @@
    		compatible = "socionext,uniphier-ehci", "generic-ehci";
    		status = "disabled";
    		reg = <0x5a800100 0x100>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_usb0>;
    	};
usb1: usb@5a810100 {
    		compatible = "socionext,uniphier-ehci", "generic-ehci";
    		status = "disabled";
    		reg = <0x5a810100 0x100>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_usb1>;
    	};
usb2: usb@5a820100 {
    		compatible = "socionext,uniphier-ehci", "generic-ehci";
    		status = "disabled";
    		reg = <0x5a820100 0x100>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_usb2>;
+		};
+
+		pinctrl: pinctrl@5f801000 {
+			compatible = "socionext,ph1-sld8-pinctrl",
+				     "syscon";
+			reg = <0x5f801000 0xe00>;
    	};
timer@60000200 {
@@ -180,3 +208,5 @@
    	};
    };
 };
+
+/include/ "uniphier-pinctrl.dtsi"
diff --git a/arch/arm/dts/uniphier-pinctrl.dtsi b/arch/arm/dts/uniphier-pinctrl.dtsi
new file mode 100644
index 0000000..8f9aa01
--- /dev/null
+++ b/arch/arm/dts/uniphier-pinctrl.dtsi
@@ -0,0 +1,80 @@
+/*
+ * Device Tree Source for UniPhier SoCs pinctrl settings
+ *
+ * Copyright (C) 2015 Masahiro Yamada yamada.masahiro@socionext.com
+ *
+ * SPDX-License-Identifier:	GPL-2.0+	X11
+ */
+
+&pinctrl {
+	pinctrl_i2c0: i2c0_grp {
+		groups = "i2c0";
+		function = "i2c0";
+		pull-down;
+	};
+
+	pinctrl_i2c1: i2c1_grp {
+		groups = "i2c1";
+		function = "i2c1";
+	};
+
+	pinctrl_i2c2: i2c2_grp {
+		groups = "i2c2";
+		function = "i2c2";
+	};
+
+	pinctrl_i2c3: i2c3_grp {
+		groups = "i2c3";
+		function = "i2c3";
+	};
+
+	pinctrl_i2c5: i2c5_grp {
+		groups = "i2c5";
+		function = "i2c5";
+	};
+
+	pinctrl_i2c6: i2c6_grp {
+		groups = "i2c6";
+		function = "i2c6";
+	};
+
+	pinctrl_uart0: uart0_grp {
+		groups = "uart0";
+		function = "uart0";
+	};
+
+	pinctrl_uart1: uart1_grp {
+		groups = "uart1";
+		function = "uart1";
+	};
+
+	pinctrl_uart2: uart2_grp {
+		groups = "uart2";
+		function = "uart2";
+	};
+
+	pinctrl_uart3: uart3_grp {
+		groups = "uart3";
+		function = "uart3";
+	};
+
+	pinctrl_usb0: usb0_grp {
+		groups = "usb0";
+		function = "usb0";
+	};
+
+	pinctrl_usb1: usb1_grp {
+		groups = "usb1";
+		function = "usb1";
+	};
+
+	pinctrl_usb2: usb2_grp {
+		groups = "usb2";
+		function = "usb2";
+	};
+
+	pinctrl_usb3: usb3_grp {
+		groups = "usb3";
+		function = "usb3";
+	};
+};
-- 
1.9.1


    