Unverified Commit 7ad8b2fc authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-fixes-5.16-3' of... 

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

i.MX fixes for 5.16, round 3:

- Fix imx6qdl-wandboard Ethernet support by adding 'qca,clk-out-frequency'
  property.
- Fix scl-gpios property typo in LX2160A device tree.

* tag 'imx-fixes-5.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: dts: lx2160a: fix scl-gpios property name
  ARM: dts: imx6qdl-wandboard: Fix Ethernet support
  soc: imx: Register SoC device only on i.MX boards
  soc: imx: imx8m-blk-ctrl: Fix imx8mm mipi reset
  ARM: dts: imx6ull-pinfunc: Fix CSI_DATA07__ESAI_TX0 pad name
  arm64: dts: imx8mq: remove interconnect property from lcdif
  arm64: dts: ten64: remove redundant interrupt declaration for gpio-keys
  arm64: dts: lx2160abluebox3: update RGMII delays for sja1105 switch
  ARM: dts: ls1021a-tsn: update RGMII delays for sja1105 switch
  ARM: dts: imx6qp-prtwd3: update RGMII delays for sja1105 switch

Link: https://lore.kernel.org/r/20211218052003.GA25102@dragon


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 8d674d09 849e087b

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

+1 −0
Original line number Diff line number Diff line
@@ -309,6 +309,7 @@ 


		ethphy: ethernet-phy@1 {

			reg = <1>;

			qca,clk-out-frequency = <125000000>;

		};

	};

};

arch/arm/boot/dts/imx6qp-prtwd3.dts

+2 −0
Original line number Diff line number Diff line
@@ -178,6 +178,8 @@ 
				label = "cpu";

				ethernet = <&fec>;

				phy-mode = "rgmii-id";

				rx-internal-delay-ps = <2000>;

				tx-internal-delay-ps = <2000>;



				fixed-link {

					speed = <100>;

arch/arm/boot/dts/imx6ull-pinfunc.h

+1 −1
Original line number Diff line number Diff line
@@ -82,6 +82,6 @@ 
#define MX6ULL_PAD_CSI_DATA04__ESAI_TX_FS                         0x01F4 0x0480 0x0000 0x9 0x0

#define MX6ULL_PAD_CSI_DATA05__ESAI_TX_CLK                        0x01F8 0x0484 0x0000 0x9 0x0

#define MX6ULL_PAD_CSI_DATA06__ESAI_TX5_RX0                       0x01FC 0x0488 0x0000 0x9 0x0

#define MX6ULL_PAD_CSI_DATA07__ESAI_T0                            0x0200 0x048C 0x0000 0x9 0x0

#define MX6ULL_PAD_CSI_DATA07__ESAI_TX0                           0x0200 0x048C 0x0000 0x9 0x0



#endif /* __DTS_IMX6ULL_PINFUNC_H */

arch/arm/boot/dts/ls1021a-tsn.dts

+2 −0
Original line number Diff line number Diff line
@@ -91,6 +91,8 @@ 
				/* Internal port connected to eth2 */

				ethernet = <&enet2>;

				phy-mode = "rgmii";

				rx-internal-delay-ps = <0>;

				tx-internal-delay-ps = <0>;

				reg = <4>;



				fixed-link {

arch/arm64/boot/dts/freescale/fsl-ls1088a-ten64.dts

+0 −2
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
		powerdn {

			label = "External Power Down";

			gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;

			interrupts = <&gpio1 17 IRQ_TYPE_EDGE_FALLING>;

			linux,code = <KEY_POWER>;

		};
@@ -46,7 +45,6 @@ 
		admin {

			label = "ADMIN button";

			gpios = <&gpio3 8 GPIO_ACTIVE_HIGH>;

			interrupts = <&gpio3 8 IRQ_TYPE_EDGE_RISING>;

			linux,code = <KEY_WPS_BUTTON>;

		};

	};