summaryrefslogtreecommitdiff
path: root/arch/arm64/boot/dts/marvell/armada-7020.dtsi
diff options
context:
space:
mode:
authorGregory CLEMENT <gregory.clement@free-electrons.com>2017-06-12 18:34:58 +0300
committerGregory CLEMENT <gregory.clement@free-electrons.com>2017-06-20 17:33:24 +0300
commitae701b60028f4e0f6714276fd6790b5126975021 (patch)
tree8a2dc334d80eb951e4094d63aa0a44fa72aed2da /arch/arm64/boot/dts/marvell/armada-7020.dtsi
parentdb7bc1ba9100c54236958ab60e1feecd7b203f12 (diff)
downloadlinux-ae701b60028f4e0f6714276fd6790b5126975021.tar.xz
arm64: dts: marvell: add pinctrl support for Armada 7K/8K
Enable pinctrl support for CP and AP on the Armada 7K/8K SoCs. The CP master being different between Armada 7k and Armada 8k. This commit introduces the intermediates files armada-70x0.dtsi and armada-80x0.dtsi. These new files will provide different compatible strings depending of the SoC family. They will also be the location for the pinmux configuration at the SoC level. Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Diffstat (limited to 'arch/arm64/boot/dts/marvell/armada-7020.dtsi')
-rw-r--r--arch/arm64/boot/dts/marvell/armada-7020.dtsi2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/marvell/armada-7020.dtsi b/arch/arm64/boot/dts/marvell/armada-7020.dtsi
index 975e73302753..4ab012991d9d 100644
--- a/arch/arm64/boot/dts/marvell/armada-7020.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-7020.dtsi
@@ -46,7 +46,7 @@
*/
#include "armada-ap806-dual.dtsi"
-#include "armada-cp110-master.dtsi"
+#include "armada-70x0.dtsi"
/ {
model = "Marvell Armada 7020";