From: Olof Johansson Date: Fri, 18 Nov 2016 07:32:45 +0000 (-0800) Subject: Merge tag 'v4.10-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v4.10-rc1~81^2~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fce566ff9706eeff7458002af2a34249bb76e568;p=thirdparty%2Flinux.git 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 --- fce566ff9706eeff7458002af2a34249bb76e568 diff --cc arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts index ea0a8eceefd46,0acf8a2bbecfc..ff5a40399d028 --- a/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts +++ b/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts @@@ -344,9 -347,10 +344,9 @@@ &sdmmc { bus-width = <4>; clock-frequency = <50000000>; - clock-freq-min-max = <400000 50000000>; + max-frequency = <50000000>; cap-sd-highspeed; card-detect-delay = <200>; - keep-power-in-suspend; num-slots = <1>; pinctrl-names = "default"; pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;