summaryrefslogtreecommitdiffstats
path: root/arch/mips/boot
diff options
context:
space:
mode:
authorPaul Cercueil <paul@crapouillou.net>2019-01-25 21:09:27 +0100
committerPaul Burton <paul.burton@mips.com>2019-07-22 23:28:40 +0200
commitf23478f6ea2ed6c8dccc6f7b902c2362ebc197ef (patch)
treefe1105f979df2839d75a8148d922a086667e362c /arch/mips/boot
parentMIPS: pte_special()/pte_mkspecial() support (diff)
downloadlinux-f23478f6ea2ed6c8dccc6f7b902c2362ebc197ef.tar.xz
linux-f23478f6ea2ed6c8dccc6f7b902c2362ebc197ef.zip
MIPS: qi_lb60: Move MMC configuration to devicetree
Move the MMC configuration from the board C file to devicetree. The 'power' GPIO was removed and instead the vmmc regulator is used, to follow the changes introduced in the jz4740-mmc driver. Signed-off-by: Paul Cercueil <paul@crapouillou.net> Signed-off-by: Paul Burton <paul.burton@mips.com>
Diffstat (limited to 'arch/mips/boot')
-rw-r--r--arch/mips/boot/dts/ingenic/qi_lb60.dts33
1 files changed, 33 insertions, 0 deletions
diff --git a/arch/mips/boot/dts/ingenic/qi_lb60.dts b/arch/mips/boot/dts/ingenic/qi_lb60.dts
index 76aaf8982554..cc26650562c2 100644
--- a/arch/mips/boot/dts/ingenic/qi_lb60.dts
+++ b/arch/mips/boot/dts/ingenic/qi_lb60.dts
@@ -2,6 +2,7 @@
/dts-v1/;
#include "jz4740.dtsi"
+#include <dt-bindings/gpio/gpio.h>
/ {
compatible = "qi,lb60", "ingenic,jz4740";
@@ -9,6 +10,15 @@
chosen {
stdout-path = &uart0;
};
+
+ mmc_power: fixedregulator {
+ compatible = "regulator-fixed";
+ regulator-name = "mmc_vcc";
+ gpio = <&gpd 2 0>;
+
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ };
};
&ext {
@@ -30,4 +40,27 @@
groups = "uart0-data";
bias-disable;
};
+
+ pins_mmc: mmc {
+ mmc {
+ function = "mmc";
+ groups = "mmc-1bit", "mmc-4bit";
+ bias-disable;
+ };
+
+ mmc-gpios {
+ pins = "PD0", "PD2";
+ bias-disable;
+ };
+ };
+};
+
+&mmc {
+ bus-width = <4>;
+ max-frequency = <24000000>;
+ cd-gpios = <&gpd 0 GPIO_ACTIVE_HIGH>;
+ vmmc-supply = <&mmc_power>;
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&pins_mmc>;
};