Commit 63dac0f4 authored by Gregory CLEMENT's avatar Gregory CLEMENT

arm64: dts: marvell: add gpio support for Armada 7K/8K

Enable gpio support for CP and AP on the Marvell Armada 7K/8K SoCs.

The Armada 8K has two CP110 blocks, each having two GPIO controllers.
However, in each CP110 block, one of the GPIO controller cannot be
used: in the master CP110, only the second GPIO controller can be used,
while on the slave CP110, only the first GPIO controller can be used.

On the other side, the Armada 7K has only one CP110, but both its GPIO
controllers can be used.

For this reason, the GPIO controllers are marked as "disabled" in the
armada-cp110-master.dtsi and armada-cp110-slave.dtsi files, and only
enabled in the per-SoC dtsi files.
Signed-off-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
parent ae701b60
...@@ -46,6 +46,21 @@ ...@@ -46,6 +46,21 @@
#include "armada-cp110-master.dtsi" #include "armada-cp110-master.dtsi"
/ {
aliases {
gpio1 = &cpm_gpio1;
gpio2 = &cpm_gpio2;
};
};
&cpm_gpio1 {
status = "okay";
};
&cpm_gpio2 {
status = "okay";
};
&cpm_syscon0 { &cpm_syscon0 {
cpm_pinctrl: pinctrl { cpm_pinctrl: pinctrl {
compatible = "marvell,armada-7k-pinctrl"; compatible = "marvell,armada-7k-pinctrl";
......
...@@ -47,6 +47,22 @@ ...@@ -47,6 +47,22 @@
#include "armada-cp110-master.dtsi" #include "armada-cp110-master.dtsi"
#include "armada-cp110-slave.dtsi" #include "armada-cp110-slave.dtsi"
/ {
aliases {
gpio1 = &cps_gpio1;
gpio2 = &cpm_gpio2;
};
};
/* The 80x0 has two CP blocks, but uses only one block from each. */
&cps_gpio1 {
status = "okay";
};
&cpm_gpio2 {
status = "okay";
};
&cpm_syscon0 { &cpm_syscon0 {
cpm_pinctrl: pinctrl { cpm_pinctrl: pinctrl {
compatible = "marvell,armada-8k-cpm-pinctrl"; compatible = "marvell,armada-8k-cpm-pinctrl";
......
...@@ -57,6 +57,7 @@ / { ...@@ -57,6 +57,7 @@ / {
aliases { aliases {
serial0 = &uart0; serial0 = &uart0;
serial1 = &uart1; serial1 = &uart1;
gpio0 = &ap_gpio;
}; };
psci { psci {
...@@ -256,6 +257,15 @@ ap_clk: clock { ...@@ -256,6 +257,15 @@ ap_clk: clock {
ap_pinctrl: pinctrl { ap_pinctrl: pinctrl {
compatible = "marvell,ap806-pinctrl"; compatible = "marvell,ap806-pinctrl";
}; };
ap_gpio: gpio {
compatible = "marvell,armada-8k-gpio";
offset = <0x1040>;
ngpios = <19>;
gpio-controller;
#gpio-cells = <2>;
gpio-ranges = <&ap_pinctrl 0 0 19>;
};
}; };
}; };
}; };
......
...@@ -114,6 +114,27 @@ cpm_clk: clock { ...@@ -114,6 +114,27 @@ cpm_clk: clock {
compatible = "marvell,cp110-clock"; compatible = "marvell,cp110-clock";
#clock-cells = <2>; #clock-cells = <2>;
}; };
cpm_gpio1: gpio@100 {
compatible = "marvell,armada-8k-gpio";
offset = <0x100>;
ngpios = <32>;
gpio-controller;
#gpio-cells = <2>;
gpio-ranges = <&cpm_pinctrl 0 0 32>;
status = "disabled";
};
cpm_gpio2: gpio@140 {
compatible = "marvell,armada-8k-gpio";
offset = <0x140>;
ngpios = <31>;
gpio-controller;
#gpio-cells = <2>;
gpio-ranges = <&cpm_pinctrl 0 32 31>;
status = "disabled";
};
}; };
cpm_rtc: rtc@284000 { cpm_rtc: rtc@284000 {
......
...@@ -121,6 +121,28 @@ cps_clk: clock { ...@@ -121,6 +121,28 @@ cps_clk: clock {
compatible = "marvell,cp110-clock"; compatible = "marvell,cp110-clock";
#clock-cells = <2>; #clock-cells = <2>;
}; };
cps_gpio1: gpio@100 {
compatible = "marvell,armada-8k-gpio";
offset = <0x100>;
ngpios = <32>;
gpio-controller;
#gpio-cells = <2>;
gpio-ranges = <&cps_pinctrl 0 0 32>;
status = "disabled";
};
cps_gpio2: gpio@140 {
compatible = "marvell,armada-8k-gpio";
offset = <0x140>;
ngpios = <31>;
gpio-controller;
#gpio-cells = <2>;
gpio-ranges = <&cps_pinctrl 0 32 31>;
status = "disabled";
};
}; };
cps_sata0: sata@540000 { cps_sata0: sata@540000 {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment