diff options
| author | Tom Rini <trini@konsulko.com> | 2017-01-17 16:39:43 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-01-17 16:39:43 (GMT) |
| commit | bfd07670a48d9fbf22646c93e07dcd8cbc8d0864 (patch) | |
| tree | 3ce5c9c53c29c93bd72adfecfc0085b8a9346ad6 /arch/arm/dts/uniphier-ld20.dtsi | |
| parent | 373ae16c9282cf6dfb39cd6e1b8ad26098635ca2 (diff) | |
| parent | 2cfa35c47b9c9b80c8ff084f55391a03fd575956 (diff) | |
| download | u-boot-bfd07670a48d9fbf22646c93e07dcd8cbc8d0864.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
- Enable eMMC driver for LD11/LD20 SoCs
- Refactoring of SoC init code
- Bug fix of pinctrl driver
Diffstat (limited to 'arch/arm/dts/uniphier-ld20.dtsi')
| -rw-r--r-- | arch/arm/dts/uniphier-ld20.dtsi | 3 |
1 files changed, 1 insertions, 2 deletions
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 { |