summaryrefslogtreecommitdiffstats
path: root/arch/arm64/boot
diff options
context:
space:
mode:
authorGregory CLEMENT <gregory.clement@free-electrons.com>2018-01-12 11:00:02 +0100
committerGregory CLEMENT <gregory.clement@free-electrons.com>2018-01-12 17:00:12 +0100
commitf9a0c27b5c3c93b824c2978fafc250ba969b1602 (patch)
tree54f7a7b0d652b0ef55e0799635199248e1d77d9d /arch/arm64/boot
parent474c5885582c4a79c21bcf01ed98f98c935f1f4a (diff)
downloadop-kernel-dev-f9a0c27b5c3c93b824c2978fafc250ba969b1602.zip
op-kernel-dev-f9a0c27b5c3c93b824c2978fafc250ba969b1602.tar.gz
arm64: dts: marvell: armada-80x0: Fix pinctrl compatible string
When replacing the cpm by cp0 and cps by cp1 [1] not only the label and the alias were replaced but also the compatible string which was wrong. Due to this the pinctrl driver was no more probed. This patch fix it by reverting this change for the pinctrl compatible string on Armada 8K. [1]: "arm64: dts: marvell: replace cpm by cp0, cps by cp1" Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Diffstat (limited to 'arch/arm64/boot')
-rw-r--r--arch/arm64/boot/dts/marvell/armada-80x0.dtsi4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/boot/dts/marvell/armada-80x0.dtsi b/arch/arm64/boot/dts/marvell/armada-80x0.dtsi
index 0d36b0f..e9c84a1 100644
--- a/arch/arm64/boot/dts/marvell/armada-80x0.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-80x0.dtsi
@@ -108,13 +108,13 @@
&cp0_syscon0 {
cp0_pinctrl: pinctrl {
- compatible = "marvell,armada-8k-cp0-pinctrl";
+ compatible = "marvell,armada-8k-cpm-pinctrl";
};
};
&cp1_syscon0 {
cp1_pinctrl: pinctrl {
- compatible = "marvell,armada-8k-cp1-pinctrl";
+ compatible = "marvell,armada-8k-cps-pinctrl";
nand_pins: nand-pins {
marvell,pins =
OpenPOWER on IntegriCloud