Merge tag 'mvebu-dt64-4.19-1' of git://git.infradead.org/linux-mvebu into next/dt (96a63ce0) · Commits · 戴 / test

mvebu dt64 for 4.19 (part 1) Armada 3700 - Add default memory reservation for ATF - Add a node for AVS support Fix eth3 connector name on the Macchiatobin * tag 'mvebu-dt64-4.19-1' of git://git.infradead.org/linux-mvebu : arm64: dts: marvell: armada-37xx: reserve memory for ATF arm64: dts: marvell: armada-37xx: add the node allowing AVS support arm64: dts: marvell: mcbin: fix eth3 connector name Signed-off-by:

Olof Johansson <olof@lixom.net>

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

+21 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,21 @@
		serial1 = &uart1;
		};

		reserved-memory {
		#address-cells = <2>;
		#size-cells = <2>;
		ranges;

		/*
		* The PSCI firmware region depicted below is the default one
		* and should be updated by the bootloader.
		*/
		psci-area@4000000 {
		reg = <0 0x4000000 0 0x200000>;
		no-map;
		};
		};

		cpus {
		#address-cells = <1>;
		#size-cells = <0>;
		@@ -98,6 +113,12 @@
		status = "disabled";
		};

		avs: avs@11500 {
		compatible = "marvell,armada-3700-avs",
		"syscon";
		reg = <0x11500 0x40>;
		};

		uart0: serial@12000 {
		compatible = "marvell,armada-3700-uart";
		reg = <0x12000 0x200>;

arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -91,7 +91,7 @@
		};

		sfp_eth3: sfp-eth3 {
		/* CON3,4 - CPS lane 5 */
		/* CON13,14 - CPS lane 5 */
		compatible = "sff,sfp";
		i2c-bus = <&sfp_1g_i2c>;
		los-gpio = <&cp0_gpio2 22 GPIO_ACTIVE_HIGH>;

Admin message