projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'tegra-for-3.20-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
boot
/
dts
/
r8a7791-koelsch.dts
diff --git
a/arch/arm/boot/dts/r8a7791-koelsch.dts
b/arch/arm/boot/dts/r8a7791-koelsch.dts
index 990af167c551492cca23849514fb7e86a0f8e86c..96f5b5877f22c576cca2dd349aa6e41d0c5d721a 100644
(file)
--- a/
arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/
arch/arm/boot/dts/r8a7791-koelsch.dts
@@
-366,7
+366,7
@@
phy-handle = <&phy1>;
renesas,ether-link-active-low;
phy-handle = <&phy1>;
renesas,ether-link-active-low;
- status = "ok";
+ status = "ok
ay
";
phy1: ethernet-phy@1 {
reg = <1>;
phy1: ethernet-phy@1 {
reg = <1>;
@@
-377,7
+377,7
@@
};
&cmt0 {
};
&cmt0 {
- status = "ok";
+ status = "ok
ay
";
};
&sata0 {
};
&sata0 {
@@
-444,6
+444,8
@@
spi-max-frequency = <30000000>;
spi-tx-bus-width = <4>;
spi-rx-bus-width = <4>;
spi-max-frequency = <30000000>;
spi-tx-bus-width = <4>;
spi-rx-bus-width = <4>;
+ spi-cpha;
+ spi-cpol;
m25p,fast-read;
partition@0 {
m25p,fast-read;
partition@0 {
@@
-452,13
+454,13
@@
read-only;
};
partition@80000 {
read-only;
};
partition@80000 {
- label = "
bootenv
";
- reg = <0x00080000 0x00
0
80000>;
+ label = "
user
";
+ reg = <0x00080000 0x00
5
80000>;
read-only;
};
read-only;
};
- partition@
1
00000 {
- label = "
data
";
- reg = <0x00
100000 0x03f
00000>;
+ partition@
6
00000 {
+ label = "
flash
";
+ reg = <0x00
600000 0x03a
00000>;
};
};
};
};
};
};
@@
-563,7
+565,7
@@
/* composite video input */
&vin1 {
/* composite video input */
&vin1 {
- status = "ok";
+ status = "ok
ay
";
pinctrl-0 = <&vin1_pins>;
pinctrl-names = "default";
pinctrl-0 = <&vin1_pins>;
pinctrl-names = "default";
@@
-582,6
+584,7
@@
pinctrl-0 = <&sound_pins &sound_clk_pins>;
pinctrl-names = "default";
pinctrl-0 = <&sound_pins &sound_clk_pins>;
pinctrl-names = "default";
+ /* Single DAI */
#sound-dai-cells = <0>;
status = "okay";
#sound-dai-cells = <0>;
status = "okay";