ARM: rmobile: Enable RPC on Salvator-X, ULCB, Ebisu

Enable the RPC Hyperflash driver on R8A7795,R8A7796,R8A77965
Salvator-X,ULCB and R8A77990 Ebisu. Note that to make the HF
accessible, mainline ATF is mandatory and must be built with
RCAR_RPC_HYPERFLASH_LOCKED=0 . Note that this is intended for
development and testing convenience only and must be disabled
in deployment for platform security reasons.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>

diff --git a/arch/arm/dts/r8a77950-salvator-x-u-boot.dts b/arch/arm/dts/r8a77950-salvator-x-u-boot.dts
index e039e33d5944d90cd65aec4b83eaf93be4ac538e..36c8a44a902810498eb62dde23eb887ad0c09bd4 100644 (file)
--- a/arch/arm/dts/r8a77950-salvator-x-u-boot.dts
+++ b/arch/arm/dts/r8a77950-salvator-x-u-boot.dts
@@ -8,6 +8,11 @@
 #include "r8a77950-salvator-x.dts"
 #include "r8a77950-u-boot.dtsi"
 
+&rpc {
+       reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>;
+       status = "okay";
+};
+
 &sdhi0 {
        sd-uhs-sdr12;
        sd-uhs-sdr25;

diff --git a/arch/arm/dts/r8a77950-ulcb-u-boot.dts b/arch/arm/dts/r8a77950-ulcb-u-boot.dts
index b7f26c11b1574299b50fccf5b7a72c22c44cd469..d3191c55d57683273c255d1c64a0f3c3caa3a27a 100644 (file)
--- a/arch/arm/dts/r8a77950-ulcb-u-boot.dts
+++ b/arch/arm/dts/r8a77950-ulcb-u-boot.dts
@@ -19,6 +19,11 @@
        };
 };
 
+&rpc {
+       reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>;
+       status = "okay";
+};
+
 &sdhi0 {
        sd-uhs-sdr12;
        sd-uhs-sdr25;

diff --git a/arch/arm/dts/r8a77960-salvator-x-u-boot.dts b/arch/arm/dts/r8a77960-salvator-x-u-boot.dts
index d3b09246f597dbd19b024b2ee0f3c5a133c51899..439fd6c3ada59b970285adc16dcd10aa743899ff 100644 (file)
--- a/arch/arm/dts/r8a77960-salvator-x-u-boot.dts
+++ b/arch/arm/dts/r8a77960-salvator-x-u-boot.dts
@@ -8,6 +8,11 @@
 #include "r8a77960-salvator-x.dts"
 #include "r8a77960-u-boot.dtsi"
 
+&rpc {
+       reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>;
+       status = "okay";
+};
+
 &sdhi0 {
        sd-uhs-sdr12;
        sd-uhs-sdr25;

diff --git a/arch/arm/dts/r8a77960-ulcb-u-boot.dts b/arch/arm/dts/r8a77960-ulcb-u-boot.dts
index bd1d634574884a32c199c4c400df3853983ae814..aab9c95931f840e6b62773cb73ec19a47f424df1 100644 (file)
--- a/arch/arm/dts/r8a77960-ulcb-u-boot.dts
+++ b/arch/arm/dts/r8a77960-ulcb-u-boot.dts
@@ -19,6 +19,11 @@
        };
 };
 
+&rpc {
+       reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>;
+       status = "okay";
+};
+
 &sdhi0 {
        sd-uhs-sdr12;
        sd-uhs-sdr25;

diff --git a/arch/arm/dts/r8a77965-salvator-x-u-boot.dts b/arch/arm/dts/r8a77965-salvator-x-u-boot.dts
index d6f0708555419a8e53781bc81c949480a8030bf4..8cbef83b9c450359602b71a2062cc08cea81280e 100644 (file)
--- a/arch/arm/dts/r8a77965-salvator-x-u-boot.dts
+++ b/arch/arm/dts/r8a77965-salvator-x-u-boot.dts
@@ -8,6 +8,11 @@
 #include "r8a77965-salvator-x.dts"
 #include "r8a77965-u-boot.dtsi"
 
+&rpc {
+       reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>;
+       status = "okay";
+};
+
 &sdhi0 {
        sd-uhs-sdr12;
        sd-uhs-sdr25;

diff --git a/arch/arm/dts/r8a77965-ulcb-u-boot.dts b/arch/arm/dts/r8a77965-ulcb-u-boot.dts
index 954d8b685c36b6c8e80ec48111bc38940267ee20..38966bf644eca2fdbd29561711d43dd21f9a91bb 100644 (file)
--- a/arch/arm/dts/r8a77965-ulcb-u-boot.dts
+++ b/arch/arm/dts/r8a77965-ulcb-u-boot.dts
@@ -19,6 +19,11 @@
        };
 };
 
+&rpc {
+       reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>;
+       status = "okay";
+};
+
 &sdhi0 {
        sd-uhs-sdr12;
        sd-uhs-sdr25;

diff --git a/arch/arm/dts/r8a77990-ebisu-u-boot.dts b/arch/arm/dts/r8a77990-ebisu-u-boot.dts
index 0ea0cc9cb1cbce2c2cdda8a130e213716209f191..6afc0be66e937e8fd1e70a9623056daf59b52c29 100644 (file)
--- a/arch/arm/dts/r8a77990-ebisu-u-boot.dts
+++ b/arch/arm/dts/r8a77990-ebisu-u-boot.dts
@@ -18,6 +18,11 @@
        };
 };
 
+&rpc {
+       reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>;
+       status = "okay";
+};
+
 &sdhi0 {
        sd-uhs-sdr12;
        sd-uhs-sdr25;

diff --git a/arch/arm/dts/r8a77995-draak-u-boot.dts b/arch/arm/dts/r8a77995-draak-u-boot.dts
index 2f53970809e785c8bb9c51f9d93a5a3864e19799..10fb9cb3b67561ed99035ec9d0143cd2faf920cc 100644 (file)
--- a/arch/arm/dts/r8a77995-draak-u-boot.dts
+++ b/arch/arm/dts/r8a77995-draak-u-boot.dts
@@ -7,3 +7,8 @@
 
 #include "r8a77995-draak.dts"
 #include "r8a77995-u-boot.dtsi"
+
+&rpc {
+       reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>;
+       status = "okay";
+};

diff --git a/configs/r8a77990_ebisu_defconfig b/configs/r8a77990_ebisu_defconfig
index efdb8e6eb7e2d9752937b6d206eb7ee828719120..f94d4256f4430b6237fe3ee3d8b97bd8a6852220 100644 (file)
--- a/configs/r8a77990_ebisu_defconfig
+++ b/configs/r8a77990_ebisu_defconfig
@@ -49,6 +49,11 @@ CONFIG_MMC_IO_VOLTAGE=y
 CONFIG_MMC_UHS_SUPPORT=y
 CONFIG_MMC_HS400_SUPPORT=y
 CONFIG_RENESAS_SDHI=y
+CONFIG_MTD=y
+CONFIG_DM_MTD=y
+CONFIG_MTD_NOR_FLASH=y
+CONFIG_CFI_FLASH=y
+CONFIG_RENESAS_RPC_HF=y
 CONFIG_BITBANGMII=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y

diff --git a/configs/rcar3_salvator-x_defconfig b/configs/rcar3_salvator-x_defconfig
index 0fbd1e0c82677b233481c99c37bee9c3774ffe4e..4537b52c207ae9263d6b61b6ce49954dbc7016af 100644 (file)
--- a/configs/rcar3_salvator-x_defconfig
+++ b/configs/rcar3_salvator-x_defconfig
@@ -52,6 +52,11 @@ CONFIG_MMC_IO_VOLTAGE=y
 CONFIG_MMC_UHS_SUPPORT=y
 CONFIG_MMC_HS400_SUPPORT=y
 CONFIG_RENESAS_SDHI=y
+CONFIG_MTD=y
+CONFIG_DM_MTD=y
+CONFIG_MTD_NOR_FLASH=y
+CONFIG_CFI_FLASH=y
+CONFIG_RENESAS_RPC_HF=y
 CONFIG_BITBANGMII=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y

diff --git a/configs/rcar3_ulcb_defconfig b/configs/rcar3_ulcb_defconfig
index 710b2f4a4aa4972aa719dcedfcc44950ec8c093b..b90b9e12b38516f6e97921b134e1135692d8b07f 100644 (file)
--- a/configs/rcar3_ulcb_defconfig
+++ b/configs/rcar3_ulcb_defconfig
@@ -52,6 +52,11 @@ CONFIG_MMC_IO_VOLTAGE=y
 CONFIG_MMC_UHS_SUPPORT=y
 CONFIG_MMC_HS400_SUPPORT=y
 CONFIG_RENESAS_SDHI=y
+CONFIG_MTD=y
+CONFIG_DM_MTD=y
+CONFIG_MTD_NOR_FLASH=y
+CONFIG_CFI_FLASH=y
+CONFIG_RENESAS_RPC_HF=y
 CONFIG_BITBANGMII=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y

diff --git a/include/configs/ebisu.h b/include/configs/ebisu.h
index 06cbb03dc6ae628b48a2fe166bafd6eac08cf7d6..ee9ddb13362c996765c7aa1314233e7950377912 100644 (file)
--- a/include/configs/ebisu.h
+++ b/include/configs/ebisu.h
@@ -22,4 +22,16 @@
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
+#define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS
+#define CONFIG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_MTD
+#define CONFIG_FLASH_SHOW_PROGRESS     45
+#define CONFIG_SYS_FLASH_QUIET_TEST
+#define CONFIG_SYS_FLASH_BANKS_LIST    { 0x08000000 }
+#define CONFIG_SYS_FLASH_CFI
+#define CONFIG_SYS_FLASH_CFI_WIDTH     FLASH_CFI_16BIT
+#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT      1
+#define CONFIG_SYS_MAX_FLASH_SECT      256
+#define CONFIG_SYS_WRITE_SWAPPED_DATA
+
 #endif /* __EBISU_H */

diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h
index 240df9c63b9939e9b46606c93be63c58e07a0d45..db06fa5ffd6bd3820c78ab3c2a5d395146261a68 100644 (file)
--- a/include/configs/salvator-x.h
+++ b/include/configs/salvator-x.h
@@ -19,4 +19,16 @@
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
+#define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS
+#define CONFIG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_MTD
+#define CONFIG_FLASH_SHOW_PROGRESS     45
+#define CONFIG_SYS_FLASH_QUIET_TEST
+#define CONFIG_SYS_FLASH_BANKS_LIST    { 0x08000000 }
+#define CONFIG_SYS_FLASH_CFI
+#define CONFIG_SYS_FLASH_CFI_WIDTH     FLASH_CFI_16BIT
+#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT      1
+#define CONFIG_SYS_MAX_FLASH_SECT      256
+#define CONFIG_SYS_WRITE_SWAPPED_DATA
+
 #endif /* __SALVATOR_X_H */

diff --git a/include/configs/ulcb.h b/include/configs/ulcb.h
index 15fb62722874c95a5723ce950f3ee8d9e8c45736..165c82d508e4f6fdd9f6aa4e5a19fec5e578dfde 100644 (file)
--- a/include/configs/ulcb.h
+++ b/include/configs/ulcb.h
@@ -19,4 +19,16 @@
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
+#define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS
+#define CONFIG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_MTD
+#define CONFIG_FLASH_SHOW_PROGRESS     45
+#define CONFIG_SYS_FLASH_QUIET_TEST
+#define CONFIG_SYS_FLASH_BANKS_LIST    { 0x08000000 }
+#define CONFIG_SYS_FLASH_CFI
+#define CONFIG_SYS_FLASH_CFI_WIDTH     FLASH_CFI_16BIT
+#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT      1
+#define CONFIG_SYS_MAX_FLASH_SECT      256
+#define CONFIG_SYS_WRITE_SWAPPED_DATA
+
 #endif /* __ULCB_H */