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

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

diff --git a/arch/arm/dts/fsl-ls1046a-rdb.dts b/arch/arm/dts/fsl-ls1046a-rdb.dts
index cac65a7afad9fd36ba83a431fd4e94cf21cbb277..464129291c91d43fb86a4a7c8e1e1fe3a193bb06 100644 (file)
--- a/arch/arm/dts/fsl-ls1046a-rdb.dts
+++ b/arch/arm/dts/fsl-ls1046a-rdb.dts
@@ -21,10 +21,9 @@
 };
 
 &qspi {
-       bus-num = <0>;
        status = "okay";
 
-       qflash0: s25fs512s@0 {
+       s25fs512s0: flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
@@ -32,7 +31,7 @@
                reg = <0>;
        };
 
-       qflash1: s25fs512s@1 {
+       s25fs512s1: flash@1 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";