Unverified Commit a3bedd24 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

i.MX fixes for 6.0:

- Remove superfluous interrupt-names from imx8mq-tqma8mq RTC device to
  silence dtbs_check warning.
- A few Verdin board fixes on CAN clock frequency, mcp251xfd interrupt,
  atmel_mxt_ts reset polarity and USB PHY.
- Remove duplicated node and fix spi-flash compatible for
  imx6qdl-kontron-samx6i.
- A couple of i.MX8M Plus DHCOM fixes from Marek Vasut on ECSPI1 pinmux
  and I2C5 GPIO assignment.
- A couple of Venice fixes on SAI2 pin settings and phy-mode.
- Drop in-band autoneg for 2500base-x phy-mode on ls1028a-qds-65bb
  board.
- Revert the power device name setting change from imx8m-blk-ctrl
  driver, as it causes issue for sysfs cleanup path.
- Fix gpcv2 driver to assert reset before ungating clock.

* tag 'imx-fixes-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: dts: freescale: verdin-imx8mp: fix atmel_mxt_ts reset polarity
  arm64: dts: freescale: verdin-imx8mm: fix atmel_mxt_ts reset polarity
  arm64: dts: imx8mp: Fix I2C5 GPIO assignment on i.MX8M Plus DHCOM
  arm64: dts: imx8mm-venice-gw7901: fix port/phy validation
  arm64: dts: verdin-imx8mm: add otg2 pd to usbphy
  soc: imx: gpcv2: Assert reset before ungating clock
  arm64: dts: ls1028a-qds-65bb: don't use in-band autoneg for 2500base-x
  ARM: dts: imx6qdl-kontron-samx6i: fix spi-flash compatible
  ARM: dts: imx6qdl-kontron-samx6i: remove duplicated node
  ARM: dts: imx6qdl-vicut1.dtsi: Fix node name backlight_led
  arm64: dts: imx8mq-tqma8mq: Remove superfluous interrupt-names
  arm64: dts: imx8mp: Adjust ECSPI1 pinmux on i.MX8M Plus DHCOM
  arm64: dts: imx8mp-venice-gw74xx: fix sai2 pin settings
  arm64: dts: imx8mm-verdin: use level interrupt for mcp251xfd
  arm64: dts: imx8mm-verdin: update CAN clock to 40MHz
  Revert "soc: imx: imx8m-blk-ctrl: set power device name"

Link: https://lore.kernel.org/r/20220823092631.GV149610@dragon


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents c3069e82 8f143b9f

arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi

+1 −11
Original line number Diff line number Diff line
@@ -51,16 +51,6 @@ 
		vin-supply = <&reg_3p3v_s5>;

	};



	reg_3p3v_s0: regulator-3p3v-s0 {

		compatible = "regulator-fixed";

		regulator-name = "V_3V3_S0";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-always-on;

		regulator-boot-on;

		vin-supply = <&reg_3p3v_s5>;

	};



	reg_3p3v_s5: regulator-3p3v-s5 {

		compatible = "regulator-fixed";

		regulator-name = "V_3V3_S5";
@@ -259,7 +249,7 @@ 


	/* default boot source: workaround #1 for errata ERR006282 */

	smarc_flash: flash@0 {

		compatible = "winbond,w25q16dw", "jedec,spi-nor";

		compatible = "jedec,spi-nor";

		reg = <0>;

		spi-max-frequency = <20000000>;

	};

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

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
		enable-gpios = <&gpio4 28 GPIO_ACTIVE_HIGH>;

	};



	backlight_led: backlight_led {

	backlight_led: backlight-led {

		compatible = "pwm-backlight";

		pwms = <&pwm3 0 5000000 0>;

		brightness-levels = <0 16 64 255>;

arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-65bb.dts

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
&enetc_port0 {

	phy-handle = <&slot1_sgmii>;

	phy-mode = "2500base-x";

	managed = "in-band-status";

	status = "okay";

};

arch/arm64/boot/dts/freescale/imx8mm-venice-gw7901.dts

+4 −0
Original line number Diff line number Diff line
@@ -626,24 +626,28 @@ 
			lan1: port@0 {

				reg = <0>;

				label = "lan1";

				phy-mode = "internal";

				local-mac-address = [00 00 00 00 00 00];

			};



			lan2: port@1 {

				reg = <1>;

				label = "lan2";

				phy-mode = "internal";

				local-mac-address = [00 00 00 00 00 00];

			};



			lan3: port@2 {

				reg = <2>;

				label = "lan3";

				phy-mode = "internal";

				local-mac-address = [00 00 00 00 00 00];

			};



			lan4: port@3 {

				reg = <3>;

				label = "lan4";

				phy-mode = "internal";

				local-mac-address = [00 00 00 00 00 00];

			};

arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi

+6 −5
Original line number Diff line number Diff line
@@ -32,10 +32,10 @@ 
	};



	/* Fixed clock dedicated to SPI CAN controller */

	clk20m: oscillator {

	clk40m: oscillator {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		clock-frequency = <20000000>;

		clock-frequency = <40000000>;

	};



	gpio-keys {
@@ -202,8 +202,8 @@ 


	can1: can@0 {

		compatible = "microchip,mcp251xfd";

		clocks = <&clk20m>;

		interrupts-extended = <&gpio1 6 IRQ_TYPE_EDGE_FALLING>;

		clocks = <&clk40m>;

		interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_LOW>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_can1_int>;

		reg = <0>;
@@ -603,7 +603,7 @@ 
		pinctrl-0 = <&pinctrl_gpio_9_dsi>, <&pinctrl_i2s_2_bclk_touch_reset>;

		reg = <0x4a>;

		/* Verdin I2S_2_BCLK (TOUCH_RESET#, SODIMM 42) */

		reset-gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;

		reset-gpios = <&gpio3 23 GPIO_ACTIVE_LOW>;

		status = "disabled";

	};
@@ -745,6 +745,7 @@ 
};



&usbphynop2 {

	power-domains = <&pgc_otg2>;

	vcc-supply = <&reg_vdd_3v3>;

};