leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm64: dts: meson: g12a: sort sdio nodes correctly

Browse Source 
Fix sdio node order in the soc device tree

Fixes: a1737347250e ("arm64: dts: meson: g12a: add SDIO controller")
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
This commit is contained in:
Jerome Brunet
2019-06-10 14:49:31 +02:00
committed by Kevin Hilman
parent cd0727aa42
commit 9a3f37143f
1 changed files with 36 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
View File

@@ -843,6 +843,29 @@
}; };
}; };
sdio_pins: sdio {
mux {
groups = "sdio_d0",
"sdio_d1",
"sdio_d2",
"sdio_d3",
"sdio_clk",
"sdio_cmd";
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>;
};
};
spdif_in_a10_pins: spdif-in-a10 { spdif_in_a10_pins: spdif-in-a10 {
mux { mux {
groups = "spdif_in_a10"; groups = "spdif_in_a10";
@@ -1326,30 +1349,6 @@
}; };
}; };
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 { uart_a_pins: uart-a {
mux { mux {
groups = "uart_a_tx", groups = "uart_a_tx",
@@ -2325,6 +2324,19 @@
}; };
}; };
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;
};
sd_emmc_b: sd@ffe05000 { sd_emmc_b: sd@ffe05000 {
compatible = "amlogic,meson-axg-mmc"; compatible = "amlogic,meson-axg-mmc";
reg = <0x0 0xffe05000 0x0 0x800>; reg = <0x0 0xffe05000 0x0 0x800>;
@@ -2349,19 +2361,6 @@
resets = <&reset RESET_SD_EMMC_C>; 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 { usb: usb@ffe09000 {
status = "disabled"; status = "disabled";
compatible = "amlogic,meson-g12a-usb-ctrl"; compatible = "amlogic,meson-g12a-usb-ctrl";