From: Olof Johansson Date: Wed, 24 Feb 2016 21:51:45 +0000 (-0800) Subject: Merge tag 'v4.6-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4375acc3e2ebdc8158fb2745dc143736a9bd6769;p=linux-beck.git 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 --- 4375acc3e2ebdc8158fb2745dc143736a9bd6769