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

diff --combined arch/sandbox/dts/sandbox.dts
index 4c63e4f9ede8fc01636c35389852a15622185a04,68540befa9e0274f89937bff2459e1b4f5bd6d5e..9ce31bf075832af6d62248a9bc05184969231093
--- 1/arch/sandbox/dts/sandbox.dts
--- 2/arch/sandbox/dts/sandbox.dts
+++ b/arch/sandbox/dts/sandbox.dts
@@@ -19,7 -19,6 +19,7 @@@
                colour = "cyan";
                sides = <3>;
                character = <83>;
 +              light-gpios = <&gpio_a 2>, <&gpio_b 6 0>;
        };
        square {
                compatible = "demo-shape";
@@@ -74,10 -73,8 +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
@@@ -127,7 -124,7 +125,7 @@@
                        0x070b0067 0x070c0069>;
        };
  
 -      gpio_a: gpios {
 +      gpio_a: gpios@0 {
                gpio-controller;
                compatible = "sandbox,gpio";
                #gpio-cells = <1>;
@@@ -135,14 -132,6 +133,14 @@@
                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>;