Skip to content

Commit

Permalink
ARM: dts: berlin: add the pinctrl node and muxing setup for uarts
Browse files Browse the repository at this point in the history
Add pinctrl bindings and system control nodes to what we currently know
about Berlin SoCs. Where available, also set default pinctrl property
for uarts, when there is only one pinmux option for it.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
  • Loading branch information
Antoine Tenart authored and Sebastian Hesselbarth committed May 19, 2014
1 parent e9673a7 commit 50cc24f
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 0 deletions.
26 changes: 26 additions & 0 deletions arch/arm/boot/dts/berlin2.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,8 @@
reg-io-width = <1>;
interrupts = <8>;
clocks = <&refclk>;
pinctrl-0 = <&uart0_pmux>;
pinctrl-names = "default";
status = "disabled";
};

Expand All @@ -306,6 +308,8 @@
reg-io-width = <1>;
interrupts = <9>;
clocks = <&refclk>;
pinctrl-0 = <&uart1_pmux>;
pinctrl-names = "default";
status = "disabled";
};

Expand All @@ -316,9 +320,31 @@
reg-io-width = <1>;
interrupts = <10>;
clocks = <&refclk>;
pinctrl-0 = <&uart2_pmux>;
pinctrl-names = "default";
status = "disabled";
};

sysctrl: system-controller@d000 {
compatible = "marvell,berlin2-system-ctrl";
reg = <0xd000 0x100>;

uart0_pmux: uart0-pmux {
groups = "GSM4";
function = "uart0";
};

uart1_pmux: uart1-pmux {
groups = "GSM5";
function = "uart1";
};

uart2_pmux: uart2-pmux {
groups = "GSM3";
function = "uart2";
};
};

sic: interrupt-controller@e000 {
compatible = "snps,dw-apb-ictl";
reg = <0xe000 0x400>;
Expand Down
12 changes: 12 additions & 0 deletions arch/arm/boot/dts/berlin2cd.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,11 @@
reg = <0xea0000 0x400>;
clocks = <&refclk>;
clock-names = "refclk";

uart0_pmux: uart0-pmux {
groups = "G6";
function = "uart0";
};
};

apb@fc0000 {
Expand Down Expand Up @@ -281,6 +286,8 @@
reg-io-width = <1>;
interrupts = <8>;
clocks = <&refclk>;
pinctrl-0 = <&uart0_pmux>;
pinctrl-names = "default";
status = "disabled";
};

Expand All @@ -294,6 +301,11 @@
status = "disabled";
};

sysctrl: system-controller@d000 {
compatible = "marvell,berlin2cd-system-ctrl";
reg = <0xd000 0x100>;
};

sic: interrupt-controller@e000 {
compatible = "snps,dw-apb-ictl";
reg = <0xe000 0x400>;
Expand Down
19 changes: 19 additions & 0 deletions arch/arm/boot/dts/berlin2q.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,8 @@
interrupts = <8>;
clocks = <&refclk>;
reg-shift = <2>;
pinctrl-0 = <&uart0_pmux>;
pinctrl-names = "default";
status = "disabled";
};

Expand All @@ -304,9 +306,26 @@
interrupts = <9>;
clocks = <&refclk>;
reg-shift = <2>;
pinctrl-0 = <&uart1_pmux>;
pinctrl-names = "default";
status = "disabled";
};

sysctrl: pin-controller@d000 {
compatible = "marvell,berlin2q-system-ctrl";
reg = <0xd000 0x100>;

uart0_pmux: uart0-pmux {
groups = "GSM12";
function = "uart0";
};

uart1_pmux: uart1-pmux {
groups = "GSM14";
function = "uart1";
};
};

sic: interrupt-controller@e000 {
compatible = "snps,dw-apb-ictl";
reg = <0xe000 0x30>;
Expand Down

0 comments on commit 50cc24f

Please sign in to comment.