Skip to content

Commit

Permalink
ARM: dts: meson: add the SDIO MMC controller
Browse files Browse the repository at this point in the history
Meson6, Meson8 and Meson8b are using the same MMC controller IP. This
adds the MMC controller node to meson.dtsi so it can be used by all
SoCs.

The controller itself is a bit special, because it has multiple slots.
Each slot is accessed through a sub-node of the controller. However,
currently the driver for this hardware only supports one slot.

Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
  • Loading branch information
Martin Blumenstingl authored and Kevin Hilman committed Oct 12, 2017
1 parent b9b4bf5 commit 88b1b18
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 0 deletions.
9 changes: 9 additions & 0 deletions arch/arm/boot/dts/meson.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,15 @@
status = "disabled";
};

sdio: mmc@8c20 {
compatible = "amlogic,meson-mx-sdio";
reg = <0x8c20 0x20>;
interrupts = <GIC_SPI 28 IRQ_TYPE_EDGE_RISING>;
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
};

spifc: spi@8c80 {
compatible = "amlogic,meson6-spifc";
reg = <0x8c80 0x80>;
Expand Down
6 changes: 6 additions & 0 deletions arch/arm/boot/dts/meson8.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,12 @@
clock-names = "clkin", "core", "sana";
};

&sdio {
compatible = "amlogic,meson8-sdio", "amlogic,meson-mx-sdio";
clocks = <&clkc CLKID_SDIO>, <&clkc CLKID_CLK81>;
clock-names = "core", "clkin";
};

&spifc {
clocks = <&clkc CLKID_CLK81>;
};
Expand Down
6 changes: 6 additions & 0 deletions arch/arm/boot/dts/meson8b.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,12 @@
clock-names = "clkin", "core", "sana";
};

&sdio {
compatible = "amlogic,meson8b-sdio", "amlogic,meson-mx-sdio";
clocks = <&clkc CLKID_SDIO>, <&clkc CLKID_CLK81>;
clock-names = "core", "clkin";
};

&uart_AO {
clocks = <&clkc CLKID_CLK81>;
};
Expand Down

0 comments on commit 88b1b18

Please sign in to comment.