rockchip: spl: Add SPI NOR flash to boot_devices array

Add missing boot source id <-> device tree node path mapping for SPI NOR
flash on PX30, RK3288, RK3308, RK3368 and RV1126.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Dragan Simic <dsimic@manjaro.org>

diff --git a/arch/arm/mach-rockchip/px30/px30.c b/arch/arm/mach-rockchip/px30/px30.c
index b4f655fa4b3e85a7c44ccfdc557fffb246a3a4f0..2ec3289d75b7d012088c185cca037b88b5073e41 100644 (file)
--- a/arch/arm/mach-rockchip/px30/px30.c
+++ b/arch/arm/mach-rockchip/px30/px30.c
@@ -19,6 +19,7 @@
 
 const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
        [BROM_BOOTSOURCE_EMMC] = "/mmc@ff390000",
+       [BROM_BOOTSOURCE_SPINOR] = "/spi@ff3a0000/flash@0",
        [BROM_BOOTSOURCE_SD] = "/mmc@ff370000",
 };
 

diff --git a/arch/arm/mach-rockchip/rk3288/rk3288.c b/arch/arm/mach-rockchip/rk3288/rk3288.c
index c77c56c1dab52a1c83afd1cf1a17caa8b12eff60..70cf500291214ab96c3e5cc97e46b0799f1aa67d 100644 (file)
--- a/arch/arm/mach-rockchip/rk3288/rk3288.c
+++ b/arch/arm/mach-rockchip/rk3288/rk3288.c
@@ -28,6 +28,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
        [BROM_BOOTSOURCE_EMMC] = "/mmc@ff0f0000",
+       [BROM_BOOTSOURCE_SPINOR] = "/spi@ff130000/flash@0",
        [BROM_BOOTSOURCE_SD] = "/mmc@ff0c0000",
 };
 

diff --git a/arch/arm/mach-rockchip/rk3308/rk3308.c b/arch/arm/mach-rockchip/rk3308/rk3308.c
index 27a748327e3125e92a4b95bc7d287377bbc0e600..b3ffabc5449a506fbba332f851466af5c5a2810a 100644 (file)
--- a/arch/arm/mach-rockchip/rk3308/rk3308.c
+++ b/arch/arm/mach-rockchip/rk3308/rk3308.c
@@ -141,6 +141,7 @@ enum {
 
 const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
        [BROM_BOOTSOURCE_EMMC] = "/mmc@ff490000",
+       [BROM_BOOTSOURCE_SPINOR] = "/spi@ff4c0000/flash@0",
        [BROM_BOOTSOURCE_SD] = "/mmc@ff480000",
 };
 

diff --git a/arch/arm/mach-rockchip/rk3368/rk3368.c b/arch/arm/mach-rockchip/rk3368/rk3368.c
index 651ba1090206b437c4e844149a4d57e55152572c..8f5ca1dfa7c9c39099c171ed20bb412c202ba4d3 100644 (file)
--- a/arch/arm/mach-rockchip/rk3368/rk3368.c
+++ b/arch/arm/mach-rockchip/rk3368/rk3368.c
@@ -55,6 +55,7 @@ struct mm_region *mem_map = rk3368_mem_map;
 
 const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
        [BROM_BOOTSOURCE_EMMC] = "/mmc@ff0f0000",
+       [BROM_BOOTSOURCE_SPINOR] = "/spi@ff120000/flash@0",
        [BROM_BOOTSOURCE_SD] = "/mmc@ff0c0000",
 };
 

diff --git a/arch/arm/mach-rockchip/rv1126/rv1126.c b/arch/arm/mach-rockchip/rv1126/rv1126.c
index 8589c46f10aa36799d52c4d5bf61d909d1bf2bbe..40eb9eb7b1967e169a61b306a0f8241628c0bc39 100644 (file)
--- a/arch/arm/mach-rockchip/rv1126/rv1126.c
+++ b/arch/arm/mach-rockchip/rv1126/rv1126.c
@@ -15,6 +15,7 @@
 
 const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
        [BROM_BOOTSOURCE_EMMC] = "/mmc@ffc50000",
+       [BROM_BOOTSOURCE_SPINOR] = "/spi@ffc90000/flash@0",
        [BROM_BOOTSOURCE_SD] = "/mmc@ffc60000",
 };