| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Thu, 10 Apr 2014 14:47:43 +0200
From: Antoine Ténart
<antoine.tenart@...e-electrons.com>
To: sebastian.hesselbarth@...il.com, linus.walleij@...aro.org
Cc: Antoine Ténart
<antoine.tenart@...e-electrons.com>,
alexandre.belloni@...e-electrons.com, zmxu@...vell.com,
jszhang@...vell.com, linux-arm-kernel@...t.infradead.org,
devicetree@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: [PATCH 5/5] ARM: dts: berlin: add the pinctrl node and muxing setup for uarts
The uart0 pinmux configuration is in the dtsi because uart0 will always
use uart0-pmux to work, no other possibility. Same thing for uart1.
Signed-off-by: Antoine Ténart <antoine.tenart@...e-electrons.com>
---
arch/arm/boot/dts/berlin2.dtsi | 20 ++++++++++++++++++++
arch/arm/boot/dts/berlin2cd.dtsi | 13 +++++++++++++
arch/arm/boot/dts/berlin2q.dtsi | 20 ++++++++++++++++++++
3 files changed, 53 insertions(+)
diff --git a/arch/arm/boot/dts/berlin2.dtsi b/arch/arm/boot/dts/berlin2.dtsi
index 56a1af2f1052..43eb90c36050 100644
--- a/arch/arm/boot/dts/berlin2.dtsi
+++ b/arch/arm/boot/dts/berlin2.dtsi
@@ -176,6 +176,22 @@
};
};
+ pinctrl: pinctrl@0 {
+ compatible = "marvell,berlin2-pinctrl";
+ reg = <0xea0000 0x08>, <0xfc0000 0x44>;
+ reg-names = "global_base", "apb_base";
+
+ uart0_pmux: uart0-pmux {
+ berlin,group = "GSM4";
+ berlin,function = <0>;
+ };
+
+ uart1_pmux: uart1-pmux {
+ berlin,group = "GSM5";
+ berlin,function = <1>;
+ };
+ };
+
apb@...000 {
compatible = "simple-bus";
#address-cells = <1>;
@@ -191,6 +207,8 @@
reg-io-width = <1>;
interrupts = <8>;
clocks = <&smclk>;
+ pinctrl-0 = <&uart0_pmux>;
+ pinctrl-names = "default";
status = "disabled";
};
@@ -201,6 +219,8 @@
reg-io-width = <1>;
interrupts = <9>;
clocks = <&smclk>;
+ pinctrl-0 = <&uart1_pmux>;
+ pinctrl-names = "default";
status = "disabled";
};
diff --git a/arch/arm/boot/dts/berlin2cd.dtsi b/arch/arm/boot/dts/berlin2cd.dtsi
index 094968c27533..4c04cff89226 100644
--- a/arch/arm/boot/dts/berlin2cd.dtsi
+++ b/arch/arm/boot/dts/berlin2cd.dtsi
@@ -169,6 +169,17 @@
};
};
+ pinctrl: pinctrl@0 {
+ compatible = "marvell,berlin2cd-pinctrl";
+ reg = <0xea0000 0x08>, <0xfc0000 0x44>;
+ reg-names = "global_base", "apb_base";
+
+ uart0_pmux: uart0-pmux {
+ berlin,group = "G6";
+ berlin,function = <0>;
+ };
+ };
+
apb@...000 {
compatible = "simple-bus";
#address-cells = <1>;
@@ -184,6 +195,8 @@
reg-io-width = <1>;
interrupts = <8>;
clocks = <&smclk>;
+ pinctrl-0 = <&uart0_pmux>;
+ pinctrl-names = "default";
status = "disabled";
};
diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi
index 07452a7483fa..e6e556055dfc 100644
--- a/arch/arm/boot/dts/berlin2q.dtsi
+++ b/arch/arm/boot/dts/berlin2q.dtsi
@@ -183,6 +183,22 @@
};
};
+ pinctrl: pinctrl@0 {
+ compatible = "marvell,berlin2q-pinctrl";
+ reg = <0xea0000 0x4c>, <0xfcd000 0x44>;
+ reg-names = "global_base", "sm_base";
+
+ uart0_pmux: uart0-pmux {
+ berlin,group = "GSM12";
+ berlin,function = <0>;
+ };
+
+ uart1_pmux: uart1-pmux {
+ berlin,group = "GSM14";
+ berlin,function = <1>;
+ };
+ };
+
apb@...000 {
compatible = "simple-bus";
#address-cells = <1>;
@@ -198,6 +214,8 @@
interrupts = <8>;
clocks = <&smclk>;
reg-shift = <2>;
+ pinctrl-0 = <&uart0_pmux>;
+ pinctrl-names = "default";
status = "disabled";
};
@@ -208,6 +226,8 @@
interrupts = <9>;
clocks = <&smclk>;
reg-shift = <2>;
+ pinctrl-0 = <&uart1_pmux>;
+ pinctrl-names = "default";
status = "disabled";
};
--
1.8.3.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists