diff options
| author | Olof Johansson <olof@lixom.net> | 2021-06-23 18:58:56 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2021-06-23 18:58:58 -0700 |
| commit | f82c6e6dd149757022ba3ed8502d56201652fb0f (patch) | |
| tree | 68923ae901ae8bdcd81519f150557c6450822a5d /arch/arm/boot/dts/rk3188-bqedison2qc.dts | |
| parent | 43b3219861c7e38f7fca966779053ebba797362f (diff) | |
| parent | 623ba75a5d6b8e196a21f3ed36d26a5f6db459ce (diff) | |
Merge tag 'v5.14-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt
A lot of fixes related to the dt-binding yaml conversion,
power-domain additions for rk322x and rk3036 and the missing
mmc aliases move to board files on rk3066/rk3188.
* tag 'v5.14-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
ARM: dts: rockchip: add power controller for RK322x
ARM: dts: rockchip: add power controller for RK3036
ARM: dts: rockchip: add labels to the timer nodes on rk3066a
ARM: dts: rockchip: fix supply properties in io-domains nodes
ARM: dts: rockchip: remove #phy-cells from usbphy node rk3066/rk3188
ARM: dts: rockchip: rename nodename for phy-rockchip-inno-usb2
ARM: dts: rockchip: move mmc aliases to board dts on rk3066/rk3188
ARM: dts: rockchip: move and restyle grf nodes rk3066/rk3188
ARM: dts: rockchip: rename vcc_stdby node name for rk3066a-rayeager.dts
ARM: dts: rockchip: Remove more clock-names from PWM nodes
ARM: dts: rockchip: add #power-domain-cells to power domain nodes
ARM: dts: rockchip: Fix power-controller node names for rk3288
ARM: dts: rockchip: Fix power-controller node names for rk3188
ARM: dts: rockchip: Fix power-controller node names for rk3066a
ARM: dts: rockchip: Remove useless interrupt-names on IOMMU node on rk3036
ARM: dts: rockchip: Fix IOMMU nodes properties on rk322x
ARM: dts: rockchip: Fix the timer clocks order
ARM: dts: rockchip: fix pinctrl sleep nodename for rk3036-kylin and rk3288
ARM: dts: rockchip: Fix thermal sensor cells o rk322x
Link: https://lore.kernel.org/r/2084346.irdbgypaU6@phil
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/rk3188-bqedison2qc.dts')
| -rw-r--r-- | arch/arm/boot/dts/rk3188-bqedison2qc.dts | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/rk3188-bqedison2qc.dts b/arch/arm/boot/dts/rk3188-bqedison2qc.dts index 66a0ff196eb1..85d3fce0142f 100644 --- a/arch/arm/boot/dts/rk3188-bqedison2qc.dts +++ b/arch/arm/boot/dts/rk3188-bqedison2qc.dts @@ -13,6 +13,12 @@ model = "BQ Edison2 Quad-Core"; compatible = "mundoreader,bq-edison2qc", "rockchip,rk3188"; + aliases { + mmc0 = &mmc0; + mmc1 = &mmc1; + mmc2 = &emmc; + }; + memory@60000000 { device_type = "memory"; reg = <0x60000000 0x80000000>; |