diff options
| author | Tom Rini <trini@konsulko.com> | 2021-09-29 22:13:11 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-09-29 22:13:11 +0300 |
| commit | 94647e8920b7847330fdd72225c87e6dcb80a10d (patch) | |
| tree | 9aa5d87f5658b5bd421d593a46b1bfe9e4c36d56 | |
| parent | b5d7a200a81097fddef7ba5ec42e330d49fa2f33 (diff) | |
| parent | 65513f3c185557c0690924102386fbd42b2ea351 (diff) | |
| download | u-boot-94647e8920b7847330fdd72225c87e6dcb80a10d.tar.xz | |
Merge https://source.denx.de/u-boot/custodians/u-boot-marvell
- Armada8k: Fix CP0 eMMC/SDIO support (Robert)
| -rw-r--r-- | arch/arm/dts/armada-8040.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/dts/armada-8040.dtsi b/arch/arm/dts/armada-8040.dtsi index 5123742b8d..eec5fa2774 100644 --- a/arch/arm/dts/armada-8040.dtsi +++ b/arch/arm/dts/armada-8040.dtsi @@ -40,7 +40,7 @@ }; &cp0_pinctl { - compatible = "marvell,mvebu-pinctrl", "marvell,8k-cpm-pinctrl"; + compatible = "marvell,mvebu-pinctrl", "marvell,armada-8k-cpm-pinctrl"; bank-name ="cp0-110"; cp0_i2c0_pins: cp0-i2c-pins-0 { @@ -75,7 +75,7 @@ }; &cp1_pinctl { - compatible = "marvell,mvebu-pinctrl", "marvell,8k-cps-pinctrl"; + compatible = "marvell,mvebu-pinctrl", "marvell,armada-8k-cps-pinctrl"; bank-name ="cp1-110"; cp1_ge1_rgmii_pins: cp1-ge-rgmii-pins-0 { |