[U-Boot] [PATCH 1/2] ARM: uniphier: enable Cadence eMMC controller for LD11/LD20

Enable SDMA (Single Operation DMA) for LD11, but not for LD20. The SDMA does not work for LD20 boards because they are generally equipped with more memory than fits in the 32 bit physical address space supported by the SDMA.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
configs/uniphier_ld11_defconfig | 4 +++- configs/uniphier_ld20_defconfig | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/configs/uniphier_ld11_defconfig b/configs/uniphier_ld11_defconfig index e939124..9c77b10 100644 --- a/configs/uniphier_ld11_defconfig +++ b/configs/uniphier_ld11_defconfig @@ -4,7 +4,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_ARCH_UNIPHIER_LD11=y CONFIG_MICRO_SUPPORT_CARD=y -# CONFIG_MMC is not set CONFIG_SYS_TEXT_BASE=0x84000000 CONFIG_DEFAULT_DEVICE_TREE="uniphier-ld11-ref" # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set @@ -28,6 +27,9 @@ CONFIG_SPL_OF_TRANSLATE=y CONFIG_GPIO_UNIPHIER=y CONFIG_MISC=y CONFIG_I2C_EEPROM=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y +CONFIG_MMC_SDHCI_CADENCE=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y diff --git a/configs/uniphier_ld20_defconfig b/configs/uniphier_ld20_defconfig index 449093a..190ebd5 100644 --- a/configs/uniphier_ld20_defconfig +++ b/configs/uniphier_ld20_defconfig @@ -28,6 +28,8 @@ CONFIG_GPIO_UNIPHIER=y CONFIG_MISC=y CONFIG_I2C_EEPROM=y CONFIG_MMC_UNIPHIER=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_CADENCE=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_STORAGE=y

The "cdns,sd4hc" is a fallback of the IP. Add the SoC-specific compatible string.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
arch/arm/dts/uniphier-ld11.dtsi | 3 +-- arch/arm/dts/uniphier-ld20.dtsi | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/arm/dts/uniphier-ld11.dtsi b/arch/arm/dts/uniphier-ld11.dtsi index eef4dce..38dc1ec 100644 --- a/arch/arm/dts/uniphier-ld11.dtsi +++ b/arch/arm/dts/uniphier-ld11.dtsi @@ -270,7 +270,7 @@ };
emmc: sdhc@5a000000 { - compatible = "cdns,sd4hc"; + compatible = "socionext,uniphier-sd4hc", "cdns,sd4hc"; reg = <0x5a000000 0x400>; interrupts = <0 78 4>; pinctrl-names = "default"; @@ -279,7 +279,6 @@ bus-width = <8>; mmc-ddr-1_8v; mmc-hs200-1_8v; - /* mmc-hs400-1_8v; support depends on board design */ };
usb0: usb@5a800100 { diff --git a/arch/arm/dts/uniphier-ld20.dtsi b/arch/arm/dts/uniphier-ld20.dtsi index 1b41945..7176757 100644 --- a/arch/arm/dts/uniphier-ld20.dtsi +++ b/arch/arm/dts/uniphier-ld20.dtsi @@ -344,7 +344,7 @@ };
emmc: sdhc@5a000000 { - compatible = "cdns,sd4hc"; + compatible = "socionext,uniphier-sd4hc", "cdns,sd4hc"; reg = <0x5a000000 0x400>; interrupts = <0 78 4>; pinctrl-names = "default"; @@ -353,7 +353,6 @@ bus-width = <8>; mmc-ddr-1_8v; mmc-hs200-1_8v; - /* mmc-hs400-1_8v; support depends on board design */ };
sd: sdhc@5a400000 {

2017-01-04 20:08 GMT+09:00 Masahiro Yamada yamada.masahiro@socionext.com:
The "cdns,sd4hc" is a fallback of the IP. Add the SoC-specific compatible string.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
Applied to u-boot-uniphier/master.

2017-01-04 20:08 GMT+09:00 Masahiro Yamada yamada.masahiro@socionext.com:
Enable SDMA (Single Operation DMA) for LD11, but not for LD20. The SDMA does not work for LD20 boards because they are generally equipped with more memory than fits in the 32 bit physical address space supported by the SDMA.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
Applied to u-boot-uniphier/master.
participants (1)
-
Masahiro Yamada