diff options
| author | Gregory CLEMENT <gregory.clement@free-electrons.com> | 2017-06-12 17:34:58 +0200 |
|---|---|---|
| committer | Gregory CLEMENT <gregory.clement@free-electrons.com> | 2017-06-20 16:33:24 +0200 |
| commit | ae701b60028f4e0f6714276fd6790b5126975021 (patch) | |
| tree | 8a2dc334d80eb951e4094d63aa0a44fa72aed2da /arch/arm64/boot/dts/marvell/armada-8040.dtsi | |
| parent | db7bc1ba9100c54236958ab60e1feecd7b203f12 (diff) | |
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-8040.dtsi')
| -rw-r--r-- | arch/arm64/boot/dts/marvell/armada-8040.dtsi | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm64/boot/dts/marvell/armada-8040.dtsi b/arch/arm64/boot/dts/marvell/armada-8040.dtsi index 33813a75bc30..60fe84f5cbcc 100644 --- a/arch/arm64/boot/dts/marvell/armada-8040.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-8040.dtsi @@ -46,8 +46,7 @@ */ #include "armada-ap806-quad.dtsi" -#include "armada-cp110-master.dtsi" -#include "armada-cp110-slave.dtsi" +#include "armada-80x0.dtsi" / { model = "Marvell Armada 8040"; |