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;
-       status = "ok";
+       status = "okay";
 
        phy1: ethernet-phy@1 {
                reg = <1>;
@@ -377,7 +377,7 @@
 };
 
 &cmt0 {
-       status = "ok";
+       status = "okay";
 };
 
 &sata0 {
@@ -444,6 +444,8 @@
                spi-max-frequency = <30000000>;
                spi-tx-bus-width = <4>;
                spi-rx-bus-width = <4>;
+               spi-cpha;
+               spi-cpol;
                m25p,fast-read;
 
                partition@0 {
@@ -452,13 +454,13 @@
                        read-only;
                };
                partition@80000 {
-                       label = "bootenv";
-                       reg = <0x00080000 0x00080000>;
+                       label = "user";
+                       reg = <0x00080000 0x00580000>;
                        read-only;
                };
-               partition@100000 {
-                       label = "data";
-                       reg = <0x00100000 0x03f00000>;
+               partition@600000 {
+                       label = "flash";
+                       reg = <0x00600000 0x03a00000>;
                };
        };
 };
@@ -563,7 +565,7 @@
 
 /* composite video input */
 &vin1 {
-       status = "ok";
+       status = "okay";
        pinctrl-0 = <&vin1_pins>;
        pinctrl-names = "default";
 
@@ -582,6 +584,7 @@
        pinctrl-0 = <&sound_pins &sound_clk_pins>;
        pinctrl-names = "default";
 
+       /* Single DAI */
        #sound-dai-cells = <0>;
 
        status = "okay";