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

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

Merge tag 'imx-fixes-5.0' of... 

Merge tag 'imx-fixes-5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes

i.MX fixes for 5.0:
 - Fix spi_bus_bridge DTC warning by correcting '#address-cells' of
   dspi3 node on vf610-bk4 board, as it's being used a SPI slave
   controller there.
 - Replace deprecated gpio-key,wakeup property with wakeup-source for
   board imx6q-pistachio and imx6sll-evk, into which the deprecated
   property sneaked during the merge window.
 - Correct the backward compatible for i.MX6SX GPT device, as it's
   actually compatible with i.MX6DL GPT rather than i.MX31 one.

* tag 'imx-fixes-5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux

:
  ARM: dts: imx6sx: correct backward compatible of gpt
  ARM: dts: imx: replace gpio-key,wakeup with wakeup-source property
  ARM: dts: vf610-bk4: fix incorrect #address-cells for dspi3

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents f17b5f06 ba0f4560

arch/arm/boot/dts/imx6q-pistachio.dts

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ 
		power {

			label = "Power Button";

			gpios = <&gpio2 12 GPIO_ACTIVE_LOW>;

			gpio-key,wakeup;

			wakeup-source;

			linux,code = <KEY_POWER>;

		};

	};

arch/arm/boot/dts/imx6sll-evk.dts

+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ 
	pinctrl-2 = <&pinctrl_usdhc3_200mhz>;

	cd-gpios = <&gpio3 22 GPIO_ACTIVE_LOW>;

	keep-power-in-suspend;

	enable-sdio-wakeup;

	wakeup-source;

	vmmc-supply = <&reg_sd3_vmmc>;

	status = "okay";

};

arch/arm/boot/dts/imx6sx.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -467,7 +467,7 @@ 
			};



			gpt: gpt@2098000 {

				compatible = "fsl,imx6sx-gpt", "fsl,imx31-gpt";

				compatible = "fsl,imx6sx-gpt", "fsl,imx6dl-gpt";

				reg = <0x02098000 0x4000>;

				interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clks IMX6SX_CLK_GPT_BUS>,

arch/arm/boot/dts/vf610-bk4.dts

+2 −2
Original line number Diff line number Diff line
@@ -110,11 +110,11 @@ 
	bus-num = <3>;

	status = "okay";

	spi-slave;

	#address-cells = <0>;



	slave@0 {

	slave {

		compatible = "lwn,bk4";

		spi-max-frequency = <30000000>;

		reg = <0>;

	};

};