Commit e9a4dd99 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-dt64-4.20-1' of git://git.infradead.org/linux-mvebu into next/dt 

mvebu dt64 for 4.20 (part 1)

 - Add watchdog node on Armada 37xx
 - Update PPv2 interrupts name
 - Add support for the SolidRun Clearfog GT 8K (Aramda 8040 based)
 - Add thermal-zone nodes for Aramda 7K/8K

* tag 'mvebu-dt64-4.20-1' of git://git.infradead.org/linux-mvebu

:
  arm64: dts: marvell: armada-37xx: add nodes to support watchdog
  arm64: dts: marvell: armada-cp110: describe more PPv2 interrupts
  arm64: dts: marvell: armada-cp110: change the PPv2 IRQ names
  arm64: dts: add support for SolidRun Clearfog GT 8K
  arm64: dts: marvell: add thermal-zone node in cp110 DTSI file
  arm64: dts: marvell: add macro to make distinction between node names
  arm64: dts: marvell: add thermal-zone node in ap806 DTSI file
  arm64: dts: marvell: move AP806/CP110 thermal nodes into a new syscon

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 3a7c41e5 620cfb31

arch/arm64/boot/dts/marvell/Makefile

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

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

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

dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-clearfog-gt-8k.dtb

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

dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-mcbin.dtb

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

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

+13 −0
Original line number Diff line number Diff line
@@ -80,6 +80,19 @@ 
			/* 32M internal register @ 0xd000_0000 */

			ranges = <0x0 0x0 0xd0000000 0x2000000>;



			wdt: watchdog@8300 {

				compatible = "marvell,armada-3700-wdt";

				reg = <0x8300 0x40>;

				marvell,system-controller = <&cpu_misc>;

				clocks = <&xtalclk>;

			};



			cpu_misc: system-controller@d000 {

				compatible = "marvell,armada-3700-cpu-misc",

					     "syscon";

				reg = <0xd000 0x1000>;

			};



			spi0: spi@10600 {

				compatible = "marvell,armada-3700-spi";

				#address-cells = <1>;

arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts

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

/*

 * Copyright (C) 2018 SolidRun ltd.

 * Based on Marvell MACCHIATOBin board

 *

 * Device Tree file for SolidRun's ClearFog GT 8K

 */



#include "armada-8040.dtsi"



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

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



/ {

	model = "SolidRun ClearFog GT 8K";

	compatible = "solidrun,clearfog-gt-8k", "marvell,armada8040",

			"marvell,armada-ap806-quad", "marvell,armada-ap806";



	chosen {

		stdout-path = "serial0:115200n8";

	};



	memory@00000000 {

		device_type = "memory";

		reg = <0x0 0x0 0x0 0x80000000>;

	};



	aliases {

		ethernet0 = &cp1_eth1;

		ethernet1 = &cp0_eth0;

		ethernet2 = &cp1_eth2;

	};



	v_3_3: regulator-3-3v {

		compatible = "regulator-fixed";

		regulator-name = "v_3_3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-always-on;

		status = "okay";

	};



	v_5v0_usb3_hst_vbus: regulator-usb3-vbus0 {

		compatible = "regulator-fixed";

		gpio = <&cp0_gpio2 15 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&cp0_xhci_vbus_pins>;

		regulator-name = "v_5v0_usb3_hst_vbus";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		status = "okay";

	};



	usb3h0_phy: usb3_phy0 {

		compatible = "usb-nop-xceiv";

		vcc-supply = <&v_5v0_usb3_hst_vbus>;

	};



	sfp_cp0_eth0: sfp-cp0-eth0 {

		compatible = "sff,sfp";

		i2c-bus = <&cp0_i2c1>;

		mod-def0-gpio = <&cp0_gpio2 17 GPIO_ACTIVE_LOW>;

		tx-disable-gpio = <&cp1_gpio1 29 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&cp0_sfp_present_pins &cp1_sfp_tx_disable_pins>;

	};



	leds {

		compatible = "gpio-leds";

		pinctrl-0 = <&cp0_led0_pins

			     &cp0_led1_pins>;

		pinctrl-names = "default";

		/* No designated function for these LEDs at the moment */

		led0 {

			label = "clearfog-gt-8k:green:led0";

			gpios = <&cp0_gpio2 8 GPIO_ACTIVE_LOW>;

			default-state = "on";

		};

		led1 {

			label = "clearfog-gt-8k:green:led1";

			gpios = <&cp0_gpio2 9 GPIO_ACTIVE_LOW>;

			default-state = "on";

		};

	};



	keys {

		compatible = "gpio-keys";

		pinctrl-0 = <&cp0_gpio_reset_pins &cp1_wps_button_pins>;

		pinctrl-names = "default";



		button_0 {

			/* The rear button */

			label = "Rear Button";

			gpios = <&cp0_gpio2 7 GPIO_ACTIVE_LOW>;

			linux,can-disable;

			linux,code = <BTN_0>;

		};



		button_1 {

			/* The wps button */

			label = "WPS Button";

			gpios = <&cp1_gpio1 30 GPIO_ACTIVE_LOW>;

			linux,can-disable;

			linux,code = <KEY_WPS_BUTTON>;

		};

	};

};



&uart0 {

	status = "okay";

	pinctrl-0 = <&uart0_pins>;

	pinctrl-names = "default";

};



&ap_sdhci0 {

	bus-width = <8>;

	no-1-8-v;

	no-sd;

	no-sdio;

	non-removable;

	status = "okay";

	vqmmc-supply = <&v_3_3>;

};



&cp0_i2c0 {

	clock-frequency = <100000>;

	pinctrl-names = "default";

	pinctrl-0 = <&cp0_i2c0_pins>;

	status = "okay";

};



&cp0_i2c1 {

	clock-frequency = <100000>;

	pinctrl-names = "default";

	pinctrl-0 = <&cp0_i2c1_pins>;

	status = "okay";

};



&cp0_pinctrl {

	/*

	 * MPP Bus:

	 * [0-31] = 0xff: Keep default CP0_shared_pins:

	 * [11] CLKOUT_MPP_11 (out)

	 * [23] LINK_RD_IN_CP2CP (in)

	 * [25] CLKOUT_MPP_25 (out)

	 * [29] AVS_FB_IN_CP2CP (in)

	 * [32, 33, 34] pci0/1/2 reset

	 * [35-38] CP0 I2C1 and I2C0

	 * [39] GPIO reset button

	 * [40,41] LED0 and LED1

	 * [43] 1512 phy reset

	 * [47] USB VBUS EN (active low)

	 * [48] FAN PWM

	 * [49] SFP+ present signal

	 * [50] TPM interrupt

	 * [51] WLAN0 disable

	 * [52] WLAN1 disable

	 * [53] LTE disable

	 * [54] NFC reset

	 * [55] Micro SD card detect

	 * [56-61] Micro SD

	 */



	cp0_pci0_reset_pins: pci0-reset-pins {

		marvell,pins = "mpp32";

		marvell,function = "gpio";

	};



	cp0_pci1_reset_pins: pci1-reset-pins {

		marvell,pins = "mpp33";

		marvell,function = "gpio";

	};



	cp0_pci2_reset_pins: pci2-reset-pins {

		marvell,pins = "mpp34";

		marvell,function = "gpio";

	};



	cp0_i2c1_pins: i2c1-pins {

		marvell,pins = "mpp35", "mpp36";

		marvell,function = "i2c1";

	};



	cp0_i2c0_pins: i2c0-pins {

		marvell,pins = "mpp37", "mpp38";

		marvell,function = "i2c0";

	};



	cp0_gpio_reset_pins: gpio-reset-pins {

		marvell,pins = "mpp39";

		marvell,function = "gpio";

	};



	cp0_led0_pins: led0-pins {

		marvell,pins = "mpp40";

		marvell,function = "gpio";

	};



	cp0_led1_pins: led1-pins {

		marvell,pins = "mpp41";

		marvell,function = "gpio";

	};



	cp0_copper_eth_phy_reset: copper-eth-phy-reset {

		marvell,pins = "mpp43";

		marvell,function = "gpio";

	};



	cp0_xhci_vbus_pins: xhci0-vbus-pins {

		marvell,pins = "mpp47";

		marvell,function = "gpio";

	};



	cp0_fan_pwm_pins: fan-pwm-pins {

		marvell,pins = "mpp48";

		marvell,function = "gpio";

	};



	cp0_sfp_present_pins: sfp-present-pins {

		marvell,pins = "mpp49";

		marvell,function = "gpio";

	};



	cp0_tpm_irq_pins: tpm-irq-pins {

		marvell,pins = "mpp50";

		marvell,function = "gpio";

	};



	cp0_sdhci_pins: sdhci-pins {

		marvell,pins = "mpp55", "mpp56", "mpp57", "mpp58", "mpp59",

			       "mpp60", "mpp61";

		marvell,function = "sdio";

	};

};



&cp0_gpio2 {

	sata_reset {

		gpio-hog;

		gpios = <1 GPIO_ACTIVE_HIGH>;

		output-high;

	};

};



&cp0_ethernet {

	status = "okay";

};



/* SFP */

&cp0_eth0 {

	status = "okay";

	phy-mode = "10gbase-kr";

	managed = "in-band-status";

	phys = <&cp0_comphy2 0>;

	sfp = <&sfp_cp0_eth0>;

};



&cp0_sdhci0 {

	broken-cd;

	bus-width = <4>;

	pinctrl-names = "default";

	pinctrl-0 = <&cp0_sdhci_pins>;

	status = "okay";

	vqmmc-supply = <&v_3_3>;

};



&cp1_pinctrl {

	/*

	 * MPP Bus:

	 * [0-5] TDM

	 * [6]   VHV Enable

	 * [7]   CP1 SPI0 CSn1 (FXS)

	 * [8]   CP1 SPI0 CSn0 (TPM)

	 * [9.11]CP1 SPI0 MOSI/MISO/CLK

	 * [13]  CP1 SPI1 MISO (TDM and SPI ROM shared)

	 * [14]  CP1 SPI1 CS0n (64Mb SPI ROM)

	 * [15]  CP1 SPI1 MOSI (TDM and SPI ROM shared)

	 * [16]  CP1 SPI1 CLK (TDM and SPI ROM shared)

	 * [24]  Topaz switch reset

	 * [26]  Buzzer

	 * [27]  CP1 SMI MDIO

	 * [28]  CP1 SMI MDC

	 * [29]  CP0 10G SFP TX Disable

	 * [30]  WPS button

	 * [31]  Front panel button

	 */



	cp1_spi1_pins: spi1-pins {

		marvell,pins = "mpp13", "mpp14", "mpp15", "mpp16";

		marvell,function = "spi1";

	};



	cp1_switch_reset_pins: switch-reset-pins {

		marvell,pins = "mpp24";

		marvell,function = "gpio";

	};



	cp1_ge_mdio_pins: ge-mdio-pins {

		marvell,pins = "mpp27", "mpp28";

		marvell,function = "ge";

	};



	cp1_sfp_tx_disable_pins: sfp-tx-disable-pins {

		marvell,pins = "mpp29";

		marvell,function = "gpio";

	};



	cp1_wps_button_pins: wps-button-pins {

		marvell,pins = "mpp30";

		marvell,function = "gpio";

	};

};



&cp1_sata0 {

	pinctrl-0 = <&cp0_pci1_reset_pins>;

	status = "okay";

};



&cp1_mdio {

	pinctrl-names = "default";

	pinctrl-0 = <&cp1_ge_mdio_pins>;

	status = "okay";



	ge_phy: ethernet-phy@0 {

		/* LED0 - GB link

		 * LED1 - on: link, blink: activity

		 */

		marvell,reg-init = <3 16 0 0x1017>;

		reg = <0>;

	};



	switch0: switch0@4 {

		compatible = "marvell,mv88e6085";

		reg = <4>;

		pinctrl-names = "default";

		pinctrl-0 = <&cp1_switch_reset_pins>;

		reset-gpios = <&cp1_gpio1 24 GPIO_ACTIVE_LOW>;



		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@1 {

				reg = <1>;

				label = "lan2";

				phy-handle = <&switch0phy0>;

			};



			port@2 {

				reg = <2>;

				label = "lan1";

				phy-handle = <&switch0phy1>;

			};



			port@3 {

				reg = <3>;

				label = "lan4";

				phy-handle = <&switch0phy2>;

			};



			port@4 {

				reg = <4>;

				label = "lan3";

				phy-handle = <&switch0phy3>;

			};



			port@5 {

				reg = <5>;

				label = "cpu";

				ethernet = <&cp1_eth2>;

			};

		};



		mdio {

			#address-cells = <1>;

			#size-cells = <0>;



			switch0phy0: switch0phy0@11 {

				reg = <0x11>;

			};



			switch0phy1: switch0phy1@12 {

				reg = <0x12>;

			};



			switch0phy2: switch0phy2@13 {

				reg = <0x13>;

			};



			switch0phy3: switch0phy3@14 {

				reg = <0x14>;

			};

		};

	};

};



&cp1_ethernet {

	status = "okay";

};



/* 1G copper */

&cp1_eth1 {

	status = "okay";

	phy-mode = "sgmii";

	phy = <&ge_phy>;

	phys = <&cp1_comphy3 1>;

};



/* Switch uplink */

&cp1_eth2 {

	status = "okay";

	phy-mode = "2500base-x";

	phys = <&cp1_comphy5 2>;

	fixed-link {

		speed = <2500>;

		full-duplex;

	};

};



&cp1_spi1 {

	pinctrl-names = "default";

	pinctrl-0 = <&cp1_spi1_pins>;

	status = "okay";



	spi-flash@0 {

		compatible = "st,w25q32";

		spi-max-frequency = <50000000>;

		reg = <0>;

	};

};



&cp1_usb3_0 {

	usb-phy = <&usb3h0_phy>;

	status = "okay";

};

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

+70 −4
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 */



#include <dt-bindings/interrupt-controller/arm-gic.h>

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



/dts-v1/;
@@ -247,11 +248,76 @@ 
				};

			};



			ap_thermal: thermal@6f808c {

			ap_syscon1: system-controller@6f8000 {

				compatible = "syscon", "simple-mfd";

				reg = <0x6f8000 0x1000>;

				#address-cells = <1>;

				#size-cells = <1>;



				ap_thermal: thermal-sensor@80 {

					compatible = "marvell,armada-ap806-thermal";

				reg = <0x6f808c 0x4>,

				      <0x6f8084 0x8>;

					reg = <0x80 0x10>;

					#thermal-sensor-cells = <1>;

				};

			};

		};

	};



	/*

	 * The thermal IP features one internal sensor plus, if applicable, one

	 * remote channel wired to one sensor per CPU.

	 *

	 * The cooling maps are always empty as there are no cooling devices.

	 */

	thermal-zones {

		ap_thermal_ic: ap-thermal-ic {

			polling-delay-passive = <1000>;

			polling-delay = <1000>;



			thermal-sensors = <&ap_thermal 0>;



			trips {	};

			cooling-maps { };

		};



		ap_thermal_cpu1: ap-thermal-cpu1 {

			polling-delay-passive = <1000>;

			polling-delay = <1000>;



			thermal-sensors = <&ap_thermal 1>;



			trips { };

			cooling-maps { };

		};



		ap_thermal_cpu2: ap-thermal-cpu2 {

			polling-delay-passive = <1000>;

			polling-delay = <1000>;



			thermal-sensors = <&ap_thermal 2>;



			trips { };

			cooling-maps { };

		};



		ap_thermal_cpu3: ap-thermal-cpu3 {

			polling-delay-passive = <1000>;

			polling-delay = <1000>;



			thermal-sensors = <&ap_thermal 3>;



			trips { };

			cooling-maps { };

		};



		ap_thermal_cpu4: ap-thermal-cpu4 {

			polling-delay-passive = <1000>;

			polling-delay = <1000>;



			thermal-sensors = <&ap_thermal 4>;



			trips { };

			cooling-maps { };

		};

	};

};

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

+1 −0
Original line number Diff line number Diff line
@@ -7,4 +7,5 @@ 
#define PASTER(x, y) x ## y

#define EVALUATOR(x, y) PASTER(x, y)

#define CP110_LABEL(name) EVALUATOR(CP110_NAME, EVALUATOR(_, name))

#define CP110_NODE_NAME(name) EVALUATOR(CP110_NAME, EVALUATOR(-, name))

#define ADDRESSIFY(addr) EVALUATOR(0x, addr)

CRA Git | Maintained and supported by SUSTech CRA and CCSE