Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a3f3714 authored by Jerome Brunet's avatar Jerome Brunet Committed by Kevin Hilman
Browse files

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



Fix sdio node order in the soc device tree

Fixes: a1737347250e ("arm64: dts: meson: g12a: add SDIO controller")
Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Reviewed-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: default avatarKevin Hilman <khilman@baylibre.com>
parent cd0727aa

arch/arm64/boot/dts/amlogic/meson-g12a.dtsi

+36 −37
Original line number Diff line number Diff line
@@ -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 {

						mux {

							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 {

						mux {

							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 {

			compatible = "amlogic,meson-axg-mmc";

			reg = <0x0 0xffe05000 0x0 0x800>;
@@ -2349,19 +2361,6 @@ 
			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";