diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2022-11-30 17:04:49 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-11-30 17:04:50 +0300 |
| commit | ca1a1892f8eb8697279f7fbcd55def12c361f8a3 (patch) | |
| tree | f9621673a459f0d95e3123f08dda7fbcfa675d6a | |
| parent | 799423ec5a6defd9d56d50ebefc7690c06b2af73 (diff) | |
| parent | eb93f1d7c91d8d6fe6fc001e0b515d1bbd755fd2 (diff) | |
| download | linux-ca1a1892f8eb8697279f7fbcd55def12c361f8a3.tar.xz | |
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: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/boot/dts/at91-sama7g5ek.dts | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/lan966x.dtsi | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/at91-sama7g5ek.dts b/arch/arm/boot/dts/at91-sama7g5ek.dts index 3b25c67795dd..aa5cc0e98bba 100644 --- a/arch/arm/boot/dts/at91-sama7g5ek.dts +++ b/arch/arm/boot/dts/at91-sama7g5ek.dts @@ -764,8 +764,9 @@ &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 @@ 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"; diff --git a/arch/arm/boot/dts/lan966x.dtsi b/arch/arm/boot/dts/lan966x.dtsi index 0bf818713422..05b73f7cf0c7 100644 --- a/arch/arm/boot/dts/lan966x.dtsi +++ b/arch/arm/boot/dts/lan966x.dtsi @@ -157,6 +157,11 @@ }; }; + otp: otp@e0021000 { + compatible = "microchip,lan9668-otpc", "microchip,lan9662-otpc"; + reg = <0xe0021000 0x300>; + }; + flx0: flexcom@e0040000 { compatible = "atmel,sama5d2-flexcom"; reg = <0xe0040000 0x100>; |