Merge branch 'master' of git://git.denx.de/u-boot-sh

[oweals/u-boot.git] / arch / arm / dts / am437x-idk-evm.dts

diff --git a/arch/arm/dts/am437x-idk-evm.dts b/arch/arm/dts/am437x-idk-evm.dts
index 478f0a62cb1c73cdf3d19c066a99c0e606e36da8..19d1462d15839be3ac8c41b6a5a44d4fed316662 100644 (file)
--- a/arch/arm/dts/am437x-idk-evm.dts
+++ b/arch/arm/dts/am437x-idk-evm.dts
@@ -106,8 +106,6 @@
                compatible = "gpio-keys";
                pinctrl-names = "default";
                pinctrl-0 = <&gpio_keys_pins_default>;
-               #address-cells = <1>;
-               #size-cells = <0>;
 
                switch@0 {
                        label = "power-button";
@@ -341,7 +339,7 @@
 
        spi-max-frequency = <48000000>;
        m25p80@0 {
-               compatible = "mx66l51235l";
+               compatible = "mx66l51235l", "jedec,spi-nor";
                spi-max-frequency = <48000000>;
                reg = <0>;
                spi-cpol;