Message ID | 20210419143858.39401-1-wsa+renesas@sang-engineering.com (mailing list archive) |
---|---|
State | Mainlined |
Commit | ae657abc971d2b6cc75a35bee45fe7486ccd9c42 |
Delegated to: | Geert Uytterhoeven |
Headers | show |
Series | arm64: dts: renesas: condor: switch eMMC bus to 1V8 | expand |
On Mon, Apr 19, 2021 at 6:07 PM Wolfram Sang <wsa+renesas@sang-engineering.com> wrote: > The eMMC card has two supplies, VCC and VCCQ. The VCC supplies the NAND > array and the VCCQ supplies the bus. On Condor, the VCC is connected to > 3.3V rail, while the VCCQ is connected to 1.8V rail. Adjust the pinmux > to match the bus, which is always operating in 1.8V mode. > > While at it, deduplicate the pinmux entries, which are now the same for > both default and UHS modes. We still need the two pinctrl entries to > match the bindings though. > > Thanks to Marek Vasut for this commit description from 5f65328df3f5. ... from commit 5f65328df3f5cd25 ("arm64: dts: renesas: Switch eMMC bus to 1V8 on Salvator-X and ULCB") > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> i.e. will queue in renesas-devel for v5.14, with the above augmented. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
diff --git a/arch/arm64/boot/dts/renesas/r8a77980-condor.dts b/arch/arm64/boot/dts/renesas/r8a77980-condor.dts index 04d47c0c9bb9..7bde0a549c09 100644 --- a/arch/arm64/boot/dts/renesas/r8a77980-condor.dts +++ b/arch/arm64/boot/dts/renesas/r8a77980-condor.dts @@ -210,7 +210,7 @@ lvds0_out: endpoint { &mmc0 { pinctrl-0 = <&mmc_pins>; - pinctrl-1 = <&mmc_pins_uhs>; + pinctrl-1 = <&mmc_pins>; pinctrl-names = "default", "state_uhs"; vmmc-supply = <&d3_3v>; @@ -253,12 +253,6 @@ i2c0_pins: i2c0 { }; mmc_pins: mmc { - groups = "mmc_data8", "mmc_ctrl", "mmc_ds"; - function = "mmc"; - power-source = <3300>; - }; - - mmc_pins_uhs: mmc_uhs { groups = "mmc_data8", "mmc_ctrl", "mmc_ds"; function = "mmc"; power-source = <1800>;
The eMMC card has two supplies, VCC and VCCQ. The VCC supplies the NAND array and the VCCQ supplies the bus. On Condor, the VCC is connected to 3.3V rail, while the VCCQ is connected to 1.8V rail. Adjust the pinmux to match the bus, which is always operating in 1.8V mode. While at it, deduplicate the pinmux entries, which are now the same for both default and UHS modes. We still need the two pinctrl entries to match the bindings though. Thanks to Marek Vasut for this commit description from 5f65328df3f5. Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> --- eMMC works fine with the limited tests I could do via remotelab. arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)