Merge branch 'patman' of git://git.denx.de/u-boot-x86

[karo-tx-uboot.git] / arch / sandbox / dts / sandbox.dts

diff --git a/arch/sandbox/dts/sandbox.dts b/arch/sandbox/dts/sandbox.dts
index 76147154c22366b7f70e5a95e83c8ea8ee3dfbe1..9ce31bf075832af6d62248a9bc05184969231093 100644 (file)
--- a/arch/sandbox/dts/sandbox.dts
+++ b/arch/sandbox/dts/sandbox.dts
@@ -19,6 +19,7 @@
                colour = "cyan";
                sides = <3>;
                character = <83>;
+               light-gpios = <&gpio_a 2>, <&gpio_b 6 0>;
        };
        square {
                compatible = "demo-shape";
@@ -73,10 +74,8 @@
 
        cros-ec-keyb {
                compatible = "google,cros-ec-keyb";
-               google,key-rows = <8>;
-               google,key-columns = <13>;
-               google,repeat-delay-ms = <240>;
-               google,repeat-rate-ms = <30>;
+               keypad,num-rows = <8>;
+               keypad,num-columns = <13>;
                google,ghost-filter;
                /*
                 * Keymap entries take the form of 0xRRCCKKKK where
@@ -126,7 +125,7 @@
                        0x070b0067 0x070c0069>;
        };
 
-       gpio_a: gpios {
+       gpio_a: gpios@0 {
                gpio-controller;
                compatible = "sandbox,gpio";
                #gpio-cells = <1>;
@@ -134,6 +133,31 @@
                num-gpios = <20>;
        };
 
+       gpio_b: gpios@1 {
+               gpio-controller;
+               compatible = "sandbox,gpio";
+               #gpio-cells = <2>;
+               gpio-bank-name = "b";
+               num-gpios = <10>;
+       };
+
+       i2c@0 {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               reg = <0>;
+               compatible = "sandbox,i2c";
+               clock-frequency = <400000>;
+               eeprom@2c {
+                       reg = <0x2c>;
+                       compatible = "i2c-eeprom";
+                       emul {
+                               compatible = "sandbox,i2c-eeprom";
+                               sandbox,filename = "i2c.bin";
+                               sandbox,size = <128>;
+                       };
+               };
+       };
+
        spi@0 {
                #address-cells = <1>;
                #size-cells = <0>;