* [PATCH 0/3] ARM: dts: aspeed: Enable SD controllers
@ 2019-07-10 14:15 Andrew Jeffery
2019-07-10 14:15 ` [PATCH 1/3] ARM: dts: aspeed: Describe SD controller in DTSIs Andrew Jeffery
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Andrew Jeffery @ 2019-07-10 14:15 UTC (permalink / raw)
To: linux-aspeed
Cc: mark.rutland, Andrew Jeffery, linux-kernel, robh+dt, joel,
linux-arm-kernel
Hello,
This series describes the ASPEED SD controller in relevant devicetree files,
enabling the MMC slots on the AST2500 EVB and Swift machines.
Please review!
Andrew
Andrew Jeffery (2):
ARM: dts: aspeed: Describe SD controller in DTSIs
ARM: dts: aspeed: Enable both MMC slots on AST2500 EVB
Joel Stanley (1):
ARM: dts: aspeed: Enable both MMC slots on Swift
arch/arm/boot/dts/aspeed-ast2500-evb.dts | 18 +++++++++++
.../boot/dts/aspeed-bmc-opp-witherspoon.dts | 18 +++++++++++
arch/arm/boot/dts/aspeed-g4.dtsi | 30 +++++++++++++++++++
arch/arm/boot/dts/aspeed-g5.dtsi | 30 +++++++++++++++++++
4 files changed, 96 insertions(+)
--
2.20.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/3] ARM: dts: aspeed: Describe SD controller in DTSIs
2019-07-10 14:15 [PATCH 0/3] ARM: dts: aspeed: Enable SD controllers Andrew Jeffery
@ 2019-07-10 14:15 ` Andrew Jeffery
2019-07-10 14:15 ` [PATCH 2/3] ARM: dts: aspeed: Enable both MMC slots on AST2500 EVB Andrew Jeffery
2019-07-10 14:15 ` [PATCH 3/3] ARM: dts: aspeed: Enable both MMC slots on Swift Andrew Jeffery
2 siblings, 0 replies; 4+ messages in thread
From: Andrew Jeffery @ 2019-07-10 14:15 UTC (permalink / raw)
To: linux-aspeed
Cc: mark.rutland, Andrew Jeffery, ryanchen.aspeed, linux-kernel,
robh+dt, joel, linux-arm-kernel
The AST2400 and AST2500 both share the same SD controller, at the same
location in the physical address space and the same hardware interrupt,
with the same clock configurations.
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
---
arch/arm/boot/dts/aspeed-g4.dtsi | 30 ++++++++++++++++++++++++++++++
arch/arm/boot/dts/aspeed-g5.dtsi | 30 ++++++++++++++++++++++++++++++
2 files changed, 60 insertions(+)
diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi
index 5d7050d00874..4bfda5d91dbe 100644
--- a/arch/arm/boot/dts/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed-g4.dtsi
@@ -188,6 +188,36 @@
reg = <0x1e720000 0x8000>; // 32K
};
+ sdc: sdc@1e740000 {
+ compatible = "aspeed,ast2400-sdc";
+ reg = <0x1e740000 0x100>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges;
+ clocks = <&syscon ASPEED_CLK_GATE_SDCLK>;
+ status = "disabled";
+
+ sdhci0: sdhci@1e740100 {
+ compatible = "aspeed,ast2400-sdhci", "sdhci";
+ reg = <0x1e740100 0x100>;
+ aspeed,sdhci-slot = <0>;
+ interrupts = <26>;
+ sdhci,auto-cmd12;
+ clocks = <&syscon ASPEED_CLK_SDIO>;
+ status = "disabled";
+ };
+
+ sdhci1: sdhci@1e740200 {
+ compatible = "aspeed,ast2400-sdhci", "sdhci";
+ reg = <0x1e740200 0x100>;
+ aspeed,sdhci-slot = <1>;
+ interrupts = <26>;
+ sdhci,auto-cmd12;
+ clocks = <&syscon ASPEED_CLK_SDIO>;
+ status = "disabled";
+ };
+ };
+
gpio: gpio@1e780000 {
#gpio-cells = <2>;
gpio-controller;
diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
index 4345c3153ca7..8d6404311652 100644
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -262,6 +262,36 @@
reg = <0x1e720000 0x9000>; // 36K
};
+ sdc: sdc@1e740000 {
+ compatible = "aspeed,ast2500-sdc";
+ reg = <0x1e740000 0x100>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges;
+ clocks = <&syscon ASPEED_CLK_GATE_SDCLK>;
+ status = "disabled";
+
+ sdhci0: sdhci@1e740100 {
+ compatible = "aspeed,ast2500-sdhci", "sdhci";
+ reg = <0x1e740100 0x100>;
+ slot = <0>;
+ interrupts = <26>;
+ sdhci,auto-cmd12;
+ clocks = <&syscon ASPEED_CLK_SDIO>;
+ status = "disabled";
+ };
+
+ sdhci1: sdhci@1e740200 {
+ compatible = "aspeed,ast2500-sdhci", "sdhci";
+ reg = <0x1e740200 0x100>;
+ slot = <1>;
+ interrupts = <26>;
+ sdhci,auto-cmd12;
+ clocks = <&syscon ASPEED_CLK_SDIO>;
+ status = "disabled";
+ };
+ };
+
gpio: gpio@1e780000 {
#gpio-cells = <2>;
gpio-controller;
--
2.20.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/3] ARM: dts: aspeed: Enable both MMC slots on AST2500 EVB
2019-07-10 14:15 [PATCH 0/3] ARM: dts: aspeed: Enable SD controllers Andrew Jeffery
2019-07-10 14:15 ` [PATCH 1/3] ARM: dts: aspeed: Describe SD controller in DTSIs Andrew Jeffery
@ 2019-07-10 14:15 ` Andrew Jeffery
2019-07-10 14:15 ` [PATCH 3/3] ARM: dts: aspeed: Enable both MMC slots on Swift Andrew Jeffery
2 siblings, 0 replies; 4+ messages in thread
From: Andrew Jeffery @ 2019-07-10 14:15 UTC (permalink / raw)
To: linux-aspeed
Cc: mark.rutland, Andrew Jeffery, ryanchen.aspeed, linux-kernel,
robh+dt, joel, linux-arm-kernel
Enabled for testing purposes.
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
---
arch/arm/boot/dts/aspeed-ast2500-evb.dts | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/arch/arm/boot/dts/aspeed-ast2500-evb.dts b/arch/arm/boot/dts/aspeed-ast2500-evb.dts
index 556ed469830c..429904e401ee 100644
--- a/arch/arm/boot/dts/aspeed-ast2500-evb.dts
+++ b/arch/arm/boot/dts/aspeed-ast2500-evb.dts
@@ -94,6 +94,24 @@
};
};
+&sdc {
+ status = "okay";
+};
+
+&sdhci0 {
+ status = "okay";
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_sd1_default>;
+};
+
+&sdhci1 {
+ status = "okay";
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_sd2_default>;
+};
+
/*
* Enable port A as device (via the virtual hub) and port B as
* host by default on the eval board. This can be easily changed
--
2.20.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 3/3] ARM: dts: aspeed: Enable both MMC slots on Swift
2019-07-10 14:15 [PATCH 0/3] ARM: dts: aspeed: Enable SD controllers Andrew Jeffery
2019-07-10 14:15 ` [PATCH 1/3] ARM: dts: aspeed: Describe SD controller in DTSIs Andrew Jeffery
2019-07-10 14:15 ` [PATCH 2/3] ARM: dts: aspeed: Enable both MMC slots on AST2500 EVB Andrew Jeffery
@ 2019-07-10 14:15 ` Andrew Jeffery
2 siblings, 0 replies; 4+ messages in thread
From: Andrew Jeffery @ 2019-07-10 14:15 UTC (permalink / raw)
To: linux-aspeed
Cc: mark.rutland, ryanchen.aspeed, linux-kernel, robh+dt,
Joel Stanley, linux-arm-kernel
From: Joel Stanley <joel@jms.id.au>
Swift will provide at least its rootfs on eMMC.
Signed-off-by: Joel Stanley <joel@jms.id.au>
---
.../boot/dts/aspeed-bmc-opp-witherspoon.dts | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
index f1356ca794d8..fcaeae2dd0a8 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
@@ -640,3 +640,21 @@
&vhub {
status = "okay";
};
+
+&sdc {
+ status = "okay";
+};
+
+&sdhci0 {
+ status = "okay";
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_sd1_default>;
+};
+
+&sdhci1 {
+ status = "okay";
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_sd2_default>;
+};
--
2.20.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-07-10 14:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-10 14:15 [PATCH 0/3] ARM: dts: aspeed: Enable SD controllers Andrew Jeffery
2019-07-10 14:15 ` [PATCH 1/3] ARM: dts: aspeed: Describe SD controller in DTSIs Andrew Jeffery
2019-07-10 14:15 ` [PATCH 2/3] ARM: dts: aspeed: Enable both MMC slots on AST2500 EVB Andrew Jeffery
2019-07-10 14:15 ` [PATCH 3/3] ARM: dts: aspeed: Enable both MMC slots on Swift Andrew Jeffery
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).