diff options
author | Tom Rini <trini@konsulko.com> | 2016-08-26 14:58:52 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-08-26 17:05:01 -0400 |
commit | c6b968da78ce3fa7224c0ddf15fe170c7c05b27e (patch) | |
tree | 42716ddc52ec9caecc19588a2d0c5ca9a94188dd /arch/arm/dts/sun6i-a31.dtsi | |
parent | 1cfce74fe5a2301ee9b384d9395ba95db930c9d6 (diff) | |
parent | d5ac6eef91965b519d8f15f17febfa0ea2ee0adc (diff) | |
download | u-boot-imx-c6b968da78ce3fa7224c0ddf15fe170c7c05b27e.zip u-boot-imx-c6b968da78ce3fa7224c0ddf15fe170c7c05b27e.tar.gz u-boot-imx-c6b968da78ce3fa7224c0ddf15fe170c7c05b27e.tar.bz2 |
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
Diffstat (limited to 'arch/arm/dts/sun6i-a31.dtsi')
-rw-r--r-- | arch/arm/dts/sun6i-a31.dtsi | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/arch/arm/dts/sun6i-a31.dtsi b/arch/arm/dts/sun6i-a31.dtsi index 1867af2..b674bf7 100644 --- a/arch/arm/dts/sun6i-a31.dtsi +++ b/arch/arm/dts/sun6i-a31.dtsi @@ -469,7 +469,8 @@ }; mmc0: mmc@01c0f000 { - compatible = "allwinner,sun5i-a13-mmc"; + compatible = "allwinner,sun7i-a20-mmc", + "allwinner,sun5i-a13-mmc"; reg = <0x01c0f000 0x1000>; clocks = <&ahb1_gates 8>, <&mmc0_clk 0>, @@ -488,7 +489,8 @@ }; mmc1: mmc@01c10000 { - compatible = "allwinner,sun5i-a13-mmc"; + compatible = "allwinner,sun7i-a20-mmc", + "allwinner,sun5i-a13-mmc"; reg = <0x01c10000 0x1000>; clocks = <&ahb1_gates 9>, <&mmc1_clk 0>, @@ -507,7 +509,8 @@ }; mmc2: mmc@01c11000 { - compatible = "allwinner,sun5i-a13-mmc"; + compatible = "allwinner,sun7i-a20-mmc", + "allwinner,sun5i-a13-mmc"; reg = <0x01c11000 0x1000>; clocks = <&ahb1_gates 10>, <&mmc2_clk 0>, @@ -526,7 +529,8 @@ }; mmc3: mmc@01c12000 { - compatible = "allwinner,sun5i-a13-mmc"; + compatible = "allwinner,sun7i-a20-mmc", + "allwinner,sun5i-a13-mmc"; reg = <0x01c12000 0x1000>; clocks = <&ahb1_gates 11>, <&mmc3_clk 0>, |