]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge tag 'v4.10-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Fri, 18 Nov 2016 07:32:45 +0000 (23:32 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 18 Nov 2016 07:32:45 +0000 (23:32 -0800)
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>
1  2 
arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts

index ea0a8eceefd467968ce9f30c9e875481e4126345,0acf8a2bbecfcb195117343221294141877b3f7f..ff5a40399d028ae887e4142cad88f6998ec2bb80
  &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>;