Merge branch 'tip/perf/urgent-2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / sun5i-a13.dtsi

diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi
index 59a2d265a98eee4960a74c4a29a49bfe8a7aa31d..e1121890fb29db8d76538a3b482f155d70fdfb61 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a13.dtsi
+++ b/arch/arm/boot/dts/sun5i-a13.dtsi
@@ -17,4 +17,27 @@
        memory {
                reg = <0x40000000 0x20000000>;
        };
+
+       soc {
+               pinctrl@01c20800 {
+                       compatible = "allwinner,sun5i-a13-pinctrl";
+                       reg = <0x01c20800 0x400>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       uart1_pins_a: uart1@0 {
+                               allwinner,pins = "PE10", "PE11";
+                               allwinner,function = "uart1";
+                               allwinner,drive = <0>;
+                               allwinner,pull = <0>;
+                       };
+
+                       uart1_pins_b: uart1@1 {
+                               allwinner,pins = "PG3", "PG4";
+                               allwinner,function = "uart1";
+                               allwinner,drive = <0>;
+                               allwinner,pull = <0>;
+                       };
+               };
+       };
 };