Merge git://git.denx.de/u-boot-usb

[oweals/u-boot.git] / arch / arm / dts / fsl-ls1046a-qds.dtsi

diff --git a/arch/arm/dts/fsl-ls1046a-qds.dtsi b/arch/arm/dts/fsl-ls1046a-qds.dtsi
index c95f44fc36166b9f847c5919191d842f28dc4a2f..fec5c8ddb23ac2e3968fbcc8081e9a3d60b3f5ab 100644 (file)
--- a/arch/arm/dts/fsl-ls1046a-qds.dtsi
+++ b/arch/arm/dts/fsl-ls1046a-qds.dtsi
@@ -53,14 +53,13 @@
 };
 
 &qspi {
-       bus-num = <0>;
        status = "okay";
 
-       qflash0: s25fl128s@0 {
+       s25fs512s0: flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
-               spi-max-frequency = <20000000>;
+               spi-max-frequency = <50000000>;
                reg = <0>;
        };
 };
@@ -80,3 +79,7 @@
 &sata {
        status = "okay";
 };
+
+&i2c0 {
+       status = "okay";
+};