sandbox64: add support for NVMXIP QSPI

enable NVMXIP QSPI for sandbox 64-bit

Adding two NVM XIP QSPI storage devices.

Signed-off-by: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/sandbox/dts/sandbox64.dts b/arch/sandbox/dts/sandbox64.dts
index f21fc18..1953655 100644 (file)
--- a/arch/sandbox/dts/sandbox64.dts
+++ b/arch/sandbox/dts/sandbox64.dts
@@ -89,6 +89,19 @@
                cs-gpios = <0>, <&gpio_a 0>;
        };
 
+       nvmxip-qspi1@08000000 {
+               compatible = "nvmxip,qspi";
+               reg = /bits/ 64 <0x08000000 0x00200000>;
+               lba_shift = <9>;
+               lba = <4096>;
+       };
+
+       nvmxip-qspi2@08200000 {
+               compatible = "nvmxip,qspi";
+               reg = /bits/ 64 <0x08200000 0x00100000>;
+               lba_shift = <9>;
+               lba = <2048>;
+       };
 };
 
 #include "sandbox.dtsi"

diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts
index 7c1ee71..bcdea0b 100644 (file)
--- a/arch/sandbox/dts/test.dts
+++ b/arch/sandbox/dts/test.dts
@@ -1802,6 +1802,20 @@
                compatible = "u-boot,fwu-mdata-gpt";
                fwu-mdata-store = <&mmc0>;
        };
+
+       nvmxip-qspi1@08000000 {
+               compatible = "nvmxip,qspi";
+               reg = <0x08000000 0x00200000>;
+               lba_shift = <9>;
+               lba = <4096>;
+       };
+
+       nvmxip-qspi2@08200000 {
+               compatible = "nvmxip,qspi";
+               reg = <0x08200000 0x00100000>;
+               lba_shift = <9>;
+               lba = <2048>;
+       };
 };
 
 #include "sandbox_pmic.dtsi"

diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig
index af2c56a..bb877b6 100644 (file)
--- a/configs/sandbox64_defconfig
+++ b/configs/sandbox64_defconfig
@@ -260,3 +260,4 @@ CONFIG_FWU_MULTI_BANK_UPDATE=y
 CONFIG_UNIT_TEST=y
 CONFIG_UT_TIME=y
 CONFIG_UT_DM=y
+CONFIG_NVMXIP_QSPI=y

diff --git a/doc/develop/driver-model/nvmxip.rst b/doc/develop/driver-model/nvmxip.rst
index 09afdbc..e85dc22 100644 (file)
--- a/doc/develop/driver-model/nvmxip.rst
+++ b/doc/develop/driver-model/nvmxip.rst
@@ -56,7 +56,7 @@ The implementation is generic and can be used by different platforms.
 Supported hardware
 --------------------------------
 
-Any 64-bit plaform.
+Any plaform supporting readq().
 
 Configuration
 ----------------------

diff --git a/doc/device-tree-bindings/nvmxip/nvmxip_qspi.txt b/doc/device-tree-bindings/nvmxip/nvmxip_qspi.txt
index cc60e9e..882728d 100644 (file)
--- a/doc/device-tree-bindings/nvmxip/nvmxip_qspi.txt
+++ b/doc/device-tree-bindings/nvmxip/nvmxip_qspi.txt
@@ -16,7 +16,7 @@ If a platform has its own driver, please provide your own compatible
 string.
 
 2)
-               reg = <0x0 0x08000000 0x0 0x00200000>;
+               reg = /bits/ 64 <0x08000000 0x00200000>;
 
 The start address and size of the flash device. The values give here are an
 example (when the cell size is 2).
@@ -43,14 +43,14 @@ Example of multiple flash devices
 
        nvmxip-qspi1@08000000 {
                compatible = "nvmxip,qspi";
-               reg = <0x0 0x08000000 0x0 0x00200000>;
+               reg = /bits/ 64 <0x08000000 0x00200000>;
                lba_shift = <9>;
                lba = <4096>;
        };
 
        nvmxip-qspi2@08200000 {
                compatible = "nvmxip,qspi";
-               reg = <0x0 0x08200000 0x0 0x00100000>;
+               reg = /bits/ 64 <0x08200000 0x00100000>;
                lba_shift = <9>;
                lba = <2048>;
        };

diff --git a/drivers/mtd/nvmxip/nvmxip-uclass.c b/drivers/mtd/nvmxip/nvmxip-uclass.c
index 9f96041..6d8eb17 100644 (file)
--- a/drivers/mtd/nvmxip/nvmxip-uclass.c
+++ b/drivers/mtd/nvmxip/nvmxip-uclass.c
@@ -9,6 +9,9 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#if CONFIG_IS_ENABLED(SANDBOX64)
+#include <asm/test.h>
+#endif
 #include <linux/bitops.h>
 #include "nvmxip.h"
 
@@ -36,6 +39,10 @@ static int nvmxip_post_bind(struct udevice *udev)
        char bdev_name[NVMXIP_BLKDEV_NAME_SZ + 1];
        int devnum;
 
+#if CONFIG_IS_ENABLED(SANDBOX64)
+       sandbox_set_enable_memio(true);
+#endif
+
        devnum = uclass_id_count(UCLASS_NVMXIP);
        snprintf(bdev_name, NVMXIP_BLKDEV_NAME_SZ, "blk#%d", devnum);