projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
29d1b99
)
ARM: shmobile: r8a7791: Fix SD2CKCR register address
author
Shinobu Uehara
<shinobu.uehara.xc@renesas.com>
Tue, 22 Jul 2014 05:04:29 +0000
(22:04 -0700)
committer
Simon Horman
<horms@verge.net.au>
Fri, 5 Dec 2014 00:24:03 +0000
(09:24 +0900)
59e79895b95892863617ce630fbda467f2470575
(ARM: shmobile: r8a7791: Add clocks)
added r8a7791 SD clocks when v3.14.
2c60a7df72711fb8b4be1e6aa651ab166a8931bc
(ARM: shmobile: Add SDHI devices for Koelsch DTS)
enabled SD on r8a7791 Koelsch when v3.15.
1299df03d7191ab4356c995dde8b912d3c8922e9
(ARM: shmobile: henninger: add SDHI0/2 DT support)
enable SD on r8a7791 Henninger when v3.16.
But r8a7791 SD clock had wrong address.
This patch fixup it.
[Kuninori Morimoto: tidyup for upstreaming]
Signed-off-by: Shinobu Uehara <shinobu.uehara.xc@renesas.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
c9b227723d051184b9e78f20c75ae2f9d44a6ea2
)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
arch/arm/boot/dts/r8a7791.dtsi
patch
|
blob
|
history
diff --git
a/arch/arm/boot/dts/r8a7791.dtsi
b/arch/arm/boot/dts/r8a7791.dtsi
index
8d7ffae
..
79f68ac
100644
(file)
--- a/
arch/arm/boot/dts/r8a7791.dtsi
+++ b/
arch/arm/boot/dts/r8a7791.dtsi
@@
-540,9
+540,9
@@
#clock-cells = <0>;
clock-output-names = "sd1";
};
- sd2_clk: sd3_clk@e6150
07
c {
+ sd2_clk: sd3_clk@e6150
26
c {
compatible = "renesas,r8a7791-div6-clock", "renesas,cpg-div6-clock";
- reg = <0 0xe6150
07
c 0 4>;
+ reg = <0 0xe6150
26
c 0 4>;
clocks = <&pll1_div2_clk>;
#clock-cells = <0>;
clock-output-names = "sd2";