Commit 9c8b0a9c authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

i.MX fixes for 5.9:

- Fix QuadSPI-memory 'reg' for LS1021A and GPIO 'ranges' for i.MX7ULP
  pinctrl.
- A couple of DTC warning fixes on imx6qdl-gw51xx and imx6q-prtwd2
  boards.
- Add missing imx8mm-beacon-kit.dtb to dtbs-y for build coverage.
- Fix broken PWM settings on imx6q-logicpd board.
- Add missing syscon compatible to OCOTP device, so that access to UID
  is possible.
- Fix a network regression on imx7d-zii-rmu2 due to a phy-mode mismatch.

* tag 'imx-fixes-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imx7d-zii-rmu2: fix rgmii phy-mode for ksz9031 phy
  ARM: dts: vfxxx: Add syscon compatible with OCOTP
  ARM: dts: imx6q-logicpd: Fix broken PWM
  arm64: dts: imx: Add missing imx8mm-beacon-kit.dtb to build
  ARM: dts: imx6q-prtwd2: Remove unneeded i2c unit name
  ARM: dts: imx6qdl-gw51xx: Remove unneeded #address-cells/#size-cells
  ARM: dts: imx7ulp: Correct gpio ranges
  ARM: dts: ls1021a: fix QuadSPI-memory reg range

Link: https://lore.kernel.org/r/20200824130359.GF12776@dragon


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents cabe3a13 5cbb80d5

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

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 


	backlight: backlight-lvds {

		compatible = "pwm-backlight";

		pwms = <&pwm3 0 20000>;

		pwms = <&pwm3 0 20000 0>;

		brightness-levels = <0 4 8 16 32 64 128 255>;

		default-brightness-level = <6>;

		power-supply = <&reg_lcd>;

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

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



	/* PRTWD2 rev 1 bitbang I2C for Ethernet Switch */

	i2c@4 {

	i2c {

		compatible = "i2c-gpio";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_i2c4>;

arch/arm/boot/dts/imx6qdl-gw51xx.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ 


	gpio-keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;



		user-pb {

			label = "user_pb";

arch/arm/boot/dts/imx7d-zii-rmu2.dts

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
			  <&clks IMX7D_ENET1_TIME_ROOT_CLK>;

	assigned-clock-parents = <&clks IMX7D_PLL_ENET_MAIN_100M_CLK>;

	assigned-clock-rates = <0>, <100000000>;

	phy-mode = "rgmii";

	phy-mode = "rgmii-id";

	phy-handle = <&fec1_phy>;

	status = "okay";

arch/arm/boot/dts/imx7ulp.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ 
			clocks = <&pcc2 IMX7ULP_CLK_RGPIO2P1>,

				 <&pcc3 IMX7ULP_CLK_PCTLC>;

			clock-names = "gpio", "port";

			gpio-ranges = <&iomuxc1 0 0 32>;

			gpio-ranges = <&iomuxc1 0 0 20>;

		};



		gpio_ptd: gpio@40af0000 {
@@ -408,7 +408,7 @@ 
			clocks = <&pcc2 IMX7ULP_CLK_RGPIO2P1>,

				 <&pcc3 IMX7ULP_CLK_PCTLD>;

			clock-names = "gpio", "port";

			gpio-ranges = <&iomuxc1 0 32 32>;

			gpio-ranges = <&iomuxc1 0 32 12>;

		};



		gpio_pte: gpio@40b00000 {
@@ -422,7 +422,7 @@ 
			clocks = <&pcc2 IMX7ULP_CLK_RGPIO2P1>,

				 <&pcc3 IMX7ULP_CLK_PCTLE>;

			clock-names = "gpio", "port";

			gpio-ranges = <&iomuxc1 0 64 32>;

			gpio-ranges = <&iomuxc1 0 64 16>;

		};



		gpio_ptf: gpio@40b10000 {
@@ -436,7 +436,7 @@ 
			clocks = <&pcc2 IMX7ULP_CLK_RGPIO2P1>,

				 <&pcc3 IMX7ULP_CLK_PCTLF>;

			clock-names = "gpio", "port";

			gpio-ranges = <&iomuxc1 0 96 32>;

			gpio-ranges = <&iomuxc1 0 96 20>;

		};

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE