Unverified Commit 43b32198 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'mvebu-dt64-5.14-1' of... 

Merge tag 'mvebu-dt64-5.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into arm/dt

mvebu dt64 for 5.14 (part 1)

on Armada 3700:
Move turris-mox-rwtm firmware node to a more generic place

on AP807:
Make SD/MMC controller still usbale with older kernel

CP11x:
update comphy references

cn9130:
Improve NAND partitioning scheme for cn9130-db

* tag 'mvebu-dt64-5.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu:
  arch/arm64/boot/dts/marvell: fix NAND partitioning scheme
  Documentation/bindings: phy: update references to cp11x
  arm64: dts: ensure backward compatibility of the AP807 Xenon
  arm64: dts: marvell: armada-37xx: move firmware node to generic dtsi file

Link: https://lore.kernel.org/r/878s3429zi.fsf@BL-laptop


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 707472ac e3850467

Documentation/devicetree/bindings/phy/phy-mvebu-comphy.txt

+6 −6
Original line number Diff line number Diff line
@@ -42,22 +42,22 @@ Required properties (child nodes): 


Examples:



	cpm_comphy: phy@120000 {

	CP11X_LABEL(comphy): phy@120000 {

		compatible = "marvell,comphy-cp110";

		reg = <0x120000 0x6000>;

		marvell,system-controller = <&cpm_syscon0>;

		clocks = <&CP110_LABEL(clk) 1 5>, <&CP110_LABEL(clk) 1 6>,

			 <&CP110_LABEL(clk) 1 18>;

		marvell,system-controller = <&CP11X_LABEL(syscon0)>;

		clocks = <&CP11X_LABEL(clk) 1 5>, <&CP11X_LABEL(clk) 1 6>,

			 <&CP11X_LABEL(clk) 1 18>;

		clock-names = "mg_clk", "mg_core_clk", "axi_clk";

		#address-cells = <1>;

		#size-cells = <0>;



		cpm_comphy0: phy@0 {

		CP11X_LABEL(comphy0): phy@0 {

			reg = <0>;

			#phy-cells = <1>;

		};



		cpm_comphy1: phy@1 {

		CP11X_LABEL(comphy1): phy@1 {

			reg = <1>;

			#phy-cells = <1>;

		};

arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts

+2 −4
Original line number Diff line number Diff line
@@ -109,10 +109,8 @@ sfp: sfp { 
	};



	firmware {

		turris-mox-rwtm {

			compatible = "cznic,turris-mox-rwtm";

			mboxes = <&rwtm 0>;

			status = "okay";

		armada-3700-rwtm {

			compatible = "marvell,armada-3700-rwtm-firmware", "cznic,turris-mox-rwtm";

		};

	};

};

arch/arm64/boot/dts/marvell/armada-37xx.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -504,4 +504,12 @@ pcie_intc: interrupt-controller { 
			};

		};

	};



	firmware {

		armada-3700-rwtm {

			compatible = "marvell,armada-3700-rwtm-firmware";

			mboxes = <&rwtm 0>;

			status = "okay";

		};

	};

};

arch/arm64/boot/dts/marvell/armada-ap807.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ cpu_clk: clock-cpu { 
};



&ap_sdhci0 {

	compatible = "marvell,armada-ap807-sdhci";

	compatible = "marvell,armada-ap807-sdhci",

		     "marvell,armada-ap806-sdhci"; /* Backward compatibility */

};

arch/arm64/boot/dts/marvell/cn9130-db.dts

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ partition@0 { 
			};

			partition@200000 {

				label = "Linux";

				reg = <0x200000 0xd00000>;

				reg = <0x200000 0xe00000>;

			};

			partition@1000000 {

				label = "Filesystem";