You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
70 lines
2.2 KiB
Diff
70 lines
2.2 KiB
Diff
12 years ago
|
The SDIO interface is only available on pins MPP30/31/32/33/34/35 on
|
||
|
the various Armada XP variants, so we provide a pin muxing option for
|
||
|
this in the Armada XP .dtsi files.
|
||
|
|
||
|
Even though those muxing options are the same for MV78230, MV78260 and
|
||
|
MV78460, we keep them in each .dtsi file, because the number of pins,
|
||
|
and therefore the declaration of the pinctrl node, is different for
|
||
|
each SoC variant.
|
||
|
|
||
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||
|
---
|
||
|
arch/arm/boot/dts/armada-xp-mv78230.dtsi | 6 ++++++
|
||
|
arch/arm/boot/dts/armada-xp-mv78260.dtsi | 6 ++++++
|
||
|
arch/arm/boot/dts/armada-xp-mv78460.dtsi | 6 ++++++
|
||
|
3 files changed, 18 insertions(+)
|
||
|
|
||
|
diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
|
||
|
index c45c7b4..3fa9c84 100644
|
||
|
--- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi
|
||
|
+++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
|
||
|
@@ -40,6 +40,12 @@
|
||
|
pinctrl {
|
||
|
compatible = "marvell,mv78230-pinctrl";
|
||
|
reg = <0xd0018000 0x38>;
|
||
|
+
|
||
|
+ sdio_pins: sdio-pins {
|
||
|
+ marvell,pins = "mpp30", "mpp31", "mpp32",
|
||
|
+ "mpp33", "mpp34", "mpp35";
|
||
|
+ marvell,function = "sd0";
|
||
|
+ };
|
||
|
};
|
||
|
|
||
|
gpio0: gpio@d0018100 {
|
||
|
diff --git a/arch/arm/boot/dts/armada-xp-mv78260.dtsi b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
|
||
|
index a2aee57..5a907b3 100644
|
||
|
--- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi
|
||
|
+++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
|
||
|
@@ -48,6 +48,12 @@
|
||
|
pinctrl {
|
||
|
compatible = "marvell,mv78260-pinctrl";
|
||
|
reg = <0xd0018000 0x38>;
|
||
|
+
|
||
|
+ sdio_pins: sdio-pins {
|
||
|
+ marvell,pins = "mpp30", "mpp31", "mpp32",
|
||
|
+ "mpp33", "mpp34", "mpp35";
|
||
|
+ marvell,function = "sd0";
|
||
|
+ };
|
||
|
};
|
||
|
|
||
|
gpio0: gpio@d0018100 {
|
||
|
diff --git a/arch/arm/boot/dts/armada-xp-mv78460.dtsi b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
|
||
|
index da03a12..6dcdc50d 100644
|
||
|
--- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
|
||
|
+++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
|
||
|
@@ -63,6 +63,12 @@
|
||
|
pinctrl {
|
||
|
compatible = "marvell,mv78460-pinctrl";
|
||
|
reg = <0xd0018000 0x38>;
|
||
|
+
|
||
|
+ sdio_pins: sdio-pins {
|
||
|
+ marvell,pins = "mpp30", "mpp31", "mpp32",
|
||
|
+ "mpp33", "mpp34", "mpp35";
|
||
|
+ marvell,function = "sd0";
|
||
|
+ };
|
||
|
};
|
||
|
|
||
|
gpio0: gpio@d0018100 {
|
||
|
--
|
||
|
1.7.9.5
|