aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2019-08-11 23:36:23 +0200
committerLubomir Rintel <lkundrak@v3.sk>2020-03-23 18:53:03 +0100
commitab5e2ed5314ad9561ac461af802518a18ef060cb (patch)
treebe89328026ce1df8dc4d3353521af4b0a1ddd340
parent75679c0b9a541acf0cb0a8941e37a78099de8944 (diff)
downloadopenfirmware-ab5e2ed5314ad9561ac461af802518a18ef060cb.tar.gz
olpc/cl4: switch SDHCI to clock from /clocks
-rw-r--r--cpu/arm/mmp2/clk.fth1
-rw-r--r--cpu/arm/olpc/cl4/sdhci.fth10
2 files changed, 5 insertions, 6 deletions
diff --git a/cpu/arm/mmp2/clk.fth b/cpu/arm/mmp2/clk.fth
index fb20d46d..1b3401c6 100644
--- a/cpu/arm/mmp2/clk.fth
+++ b/cpu/arm/mmp2/clk.fth
@@ -37,6 +37,7 @@ d# 122 constant mmp2-usbhsic1-clk#
d# 123 constant mmp2-gpu-bus-clk#
d# 124 constant mmp2-gpu-3d-clk#
d# 125 constant mmp3-gpu-2d-clk#
+d# 126 constant mmp3-sdh4-clk#
\ From include/dt-bindings/power/marvell,mmp2.h
d# 0 constant mmp2-gpu-power-domain#
diff --git a/cpu/arm/olpc/cl4/sdhci.fth b/cpu/arm/olpc/cl4/sdhci.fth
index 84811ddf..9e390b3e 100644
--- a/cpu/arm/olpc/cl4/sdhci.fth
+++ b/cpu/arm/olpc/cl4/sdhci.fth
@@ -8,9 +8,8 @@ dev /sd \ MMC1 - External SD
fload ${BP}/dev/mmc/sdhci/slot.fth
d# 39 " interrupts" integer-property
0 0 encode-bytes " no-1-8-v" property
-
- " /pmua" encode-phandle 3 encode-int encode+ " clocks" property
- " PXA-SDHCLK" " clock-names" string-property
+ " /clocks" encode-phandle mmp2-sdh0-clk# encode-int encode+ " clocks" property
+ " io" " clock-names" string-property
d# 40 encode-int 1 encode-int encode+ " power-delay-ms" property
\ Active low
" /gpio" encode-phandle d# 31 encode-int encode+ 1 encode-int encode+ " cd-gpios" property
@@ -45,9 +44,8 @@ dev /sd \ MMC5 - internal micro-SD
\ only accessible on the motherboard, and a heatsink must be removed to
\ access it.
0 0 " non-removable" property
-
- " /pmua" encode-phandle d# 27 encode-int encode+ " clocks" property
- " PXA-SDHCLK" " clock-names" string-property
+ " /clocks" encode-phandle mmp3-sdh4-clk# encode-int encode+ " clocks" property
+ " io" " clock-names" string-property
d# 40 encode-int 1 encode-int encode+ " power-delay-ms" property
0 0 " broken-cd" property