Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56acb3ef authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'mvebu-fixes-5.0-1' of git://git.infradead.org/linux-mvebu into fixes 

mvebu fixes for 5.0

They are all device tree fixes which also worth being in stable:

 - Reserve PSCI area on Armada 7K/8K preventing the kernel accessing
   this area and crashing while doing it.

 - Use correct PCIe reset signal on MACCHIATOBin  (Armada 8040 based)

 - Fix polarity of GPIO fan line D-Link DNS NASes(kikwood based)

* tag 'mvebu-fixes-5.0-1' of git://git.infradead.org/linux-mvebu

:
  ARM: dts: kirkwood: Fix polarity of GPIO fan lines
  arm64: dts: marvell: mcbin: fix PCIe reset signal
  arm64: dts: marvell: armada-ap806: reserve PSCI area

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 2ec472ed b5f03484

arch/arm/boot/dts/kirkwood-dnskw.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ 
		compatible = "gpio-fan";

		pinctrl-0 = <&pmx_fan_high_speed &pmx_fan_low_speed>;

		pinctrl-names = "default";

		gpios = <&gpio1 14 GPIO_ACTIVE_LOW

			 &gpio1 13 GPIO_ACTIVE_LOW>;

		gpios = <&gpio1 14 GPIO_ACTIVE_HIGH

			 &gpio1 13 GPIO_ACTIVE_HIGH>;

		gpio-fan,speed-map = <0    0

				      3000 1

				      6000 2>;

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

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ 
	pinctrl-0 = <&cp0_pcie_pins>;

	num-lanes = <4>;

	num-viewport = <8>;

	reset-gpio = <&cp0_gpio1 20 GPIO_ACTIVE_LOW>;

	reset-gpios = <&cp0_gpio2 20 GPIO_ACTIVE_LOW>;

	status = "okay";

};

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

+17 −0
Original line number Diff line number Diff line
@@ -28,6 +28,23 @@ 
		method = "smc";

	};



	reserved-memory {

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;



		/*

		 * This area matches the mapping done with a

		 * mainline U-Boot, and should be updated by the

		 * bootloader.

		 */



		psci-area@4000000 {

			reg = <0x0 0x4000000 0x0 0x200000>;

			no-map;

		};

	};



	ap806 {

		#address-cells = <2>;

		#size-cells = <2>;