diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2018-01-19 16:09:05 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-01-19 16:09:05 +0100 |
| commit | 1ebf790bef650b78e115a892facb69d9d404c25b (patch) | |
| tree | 72da71a4a469aac92574ca9f40ca8b8f128d5e52 | |
| parent | ARM: dts: rename oxnas dts files (diff) | |
| parent | arm64: dts: marvell: armada-80x0: Fix pinctrl compatible string (diff) | |
| download | wireguard-linux-1ebf790bef650b78e115a892facb69d9d404c25b.tar.xz wireguard-linux-1ebf790bef650b78e115a892facb69d9d404c25b.zip | |
Merge tag 'mvebu-dt64-4.16-3' of git://git.infradead.org/linux-mvebu into next/dt
Pull "mvebu dt64 for 4.16 (part 3)" from Gregory CLEMENT:
Fix for the CP110 dt de-duplication series
* tag 'mvebu-dt64-4.16-3' of git://git.infradead.org/linux-mvebu:
arm64: dts: marvell: armada-80x0: Fix pinctrl compatible string
| -rw-r--r-- | arch/arm64/boot/dts/marvell/armada-80x0.dtsi | 4 |
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 0d36b0fa7153..e9c84a1d3c4d 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 = |