Merge tag 'powerpc-4.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[karo-tx-linux.git] / arch / arm / boot / dts / r8a7778-bockw.dts

diff --git a/arch/arm/boot/dts/r8a7778-bockw.dts b/arch/arm/boot/dts/r8a7778-bockw.dts
index 90543b12d7e26bcbd9eca0e0c113ffaa718a3873..a52b359e2ae24a300e9cc5f5de946d3005ad2afe 100644 (file)
--- a/arch/arm/boot/dts/r8a7778-bockw.dts
+++ b/arch/arm/boot/dts/r8a7778-bockw.dts
@@ -28,8 +28,8 @@
        };
 
        chosen {
-               bootargs = "console=ttySC0,115200 ignore_loglevel ip=dhcp root=/dev/nfs rw";
-               stdout-path = &scif0;
+               bootargs = "ignore_loglevel ip=dhcp root=/dev/nfs rw";
+               stdout-path = "serial0:115200n8";
        };
 
        memory {
@@ -137,10 +137,14 @@
        };
 
        sdhi0_pins: sd0 {
-               renesas,groups = "sdhi0_data4", "sdhi0_ctrl",
-                                 "sdhi0_cd";
+               renesas,groups = "sdhi0_data4", "sdhi0_ctrl";
                renesas,function = "sdhi0";
        };
+       sdhi0_pup_pins: sd0_pup {
+               renesas,groups = "sdhi0_cd", "sdhi0_wp";
+               renesas,function = "sdhi0";
+               bias-pull-up;
+       };
 
        hspi0_pins: hspi0 {
                renesas,groups = "hspi0_a";
@@ -168,8 +172,13 @@
        };
 };
 
+&rcar_sound {
+       /* Single DAI */
+       #sound-dai-cells = <0>;
+};
+
 &sdhi0 {
-       pinctrl-0 = <&sdhi0_pins>;
+       pinctrl-0 = <&sdhi0_pins>, <&sdhi0_pup_pins>;
        pinctrl-names = "default";
 
        vmmc-supply = <&fixedregulator3v3>;
@@ -184,16 +193,20 @@
        status = "okay";
 
        flash: flash@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
                compatible = "spansion,s25fl008k", "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <104000000>;
                m25p,fast-read;
 
-               partition@0 {
-                       label = "data(spi)";
-                       reg = <0x00000000 0x00100000>;
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "data(spi)";
+                               reg = <0x00000000 0x00100000>;
+                       };
                };
        };
 };