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

parents 9e6c62b0 f9a0c27b

arch/arm64/boot/dts/marvell/armada-80x0.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -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 =