Unverified Commit b8a4346d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

mvebu dt64 for 6.4 (part 1)

Enlarge PCI memory window on Machiatobin (Armada 7040 based)
Add supoport for the GL.iNet GL-MV1000 (Armada 3700 based)
Add missing phy-mode on the cn9310
Align thermal node names with bindings

* tag 'mvebu-dt64-6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu:
  ARM64: dts: marvell: cn9310: Add missing phy-mode
  arm64: dts: marvell: add DTS for GL.iNet GL-MV1000
  arm64: dts: marvell: align thermal node names with bindings
  arm64: dts: marvell: mochabin: enlarge PCI memory window

Link: https://lore.kernel.org/r/87bkjlzfcw.fsf@BL-laptop


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 7abad3d3 218669c6

arch/arm64/boot/dts/marvell/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-espressobin-emmc.dtb 
dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-espressobin-ultra.dtb

dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-espressobin-v7.dtb

dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-espressobin-v7-emmc.dtb

dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-gl-mv1000.dtb

dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-turris-mox.dtb

dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-uDPU.dtb

dtb-$(CONFIG_ARCH_MVEBU) += armada-7040-db.dtb

arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts

0 → 100644
+239 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)



/dts-v1/;

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/input/input.h>

#include "armada-372x.dtsi"



/ {

	model = "GL.iNet GL-MV1000";

	compatible = "glinet,gl-mv1000", "marvell,armada3720";



	aliases {

		led-boot = &led_power;

		led-failsafe = &led_power;

		led-running = &led_power;

		led-upgrade = &led_power;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	memory@0 {

		device_type = "memory";

		reg = <0x00000000 0x00000000 0x00000000 0x20000000>;

	};



	vcc_sd_reg1: regulator {

		compatible = "regulator-gpio";

		regulator-name = "vcc_sd1";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <3300000>;

		regulator-boot-on;



		gpios-states = <0>;

		states = <1800000 0x1

			3300000 0x0>;

		enable-active-high;

	};



	keys {

		compatible = "gpio-keys";



		reset {

			label = "reset";

			linux,code = <KEY_RESTART>;

			gpios = <&gpionb 14 GPIO_ACTIVE_LOW>;

		};



		switch {

			label = "switch";

			linux,code = <BTN_0>;

			gpios = <&gpiosb 22 GPIO_ACTIVE_LOW>;

		};

	};



	leds {

		compatible = "gpio-leds";



		vpn {

			label = "green:vpn";

			gpios = <&gpionb 11 GPIO_ACTIVE_LOW>;

		};



		wan {

			label = "green:wan";

			gpios = <&gpionb 12 GPIO_ACTIVE_LOW>;

		};



		led_power: power {

			label = "green:power";

			gpios = <&gpionb 13 GPIO_ACTIVE_LOW>;

			default-state = "on";

		};

	};

};



&spi0 {

	status = "okay";



	flash@0 {

		reg = <0>;

		compatible = "jedec,spi-nor";

		spi-max-frequency = <104000000>;

		m25p,fast-read;

		partitions {

			compatible = "fixed-partitions";

			#address-cells = <1>;

			#size-cells = <1>;



			partition@0 {

				label = "firmware";

				reg = <0 0xf0000>;

			};



			partition@f0000 {

				label = "u-boot-env";

				reg = <0xf0000 0x8000>;

			};



			factory: partition@f8000 {

				label = "factory";

				reg = <0xf8000 0x8000>;

				read-only;

			};



			partition@100000 {

				label = "dtb";

				reg = <0x100000 0x10000>;

				read-only;

			};



			partition@110000 {

				label = "rescue";

				reg = <0x110000 0x1000000>;

			};

		};

	};

};



&sdhci1 {

	wp-inverted;

	bus-width = <4>;

	cd-gpios = <&gpionb 17 GPIO_ACTIVE_LOW>;

	marvell,pad-type = "sd";

	no-1-8-v;

	vqmmc-supply = <&vcc_sd_reg1>;

	status = "okay";

};



&sdhci0 {

	bus-width = <8>;

	mmc-ddr-1_8v;

	mmc-hs400-1_8v;

	non-removable;

	no-sd;

	no-sdio;

	marvell,pad-type = "fixed-1-8v";

	status = "okay";

};



&usb3 {

	status = "okay";

};



&usb2 {

	status = "okay";

};



&uart0 {

	status = "okay";

};



&mdio {

	switch0: switch0@1 {

		compatible = "marvell,mv88e6085";

		#address-cells = <1>;

		#size-cells = <0>;

		reg = <1>;



		dsa,member = <0 0>;



		ports: ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				reg = <0>;

				label = "cpu";

				ethernet = <&eth0>;

			};



			port@1 {

				reg = <1>;

				label = "wan";

				phy-handle = <&switch0phy0>;

			};



			port@2 {

				reg = <2>;

				label = "lan0";

				phy-handle = <&switch0phy1>;



				nvmem-cells = <&macaddr_factory_6>;

				nvmem-cell-names = "mac-address";

			};



			port@3 {

				reg = <3>;

				label = "lan1";

				phy-handle = <&switch0phy2>;



				nvmem-cells = <&macaddr_factory_6>;

				nvmem-cell-names = "mac-address";

			};

		};



		mdio {

			#address-cells = <1>;

			#size-cells = <0>;



			switch0phy0: switch0phy0@11 {

				reg = <0x11>;

			};

			switch0phy1: switch0phy1@12 {

				reg = <0x12>;

			};

			switch0phy2: switch0phy2@13 {

				reg = <0x13>;

			};

		};

	};

};



&eth0 {

	nvmem-cells = <&macaddr_factory_0>;

	nvmem-cell-names = "mac-address";

	phy-mode = "rgmii-id";

	status = "okay";



	fixed-link {

		speed = <1000>;

		full-duplex;

	};

};



&factory {

	compatible = "nvmem-cells";

	#address-cells = <1>;

	#size-cells = <1>;



	macaddr_factory_0: macaddr@0 {

		reg = <0x0 0x6>;

	};



	macaddr_factory_6: macaddr@6 {

		reg = <0x6 0x6>;

	};

};

arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts

+1 −0
Original line number Diff line number Diff line
@@ -455,4 +455,5 @@ 
	phys = <&cp0_comphy5 2>;

	phy-names = "cp0-pcie2-x1-phy";

	reset-gpios = <&cp0_gpio1 9 GPIO_ACTIVE_LOW>;

	ranges = <0x82000000 0x0 0xc0000000 0x0 0xc0000000 0x0 0x8000000>;

};

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

+5 −5
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ 
	 * first one that will have a critical trip point will be chosen.

	 */

	thermal-zones {

		ap_thermal_ic: ap-thermal-ic {

		ap_thermal_ic: ap-ic-thermal {

			polling-delay-passive = <0>; /* Interrupt driven */

			polling-delay = <0>; /* Interrupt driven */
@@ -334,7 +334,7 @@ 
			cooling-maps { };

		};



		ap_thermal_cpu0: ap-thermal-cpu0 {

		ap_thermal_cpu0: ap-cpu0-thermal {

			polling-delay-passive = <1000>;

			polling-delay = <1000>;
@@ -367,7 +367,7 @@ 
			};

		};



		ap_thermal_cpu1: ap-thermal-cpu1 {

		ap_thermal_cpu1: ap-cpu1-thermal {

			polling-delay-passive = <1000>;

			polling-delay = <1000>;
@@ -400,7 +400,7 @@ 
			};

		};



		ap_thermal_cpu2: ap-thermal-cpu2 {

		ap_thermal_cpu2: ap-cpu2-thermal {

			polling-delay-passive = <1000>;

			polling-delay = <1000>;
@@ -433,7 +433,7 @@ 
			};

		};



		ap_thermal_cpu3: ap-thermal-cpu3 {

		ap_thermal_cpu3: ap-cpu3-thermal {

			polling-delay-passive = <1000>;

			polling-delay = <1000>;

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

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
	 * The cooling maps are empty as there are no cooling devices.

	 */

	thermal-zones {

		CP11X_LABEL(thermal_ic): CP11X_NODE_NAME(thermal-ic) {

		CP11X_LABEL(thermal_ic): CP11X_NODE_NAME(ic-thermal) {

			polling-delay-passive = <0>; /* Interrupt driven */

			polling-delay = <0>; /* Interrupt driven */