diff options
| author | Olof Johansson <olof@lixom.net> | 2016-11-17 23:32:45 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-11-17 23:32:45 -0800 |
| commit | fce566ff9706eeff7458002af2a34249bb76e568 (patch) | |
| tree | a5fd759b43c32894b91ee6d295bc9c9e753c4e5d /arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts | |
| parent | aeb961bec7a0226099ec138f8cbe99b7d390484b (diff) | |
| parent | c49590691f3819bb6be3f77938ef39038eb76643 (diff) | |
Merge tag 'v4.10-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt64
64bit devicetree changes including the px5 evaluation board
a fix for wrong i2c registers on rk3368 a new nvmem cell and
power-domain on rk3399 as well as moving mmc frequency
properties to the more generic max-frequency one.
* tag 'v4.10-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
arm64: dts: rockchip: replace to "max-frequency" instead of "clock-freq-min-max"
arm64: dts: rockchip: add cpu-id nvmem cell node for rk3399
arm64: dts: rockchip: add sdmmc support for px5-evb
arm64: dts: rockchip: Add more properties for emmc on px5-evb
arm64: dts: rockchip: Add PX5 Evaluation board
arm64: dts: rockchip: add powerdomain for typec on rk3399
arm64: dts: rockchip: fix i2c resource error of rk3368
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts')
| -rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts b/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts index ea0a8eceefd4..ff5a40399d02 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts +++ b/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts @@ -344,7 +344,7 @@ &sdmmc { bus-width = <4>; clock-frequency = <50000000>; - clock-freq-min-max = <400000 50000000>; + max-frequency = <50000000>; cap-sd-highspeed; card-detect-delay = <200>; num-slots = <1>; |