mirror of
https://git.yoctoproject.org/meta-arm
synced 2026-07-16 03:47:19 +00:00
arm-bsp/u-boot: add SDCard support for corstone1000 FVP
This change is to add SDCard support for corstone1000 FVP Signed-off-by: Vishnu Banavath <vishnu.banavath@arm.com>
This commit is contained in:
Vishnu Banavath
+166
@@ -0,0 +1,166 @@
|
|||||||
|
Upstream-Status: Pending [Not submitted to upstream yet]
|
||||||
|
Signed-off-by: Vishnu Banavath <vishnu.banavath@arm.com>
|
||||||
|
|
||||||
|
From fb675d2367b012161711f74f39c498379435d537 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Vishnu Banavath <vishnu.banavath@arm.com>
|
||||||
|
Date: Thu, 31 Mar 2022 14:59:12 +0100
|
||||||
|
Subject: [PATCH] plat/corstone1000: add support for SDCard
|
||||||
|
|
||||||
|
These changes are to add SDCard support for corstone1000 FVP.
|
||||||
|
|
||||||
|
Signed-off-by: Vishnu Banavath <vishnu.banavath@arm.com>
|
||||||
|
|
||||||
|
diff --git a/arch/arm/dts/corstone1000-fvp.dts b/arch/arm/dts/corstone1000-fvp.dts
|
||||||
|
index 92da15df4e..fc2fabd1cd 100644
|
||||||
|
--- a/arch/arm/dts/corstone1000-fvp.dts
|
||||||
|
+++ b/arch/arm/dts/corstone1000-fvp.dts
|
||||||
|
@@ -21,6 +21,42 @@
|
||||||
|
smsc,irq-push-pull;
|
||||||
|
};
|
||||||
|
|
||||||
|
+ regulators {
|
||||||
|
+ compatible = "simple-bus";
|
||||||
|
+ #address-cells = <1>;
|
||||||
|
+ #size-cells = <0>;
|
||||||
|
+
|
||||||
|
+ corstone1000_fixed_3v3: fixed-regulator-0 {
|
||||||
|
+ compatible = "regulator-fixed";
|
||||||
|
+ regulator-name = "3V3";
|
||||||
|
+ regulator-min-microvolt = <3300000>;
|
||||||
|
+ regulator-max-microvolt = <3300000>;
|
||||||
|
+ regulator-always-on;
|
||||||
|
+ };
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ mmc0: mmci@40300000 {
|
||||||
|
+ compatible = "arm,pl18x", "arm,primecell";
|
||||||
|
+ reg = <0x40300000 0x1000>;
|
||||||
|
+ interrupt-parent = <&gic>;
|
||||||
|
+ interrupts = <GIC_SPI 117 0xf04>;
|
||||||
|
+ max-frequency = <12000000>;
|
||||||
|
+ vmmc-supply = <&corstone1000_fixed_3v3>;
|
||||||
|
+ clocks = <&smbclk>, <&refclk100mhz>;
|
||||||
|
+ clock-names = "smclk", "apb_pclk";
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ mmc1: mmci@50000000 {
|
||||||
|
+ compatible = "arm,pl18x", "arm,primecell";
|
||||||
|
+ reg = <0x50000000 0x10000>;
|
||||||
|
+ interrupt-parent = <&gic>;
|
||||||
|
+ interrupts = <GIC_SPI 115 0xf04>;
|
||||||
|
+ max-frequency = <12000000>;
|
||||||
|
+ vmmc-supply = <&corstone1000_fixed_3v3>;
|
||||||
|
+ clocks = <&smbclk>, <&refclk100mhz>;
|
||||||
|
+ clock-names = "smclk", "apb_pclk";
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
};
|
||||||
|
|
||||||
|
&refclk {
|
||||||
|
diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h
|
||||||
|
index 7609367884..b1846938c7 100644
|
||||||
|
--- a/arch/arm/include/asm/gpio.h
|
||||||
|
+++ b/arch/arm/include/asm/gpio.h
|
||||||
|
@@ -4,7 +4,7 @@
|
||||||
|
!defined(CONFIG_ARCH_ROCKCHIP) && !defined(CONFIG_ARCH_ASPEED) && \
|
||||||
|
!defined(CONFIG_ARCH_U8500) && !defined(CONFIG_CORTINA_PLATFORM) && \
|
||||||
|
!defined(CONFIG_TARGET_BCMNS3) && !defined(CONFIG_TARGET_TOTAL_COMPUTE) && \
|
||||||
|
- !defined(CONFIG_ARCH_QEMU)
|
||||||
|
+ !defined(CONFIG_ARCH_QEMU) && !defined(CONFIG_TARGET_CORSTONE1000)
|
||||||
|
#include <asm/arch/gpio.h>
|
||||||
|
#endif
|
||||||
|
#include <asm-generic/gpio.h>
|
||||||
|
diff --git a/board/armltd/corstone1000/corstone1000.c b/board/armltd/corstone1000/corstone1000.c
|
||||||
|
index 113a8238c7..32e5d3034f 100644
|
||||||
|
--- a/board/armltd/corstone1000/corstone1000.c
|
||||||
|
+++ b/board/armltd/corstone1000/corstone1000.c
|
||||||
|
@@ -46,14 +46,30 @@ static struct mm_region corstone1000_mem_map[] = {
|
||||||
|
.attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
|
||||||
|
PTE_BLOCK_NON_SHARE |
|
||||||
|
PTE_BLOCK_PXN | PTE_BLOCK_UXN
|
||||||
|
- }, {
|
||||||
|
- /* USB */
|
||||||
|
- .virt = 0x40200000UL,
|
||||||
|
- .phys = 0x40200000UL,
|
||||||
|
- .size = 0x00100000UL,
|
||||||
|
- .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
|
||||||
|
- PTE_BLOCK_NON_SHARE |
|
||||||
|
- PTE_BLOCK_PXN | PTE_BLOCK_UXN
|
||||||
|
+ }, {
|
||||||
|
+ /* USB */
|
||||||
|
+ .virt = 0x40200000UL,
|
||||||
|
+ .phys = 0x40200000UL,
|
||||||
|
+ .size = 0x00100000UL,
|
||||||
|
+ .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
|
||||||
|
+ PTE_BLOCK_NON_SHARE |
|
||||||
|
+ PTE_BLOCK_PXN | PTE_BLOCK_UXN
|
||||||
|
+ }, {
|
||||||
|
+ /* MMC0 */
|
||||||
|
+ .virt = 0x40300000UL,
|
||||||
|
+ .phys = 0x40300000UL,
|
||||||
|
+ .size = 0x00100000UL,
|
||||||
|
+ .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
|
||||||
|
+ PTE_BLOCK_NON_SHARE |
|
||||||
|
+ PTE_BLOCK_PXN | PTE_BLOCK_UXN
|
||||||
|
+ }, {
|
||||||
|
+ /* MMC1 */
|
||||||
|
+ .virt = 0x50000000UL,
|
||||||
|
+ .phys = 0x50000000UL,
|
||||||
|
+ .size = 0x00100000UL,
|
||||||
|
+ .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
|
||||||
|
+ PTE_BLOCK_NON_SHARE |
|
||||||
|
+ PTE_BLOCK_PXN | PTE_BLOCK_UXN
|
||||||
|
}, {
|
||||||
|
/* ethernet */
|
||||||
|
.virt = 0x40100000UL,
|
||||||
|
diff --git a/configs/corstone1000_defconfig b/configs/corstone1000_defconfig
|
||||||
|
index 45904ec98d..e72cd30aee 100644
|
||||||
|
--- a/configs/corstone1000_defconfig
|
||||||
|
+++ b/configs/corstone1000_defconfig
|
||||||
|
@@ -38,7 +38,13 @@ CONFIG_CMD_EFIDEBUG=y
|
||||||
|
CONFIG_CMD_FAT=y
|
||||||
|
CONFIG_OF_CONTROL=y
|
||||||
|
CONFIG_REGMAP=y
|
||||||
|
-# CONFIG_MMC is not set
|
||||||
|
+CONFIG_CLK=y
|
||||||
|
+CONFIG_CMD_MMC=y
|
||||||
|
+CONFIG_DM_MMC=y
|
||||||
|
+CONFIG_ARM_PL180_MMCI=y
|
||||||
|
+CONFIG_MMC_SDHCI_ADMA_HELPERS=y
|
||||||
|
+CONFIG_MMC_WRITE=y
|
||||||
|
+CONFIG_DM_GPIO=y
|
||||||
|
CONFIG_DM_ETH=y
|
||||||
|
CONFIG_DM_SERIAL=y
|
||||||
|
CONFIG_USB=y
|
||||||
|
diff --git a/drivers/mmc/arm_pl180_mmci.c b/drivers/mmc/arm_pl180_mmci.c
|
||||||
|
index b2d1b4f9aa..5d1ee64356 100644
|
||||||
|
--- a/drivers/mmc/arm_pl180_mmci.c
|
||||||
|
+++ b/drivers/mmc/arm_pl180_mmci.c
|
||||||
|
@@ -539,7 +539,7 @@ static int arm_pl180_mmc_of_to_plat(struct udevice *dev)
|
||||||
|
|
||||||
|
static const struct udevice_id arm_pl180_mmc_match[] = {
|
||||||
|
{ .compatible = "arm,pl180" },
|
||||||
|
- { .compatible = "arm,primecell" },
|
||||||
|
+ { .compatible = "arm,pl18x" },
|
||||||
|
{ /* sentinel */ }
|
||||||
|
};
|
||||||
|
|
||||||
|
diff --git a/include/configs/corstone1000.h b/include/configs/corstone1000.h
|
||||||
|
index c4a1146b52..114aca2059 100644
|
||||||
|
--- a/include/configs/corstone1000.h
|
||||||
|
+++ b/include/configs/corstone1000.h
|
||||||
|
@@ -99,7 +99,10 @@
|
||||||
|
#define CONFIG_SYS_MAXARGS 64 /* max command args */
|
||||||
|
|
||||||
|
#define BOOT_TARGET_DEVICES(func) \
|
||||||
|
- func(USB, usb, 0)
|
||||||
|
+ func(USB, usb, 0) \
|
||||||
|
+ func(MMC, mmc, 0) \
|
||||||
|
+ func(MMC, mmc, 1)
|
||||||
|
+
|
||||||
|
#include <config_distro_bootcmd.h>
|
||||||
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||||
|
BOOTENV \
|
||||||
|
--
|
||||||
|
2.25.1
|
||||||
|
|
||||||
@@ -64,6 +64,7 @@ SRC_URI:append:corstone1000 = " \
|
|||||||
file://0050-Comment-mm_communicate-failure-log.patch \
|
file://0050-Comment-mm_communicate-failure-log.patch \
|
||||||
file://0051-efi_loader-send-bootcomplete-message-to-secure-encla.patch \
|
file://0051-efi_loader-send-bootcomplete-message-to-secure-encla.patch \
|
||||||
file://0052-efi_loader-fix-null-pointer-exception-with-get_image.patch \
|
file://0052-efi_loader-fix-null-pointer-exception-with-get_image.patch \
|
||||||
|
file://0053-plat-corstone1000-add-support-for-SDCard.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
Reference in New Issue
Block a user