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

Merge tag 'at91-dt-6.2-3' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into soc/dt 

AT91 DT for 6.2 #3

It contains:
- proper power rail description for SDMMC devices available on
  SAMA7G5-EK
- OTP controller has been added for LAN966X devices

* tag 'at91-dt-6.2-3' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: dts: lan966x: Add otp support
  ARM: dts: at91: sama7g5ek: align power rails for sdmmc0/1

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 799423ec eb93f1d7

arch/arm/boot/dts/at91-sama7g5ek.dts

+4 −1
Original line number Diff line number Diff line
@@ -764,8 +764,9 @@ &rtt { 
&sdmmc0 {

	bus-width = <8>;

	non-removable;

	no-1-8-v;

	sdhci-caps-mask = <0x0 0x00200000>;

	vmmc-supply = <&vdd_3v3>;

	vqmmc-supply = <&vldo1>;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_sdmmc0_default>;

	status = "okay";
@@ -775,6 +776,8 @@ &sdmmc1 { 
	bus-width = <4>;

	no-1-8-v;

	sdhci-caps-mask = <0x0 0x00200000>;

	vmmc-supply = <&vdd_3v3>;

	vqmmc-supply = <&vdd_3v3>;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_sdmmc1_default>;

	status = "okay";

arch/arm/boot/dts/lan966x.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -157,6 +157,11 @@ port7: port@7 { 
			};

		};



		otp: otp@e0021000 {

			compatible = "microchip,lan9668-otpc", "microchip,lan9662-otpc";

			reg = <0xe0021000 0x300>;

		};



		flx0: flexcom@e0040000 {

			compatible = "atmel,sama5d2-flexcom";

			reg = <0xe0040000 0x100>;