Commit 7e500c89 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-dt-5.12-1' of... 

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

mvebu dt for 5.12 (part 1)

Improve LED and fan support on Helios4 boad (Armada 388 based)
Add ECC configuration for Linksys board (Aramda 385 based)

* tag 'mvebu-dt-5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu:
  ARM: dts: armada388-helios4: assign pinctrl to each fan
  ARM: dts: armada388-helios4: assign pinctrl to LEDs
  ARM: dts: armada-385-linksys: fix usage with newer devices

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 542b9f11 46ecdfc1

arch/arm/boot/dts/armada-385-linksys.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -148,6 +148,8 @@ nand: nand@0 { 
		reg = <0>;

		label = "pxa3xx_nand-0";

		nand-rb = <0>;

		nand-ecc-strength = <4>;

		nand-ecc-step-size = <512>;

		marvell,nand-keep-config;

		nand-on-flash-bbt;

	};

arch/arm/boot/dts/armada-388-helios4.dts

+22 −6
Original line number Diff line number Diff line
@@ -70,6 +70,9 @@ reg_5p0v_usb: regulator-5v-usb { 


	system-leds {

		compatible = "gpio-leds";

		pinctrl-names = "default";

		pinctrl-0 = <&helios_system_led_pins>;



		status-led {

			label = "helios4:green:status";

			gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
@@ -86,6 +89,9 @@ fault-led { 


	io-leds {

		compatible = "gpio-leds";

		pinctrl-names = "default";

		pinctrl-0 = <&helios_io_led_pins>;



		sata1-led {

			label = "helios4:green:ata1";

			gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
@@ -121,11 +127,15 @@ usb-led { 
	fan1: j10-pwm {

		compatible = "pwm-fan";

		pwms = <&gpio1 9 40000>;	/* Target freq:25 kHz */

		pinctrl-names = "default";

		pinctrl-0 = <&helios_fan1_pins>;

	};



	fan2: j17-pwm {

		compatible = "pwm-fan";

		pwms = <&gpio1 23 40000>;	/* Target freq:25 kHz */

		pinctrl-names = "default";

		pinctrl-0 = <&helios_fan2_pins>;

	};



	usb2_phy: usb2-phy {
@@ -286,16 +296,22 @@ helios_sdhci_pins: helios-sdhci-pins { 
						       "mpp39", "mpp40";

					marvell,function = "sd0";

				};

				helios_led_pins: helios-led-pins {

					marvell,pins = "mpp24", "mpp25",

						       "mpp49", "mpp50",

				helios_system_led_pins: helios-system-led-pins {

					marvell,pins = "mpp24", "mpp25";

					marvell,function = "gpio";

				};

				helios_io_led_pins: helios-io-led-pins {

					marvell,pins = "mpp49", "mpp50",

						       "mpp52", "mpp53",

						       "mpp54";

					marvell,function = "gpio";

				};

				helios_fan_pins: helios-fan-pins {

					marvell,pins = "mpp41", "mpp43",

						       "mpp48", "mpp55";

				helios_fan1_pins: helios_fan1_pins {

					marvell,pins = "mpp41", "mpp43";

					marvell,function = "gpio";

				};

				helios_fan2_pins: helios_fan2_pins {

					marvell,pins = "mpp48", "mpp55";

					marvell,function = "gpio";

				};

				microsom_spi1_cs_pins: spi1-cs-pins {