tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge tag 'v4.6-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt64

Define the tuning-related mmc clocks and move from
gpio-key,wakeup to the more generic wakeup-source property.

* tag 'v4.6-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
arm64: dts: rockchip: replace gpio-key,wakeup with wakeup-source property
arm64: dts: rockchip: add rk3368 tuning clk for emmc and sdmmc

Signed-off-by: Olof Johansson <olof@lixom.net>

Olof Johansson 4375acc3 efa9b9e3

+8 -6
+1 -1
arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi
··· 111 111 pinctrl-0 = <&pwr_key>; 112 112 113 113 button@0 { 114 - gpio-key,wakeup = <1>; 114 + wakeup-source; 115 115 gpios = <&gpio0 2 GPIO_ACTIVE_LOW>; 116 116 label = "GPIO Power"; 117 117 linux,code = <116>;
+1 -1
arch/arm64/boot/dts/rockchip/rk3368-r88.dts
··· 71 71 pinctrl-0 = <&pwr_key>; 72 72 73 73 button@0 { 74 - gpio-key,wakeup = <1>; 74 + wakeup-source; 75 75 gpios = <&gpio0 2 GPIO_ACTIVE_LOW>; 76 76 label = "GPIO Power"; 77 77 linux,code = <116>;
+6 -4
arch/arm64/boot/dts/rockchip/rk3368.dtsi
··· 231 231 compatible = "rockchip,rk3368-dw-mshc", "rockchip,rk3288-dw-mshc"; 232 232 reg = <0x0 0xff0c0000 0x0 0x4000>; 233 233 clock-freq-min-max = <400000 150000000>; 234 - clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>; 235 - clock-names = "biu", "ciu"; 234 + clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>, 235 + <&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>; 236 + clock-names = "biu", "ciu", "ciu-drive", "ciu-sample"; 236 237 fifo-depth = <0x100>; 237 238 interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; 238 239 status = "disabled"; ··· 255 254 compatible = "rockchip,rk3368-dw-mshc", "rockchip,rk3288-dw-mshc"; 256 255 reg = <0x0 0xff0f0000 0x0 0x4000>; 257 256 clock-freq-min-max = <400000 150000000>; 258 - clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>; 259 - clock-names = "biu", "ciu"; 257 + clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>, 258 + <&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>; 259 + clock-names = "biu", "ciu", "ciu-drive", "ciu-sample"; 260 260 fifo-depth = <0x100>; 261 261 interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>; 262 262 status = "disabled";