| Message ID | 20190603100357.16799-2-narmstrong@baylibre.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/4] arm64: dts: meson: g12a: add SDIO controller | expand |
Neil Armstrong <narmstrong@baylibre.com> writes: > From: Jerome Brunet <jbrunet@baylibre.com> > > The Amlogic G12A SDIO Controller has a bug preventing direct DDR access, > add the port A (SDIO) pinctrl and controller nodes and mark this specific > controller with the amlogic,dram-access-quirk property. > > Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> I'm assuming this one should replace the one that was already sent with the MMC quirks series? Or maybe they identical (other than diff context?) Kevin
On 04/06/2019 01:31, Kevin Hilman wrote: > Neil Armstrong <narmstrong@baylibre.com> writes: > >> From: Jerome Brunet <jbrunet@baylibre.com> >> >> The Amlogic G12A SDIO Controller has a bug preventing direct DDR access, >> add the port A (SDIO) pinctrl and controller nodes and mark this specific >> controller with the amlogic,dram-access-quirk property. >> >> Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> >> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > > I'm assuming this one should replace the one that was already sent with > the MMC quirks series? Or maybe they identical (other than diff context?) > > Kevin > It's the same one but rebased on v5.3/dt64 Neil
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi index 840dab606110..9139913387ab 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi @@ -1313,6 +1313,30 @@ }; }; + sdio_pins: sdio { + mux { + groups = "sdio_d0", + "sdio_d1", + "sdio_d2", + "sdio_d3", + "sdio_cmd", + "sdio_clk"; + function = "sdio"; + bias-disable; + drive-strength-microamp = <4000>; + }; + }; + + sdio_clk_gate_pins: sdio_clk_gate { + mux { + groups = "GPIOX_4"; + function = "gpio_periphs"; + bias-pull-down; + drive-strength-microamp = <4000>; + }; + }; + + uart_a_pins: uart-a { mux { groups = "uart_a_tx", @@ -2303,6 +2327,19 @@ resets = <&reset RESET_SD_EMMC_C>; }; + sd_emmc_a: sd@ffe03000 { + compatible = "amlogic,meson-axg-mmc"; + reg = <0x0 0xffe03000 0x0 0x800>; + interrupts = <GIC_SPI 189 IRQ_TYPE_EDGE_RISING>; + status = "disabled"; + clocks = <&clkc CLKID_SD_EMMC_A>, + <&clkc CLKID_SD_EMMC_A_CLK0>, + <&clkc CLKID_FCLK_DIV2>; + clock-names = "core", "clkin0", "clkin1"; + resets = <&reset RESET_SD_EMMC_A>; + amlogic,dram-access-quirk; + }; + usb: usb@ffe09000 { status = "disabled"; compatible = "amlogic,meson-g12a-usb-ctrl";