Unverified Commit 708038dc authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

i.MX fixes for 5.16:

- A series from Vladimir Oltean to update SJA1105 switch RGMII delay for
  a few boards, so that kernel doesn't warn on the legacy bindings.
- Remove redundant interrupt declaration for gpio-keys on board
  ls1088a-ten64, as this causes an IRQ reclaiming error on kernel v5.15
  and later.

* tag 'imx-fixes-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  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/20211126100716.GF4216@dragon


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 1e3dbfbb c88c5e46

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/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>;

		};

	};

arch/arm64/boot/dts/freescale/fsl-lx2160a-bluebox3.dts

+4 −0
Original line number Diff line number Diff line
@@ -386,6 +386,8 @@ 
				reg = <2>;

				ethernet = <&dpmac17>;

				phy-mode = "rgmii-id";

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

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



				fixed-link {

					speed = <1000>;
@@ -529,6 +531,8 @@ 
				reg = <2>;

				ethernet = <&dpmac18>;

				phy-mode = "rgmii-id";

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

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



				fixed-link {

					speed = <1000>;