Unverified Commit 5e7230a4 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'at91-fixes-5.19-2' of... 

Merge tag 'at91-fixes-5.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/fixes

AT91 fixes for 5.19 #2

It contains 2 DT fixes:
- one for SAMA5D2 to fix the i2s1 assigned-clock-parents property
- one for kswitch-d10 (LAN966 based) enforcing proper settings
  on GPIO pins

* tag 'at91-fixes-5.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: dts: at91: sama5d2: Fix typo in i2s1 node
  ARM: dts: kswitch-d10: use open drain mode for coma-mode pins

Link: https://lore.kernel.org/r/20220708151621.860339-1-claudiu.beznea@microchip.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 2dc94f06 2fdf15b5

arch/arm/boot/dts/lan966x-kontron-kswitch-d10-mmt.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -87,22 +87,22 @@ 


	phy4: ethernet-phy@5 {

		reg = <5>;

		coma-mode-gpios = <&gpio 37 GPIO_ACTIVE_HIGH>;

		coma-mode-gpios = <&gpio 37 GPIO_OPEN_DRAIN>;

	};



	phy5: ethernet-phy@6 {

		reg = <6>;

		coma-mode-gpios = <&gpio 37 GPIO_ACTIVE_HIGH>;

		coma-mode-gpios = <&gpio 37 GPIO_OPEN_DRAIN>;

	};



	phy6: ethernet-phy@7 {

		reg = <7>;

		coma-mode-gpios = <&gpio 37 GPIO_ACTIVE_HIGH>;

		coma-mode-gpios = <&gpio 37 GPIO_OPEN_DRAIN>;

	};



	phy7: ethernet-phy@8 {

		reg = <8>;

		coma-mode-gpios = <&gpio 37 GPIO_ACTIVE_HIGH>;

		coma-mode-gpios = <&gpio 37 GPIO_OPEN_DRAIN>;

	};

};

arch/arm/boot/dts/sama5d2.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -1124,7 +1124,7 @@ 
				clocks = <&pmc PMC_TYPE_PERIPHERAL 55>, <&pmc PMC_TYPE_GCK 55>;

				clock-names = "pclk", "gclk";

				assigned-clocks = <&pmc PMC_TYPE_CORE PMC_I2S1_MUX>;

				assigned-parrents = <&pmc PMC_TYPE_GCK 55>;

				assigned-clock-parents = <&pmc PMC_TYPE_GCK 55>;

				status = "disabled";

			};