ARM: dts: UniPhier: re-license device tree files under GPLv2+/X11

[oweals/u-boot.git] / arch / arm / dts / exynos5800-peach-pi.dts

diff --git a/arch/arm/dts/exynos5800-peach-pi.dts b/arch/arm/dts/exynos5800-peach-pi.dts
index 8aedf8e7077fff920005517ae6553bdd6c21a2c8..176ce552ad974046702dcd660e2da754ab43f400 100644 (file)
--- a/arch/arm/dts/exynos5800-peach-pi.dts
+++ b/arch/arm/dts/exynos5800-peach-pi.dts
@@ -17,7 +17,7 @@
                "google,peach", "samsung,exynos5800", "samsung,exynos5";
 
        config {
-               google,bad-wake-gpios = <&gpio 0x56 0>; /* gpx0-6 */
+               google,bad-wake-gpios = <&gpx0 6 GPIO_ACTIVE_HIGH>;
                hwid = "PIT TEST A-A 7848";
                lazy-init = <1>;
        };
@@ -32,7 +32,7 @@
                mem-manuf = "samsung";
                mem-type = "ddr3";
                clock-frequency = <800000000>;
-               arm-frequency = <1700000000>;
+               arm-frequency = <900000000>;
        };
 
        tmu@10060000 {
@@ -63,11 +63,6 @@
                      reg = <0x20>;
                      compatible = "maxim,max98090-codec";
               };
-
-               edp-lvds-bridge@48 {
-                       compatible = "parade,ps8625";
-                       reg = <0x48>;
-               };
        };
 
         sound@3830000 {
@@ -77,7 +72,7 @@
        i2c@12e10000 { /* i2c9 */
                clock-frequency = <400000>;
                 tpm@20 {
-                        compatible = "infineon,slb9645-tpm";
+                        compatible = "infineon,slb9645tt";
                         reg = <0x20>;
                };
        };
@@ -101,13 +96,12 @@
        spi@12d40000 { /* spi2 */
                spi-max-frequency = <4000000>;
                spi-deactivate-delay = <200>;
-               cros-ec@0 {
+               cros_ec: cros-ec@0 {
+                       compatible = "google,cros-ec-spi";
                        reg = <0>;
-                       compatible = "google,cros-ec";
                        spi-half-duplex;
                        spi-max-timeout-ms = <1100>;
-                       spi-frame-header = <0xec>;
-                       ec-interrupt = <&gpio 93 1>; /* GPX1_5 */
+                       ec-interrupt = <&gpx1 5 GPIO_ACTIVE_LOW>;
 
                        /*
                         * This describes the flash memory within the EC. Note
@@ -123,11 +117,11 @@
        };
 
        xhci@12000000 {
-               samsung,vbus-gpio = <&gpio 0x40 0>; /* H00 */
+               samsung,vbus-gpio = <&gph0 0 GPIO_ACTIVE_HIGH>;
        };
 
        xhci@12400000 {
-               samsung,vbus-gpio = <&gpio 0x41 0>; /* H01 */
+               samsung,vbus-gpio = <&gph0 1 GPIO_ACTIVE_HIGH>;
        };
 
        fimd@14400000 {
@@ -149,9 +143,14 @@
                samsung,vl-vfpd = <10>;
                samsung,vl-cmd-allow-len = <0xf>;
 
+               samsung,power-on-delay = <30000>;
                samsung,winid = <3>;
                samsung,interface-mode = <1>;
                samsung,dp-enabled = <1>;
                samsung,dual-lcd-enabled = <0>;
+
+               samsung,bl-en-gpio = <&gpx2 2 GPIO_ACTIVE_HIGH>;
        };
 };
+
+#include "cros-ec-keyboard.dtsi"