Merge tag 'mips-fixes-for-2019.07' of https://gitlab.denx.de/u-boot/custodians/u...

[oweals/u-boot.git] / arch / sandbox / dts / sandbox.dts

diff --git a/arch/sandbox/dts/sandbox.dts b/arch/sandbox/dts/sandbox.dts
index 9f444c96a9ecead08d1745d2e82089e19eea3498..a41b5f052d7b47a7e845cfc421305c399f6d5f68 100644 (file)
--- a/arch/sandbox/dts/sandbox.dts
+++ b/arch/sandbox/dts/sandbox.dts
@@ -11,37 +11,45 @@
                i2c0 = &i2c_0;
                pci0 = &pci;
                rtc0 = &rtc_0;
+               axi0 = &axi;
        };
 
        chosen {
                stdout-path = "/serial";
        };
 
-       cros_ec: cros-ec@0 {
+       audio: audio-codec {
+               compatible = "sandbox,audio-codec";
+               #sound-dai-cells = <1>;
+       };
+
+       cros_ec: cros-ec {
                reg = <0 0>;
+               u-boot,dm-pre-reloc;
                compatible = "google,cros-ec-sandbox";
 
                /*
                 * This describes the flash memory within the EC. Note
                 * that the STM32L flash erases to 0, not 0xff.
                 */
-               #address-cells = <1>;
-               #size-cells = <1>;
-               flash@8000000 {
-                       reg = <0x08000000 0x20000>;
+               flash {
+                       u-boot,dm-pre-reloc;
+                       image-pos = <0x08000000>;
+                       size = <0x20000>;
                        erase-value = <0>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
 
                        /* Information for sandbox */
                        ro {
-                               reg = <0 0xf000>;
+                               image-pos = <0>;
+                               size = <0xf000>;
                        };
                        wp-ro {
-                               reg = <0xf000 0x1000>;
+                               image-pos = <0xf000>;
+                               size = <0x1000>;
                        };
                        rw {
-                               reg = <0x10000 0x10000>;
+                               image-pos = <0x10000>;
+                               size = <0x10000>;
                        };
                };
        };
@@ -58,6 +66,7 @@
        };
 
        gpio_a: gpios@0 {
+               u-boot,dm-pre-reloc;
                gpio-controller;
                compatible = "sandbox,gpio";
                #gpio-cells = <1>;
@@ -66,6 +75,7 @@
        };
 
        gpio_b: gpios@1 {
+               u-boot,dm-pre-reloc;
                gpio-controller;
                compatible = "sandbox,gpio";
                #gpio-cells = <2>;
@@ -90,19 +100,13 @@
                eeprom@2c {
                        reg = <0x2c>;
                        compatible = "i2c-eeprom";
-                       emul {
-                               compatible = "sandbox,i2c-eeprom";
-                               sandbox,filename = "i2c.bin";
-                               sandbox,size = <128>;
-                       };
+                       sandbox,emul = <&emul_eeprom>;
                };
 
                rtc_0: rtc@43 {
                        reg = <0x43>;
                        compatible = "sandbox-rtc";
-                       emul {
-                               compatible = "sandbox,i2c-rtc";
-                       };
+                       sandbox,emul = <&emul0>;
                };
                sandbox_pmic: sandbox_pmic {
                        reg = <0x40>;
@@ -111,6 +115,24 @@
                mc34708: pmic@41 {
                        reg = <0x41>;
                };
+
+               i2c_emul: emul {
+                       reg = <0xff>;
+                       compatible = "sandbox,i2c-emul-parent";
+                       emul_eeprom: emul-eeprom {
+                               compatible = "sandbox,i2c-eeprom";
+                               sandbox,filename = "i2c.bin";
+                               sandbox,size = <256>;
+                       };
+                       emul0: emul0 {
+                               compatible = "sandbox,i2c-rtc";
+                       };
+               };
+       };
+
+       i2s: i2s {
+               compatible = "sandbox,i2s";
+               #sound-dai-cells = <1>;
        };
 
        lcd {
@@ -152,6 +174,7 @@
 
        pinctrl {
                compatible = "sandbox,pinctrl";
+               status = "okay";
 
                pinctrl_i2c0: i2c0 {
                        groups = "i2c";
@@ -163,19 +186,38 @@
                        groups = "serial_a";
                        function = "serial";
                };
+
+               pinctrl_onewire0: onewire0 {
+                       groups = "w1";
+                       function = "w1";
+                       bias-pull-up;
+               };
        };
 
        reset@1 {
                compatible = "sandbox,reset";
        };
 
+       sound {
+               compatible = "sandbox,sound";
+               cpu {
+                       sound-dai = <&i2s 0>;
+               };
+
+               codec {
+                       sound-dai = <&audio 0>;
+               };
+       };
+
        spi@0 {
+               u-boot,dm-pre-reloc;
                #address-cells = <1>;
                #size-cells = <0>;
                reg = <0 0>;
                compatible = "sandbox,spi";
                cs-gpios = <0>, <&gpio_a 0>;
                firmware_storage_spi: flash@0 {
+                       u-boot,dm-pre-reloc;
                        reg = <0>;
                        compatible = "spansion,m25p16", "sandbox,spi-flash";
                        spi-max-frequency = <40000000>;
@@ -231,6 +273,7 @@
        };
 
        tpm {
+               u-boot,dm-pre-reloc;
                compatible = "google,sandbox-tpm";
        };
 
@@ -248,6 +291,7 @@
 
        /* Needs to be available prior to relocation */
        uart0: serial {
+               u-boot,dm-spl;
                compatible = "sandbox,serial";
                sandbox,text-colour = "cyan";
                pinctrl-names = "default";
@@ -311,7 +355,41 @@
                        };
                };
        };
+
+       axi: axi@0 {
+               compatible = "sandbox,axi";
+               #address-cells = <0x1>;
+               #size-cells = <0x1>;
+               store@0 {
+                       compatible = "sandbox,sandbox_store";
+                       reg = <0x0 0x400>;
+               };
+       };
+
+       onewire0: onewire {
+               compatible = "w1-gpio";
+               gpios = <&gpio_a 8>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_onewire0>;
+               status = "okay";
+
+               sandbox_eeprom0: sandbox_eeprom@0 {
+                       compatible = "sandbox,w1-eeprom";
+                       status = "okay";
+               };
+       };
+
+       sandbox_tee {
+               compatible = "sandbox,tee";
+       };
 };
 
 #include "cros-ec-keyboard.dtsi"
 #include "sandbox_pmic.dtsi"
+
+&cros_ec {
+       u-boot,dm-pre-reloc;
+       keyboard-controller {
+               u-boot,dm-pre-reloc;
+       };
+};