projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
exynos3250-artik5-eval.dts
diff --git
a/arch/arm/boot/dts/exynos3250-artik5-eval.dts
b/arch/arm/boot/dts/exynos3250-artik5-eval.dts
index
5461949
..
a1e22f6
100644
(file)
--- a/
arch/arm/boot/dts/exynos3250-artik5-eval.dts
+++ b/
arch/arm/boot/dts/exynos3250-artik5-eval.dts
@@
-42,12
+42,9
@@
status = "okay";
cs-gpios = <&gpx3 4 GPIO_ACTIVE_LOW>, <0>;
status = "okay";
cs-gpios = <&gpx3 4 GPIO_ACTIVE_LOW>, <0>;
- assigned-clocks = <&cmu CLK_MOUT_MPLL>, <&cmu CLK_DIV_MPLL_PRE>,
- <&cmu CLK_MOUT_SPI0>, <&cmu CLK_DIV_SPI0>,
+ assigned-clocks = <&cmu CLK_MOUT_SPI0>, <&cmu CLK_DIV_SPI0>,
<&cmu CLK_DIV_SPI0_PRE>, <&cmu CLK_SCLK_SPI0>;
<&cmu CLK_DIV_SPI0_PRE>, <&cmu CLK_SCLK_SPI0>;
- assigned-clock-parents = <&cmu CLK_FOUT_MPLL>, /* for: CLK_MOUT_MPLL */
- <&cmu CLK_MOUT_MPLL>, /* for: CLK_DIV_MPLL_PRE */
- <&cmu CLK_DIV_MPLL_PRE>, /* for: CLK_MOUT_SPI0 */
+ assigned-clock-parents = <&cmu CLK_DIV_MPLL_PRE>, /* for: CLK_MOUT_SPI0 */
<&cmu CLK_MOUT_SPI0>, /* for: CLK_DIV_SPI0 */
<&cmu CLK_DIV_SPI0>, /* for: CLK_DIV_SPI0_PRE */
<&cmu CLK_DIV_SPI0_PRE>; /* for: CLK_SCLK_SPI0 */
<&cmu CLK_MOUT_SPI0>, /* for: CLK_DIV_SPI0 */
<&cmu CLK_DIV_SPI0>, /* for: CLK_DIV_SPI0_PRE */
<&cmu CLK_DIV_SPI0_PRE>; /* for: CLK_SCLK_SPI0 */