Merge tag 'efi-2020-07-rc2-2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

[oweals/u-boot.git] / arch / arm / dts / exynos5250-snow.dts

diff --git a/arch/arm/dts/exynos5250-snow.dts b/arch/arm/dts/exynos5250-snow.dts
index 653efb4175b29d91252050ad9a18373c5885f22b..e41f2d3041e2f1a40358212a92f66e5a75ec99a2 100644 (file)
--- a/arch/arm/dts/exynos5250-snow.dts
+++ b/arch/arm/dts/exynos5250-snow.dts
@@ -40,21 +40,57 @@
                mmc3 = "/mmc@12230000";
                serial0 = "/serial@12C30000";
                console = "/serial@12C30000";
-               i2s = "/sound@3830000";
        };
 
-       i2c4: i2c@12CA0000 {
-               cros_ec_old: cros-ec@1e {
-                       reg = <0x1e>;
-                       compatible = "google,cros-ec-i2c";
-                       i2c-max-frequency = <100000>;
-                       u-boot,i2c-offset-len = <0>;
-                       ec-interrupt = <&gpx1 6 GPIO_ACTIVE_LOW>;
+        memory {
+               reg = <0x40000000 0x80000000>;
+       };
+
+       chosen {
+               bootargs = "console=tty1";
+               stdout-path = "serial3:115200n8";
+       };
+
+       iram {
+               reg = <0x02020000 0x60000>;
+       };
+
+       config {
+               samsung,bl1-offset = <0x1400>;
+               samsung,bl2-offset = <0x3400>;
+               u-boot-memory = "/memory";
+               u-boot-offset = <0x3e00000 0x100000>;
+       };
+
+       flash {
+               reg = <0 0x100000>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+               pre-boot {
+                       label = "bl1 pre-boot";
+                       reg = <0 0x2000>;
+                       read-only;
+                       filename = "e5250.nbl1.bin";
+                       type = "blob exynos-bl1";
+                       required;
+               };
+
+               spl {
+                       label = "bl2 spl";
+                       reg = <0x2000 0x4000>;
+                       read-only;
+                       filename = "bl2.bin";
+                       type = "blob exynos-bl2 boot,dtb";
+                       payload = "/flash/ro-boot";
+                       required;
                };
 
-               power-regulator@48 {
-                       compatible = "ti,tps65090";
-                       reg = <0x48>;
+               ro-boot {
+                       label = "u-boot";
+                       reg = <0x6000 0xb0000>;
+                       read-only;
+                       type = "blob boot,dtb";
+                       required;
                };
        };
 
@@ -153,14 +189,75 @@
                };
        };
 
+       i2c@12CD0000 {
+               ptn3460: lvds-bridge@20 {
+                       compatible = "nxp,ptn3460";
+                       reg = <0x20>;
+                       sleep-gpios = <&gpy2 5 GPIO_ACTIVE_LOW>;
+                       reset-gpios = <&gpx1 5 GPIO_ACTIVE_LOW>;
+                       hotplug-gpios = <&gpx0 7 GPIO_ACTIVE_HIGH>;
+                       edid-emulation = <5>;
+
+                       ports {
+                               port@0 {
+                                       bridge_out: endpoint {
+                                               remote-endpoint = <&panel_in>;
+                                       };
+                               };
+
+                               port@1 {
+                                       bridge_in: endpoint {
+                                               remote-endpoint = <&dp_out>;
+                                       };
+                               };
+                       };
+               };
+
+               max98095: codec@11 {
+                       compatible = "maxim,max98095";
+                       reg = <0x11>;
+                       #sound-dai-cells = <1>;
+               };
+       };
+
+       i2c@12C90000 {
+               clock-frequency = <100000>;
+               tpm@20 {
+                       reg = <0x20>;
+                       u-boot,i2c-offset-len = <0>;
+                       compatible = "infineon,slb9635tt";
+               };
+       };
+
        spi@12d30000 {
                spi-max-frequency = <50000000>;
                firmware_storage_spi: flash@0 {
-                       compatible = "spi-flash";
+                       compatible = "jedec,spi-nor";
                        reg = <0>;
                };
        };
 
+       backlight: backlight {
+               compatible = "pwm-backlight";
+               pwms = <&pwm 0 1000000 0>;
+               brightness-levels = <0 100 500 1000 1500 2000 2500 2800>;
+               default-brightness-level = <7>;
+               enable-gpios = <&gpx3 0 GPIO_ACTIVE_HIGH>;
+               power-supply = <&fet1>;
+       };
+
+       panel: panel {
+               compatible = "auo,b116xw03";
+               power-supply = <&fet6>;
+               backlight = <&backlight>;
+
+               port {
+                       panel_in: endpoint {
+                               remote-endpoint = <&bridge_out>;
+                       };
+               };
+       };
+
        spi@131b0000 {
                spi-max-frequency = <1000000>;
                spi-deactivate-delay = <100>;
@@ -176,35 +273,26 @@
                };
        };
 
-       sound@3830000 {
-               samsung,codec-type = "max98095";
-               codec-enable-gpio = <&gpx1 7 GPIO_ACTIVE_HIGH>;
-       };
+       sound {
+               compatible = "google,snow-audio-max98095";
 
-       sound@12d60000 {
-               status = "disabled";
-       };
+               samsung,model = "Snow-I2S-MAX98095";
+               samsung,audio-codec = <&max98095>;
+               codec-enable-gpio = <&gpx1 7 GPIO_ACTIVE_HIGH>;
 
-       i2c@12CD0000 {
-               soundcodec@22 {
-                       reg = <0x22>;
-                       compatible = "maxim,max98095-codec";
+               cpu {
+                       sound-dai = <&i2s0 0>;
                };
 
-               ptn3460-bridge@20 {
-                       compatible = "nxp,ptn3460";
-                       reg = <0x20>;
-                       /*
-                        * TODO(sjg@chromium.org): Use GPIOs here
-                        * powerdown-gpio = <&gpy2 5 0>;
-                        * reset-gpio = <&gpx1 5 0>;
-                        * edid-emulation = <5>;
-                        * pinctrl-names = "default";
-                        * pinctrl-0 = <&ptn3460_gpios>;
-                        */
+               codec {
+                       sound-dai = <&max98095 0>;
                };
        };
 
+       sound@12d60000 {
+               status = "disabled";
+       };
+
        i2c@12C60000 {
                max77686@09 {
                        reg = <0x9>;
@@ -295,6 +383,15 @@
                samsung,dynamic-range = <0>;
                samsung,ycbcr-coeff = <0>;
                samsung,color-depth = <1>;
+               samsung,hpd-gpio = <&gpx0 7 GPIO_ACTIVE_HIGH>;
+
+               ports {
+                       port@0 {
+                               dp_out: endpoint {
+                                       remote-endpoint = <&bridge_in>;
+                               };
+                       };
+               };
        };
 
 };