Commit 4375acc3 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'v4.6-rockchip-dts64-1' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents efa9b9e3 e6f49b11

arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ 
		pinctrl-0 = <&pwr_key>;



		button@0 {

			gpio-key,wakeup = <1>;

			wakeup-source;

			gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;

			label = "GPIO Power";

			linux,code = <116>;

arch/arm64/boot/dts/rockchip/rk3368-r88.dts

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ 
		pinctrl-0 = <&pwr_key>;



		button@0 {

			gpio-key,wakeup = <1>;

			wakeup-source;

			gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;

			label = "GPIO Power";

			linux,code = <116>;

arch/arm64/boot/dts/rockchip/rk3368.dtsi

+6 −4
Original line number Diff line number Diff line
@@ -231,8 +231,9 @@ 
		compatible = "rockchip,rk3368-dw-mshc", "rockchip,rk3288-dw-mshc";

		reg = <0x0 0xff0c0000 0x0 0x4000>;

		clock-freq-min-max = <400000 150000000>;

		clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>;

		clock-names = "biu", "ciu";

		clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>,

			 <&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>;

		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";

		fifo-depth = <0x100>;

		interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";
@@ -254,8 +255,9 @@ 
		compatible = "rockchip,rk3368-dw-mshc", "rockchip,rk3288-dw-mshc";

		reg = <0x0 0xff0f0000 0x0 0x4000>;

		clock-freq-min-max = <400000 150000000>;

		clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>;

		clock-names = "biu", "ciu";

		clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>,

			 <&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>;

		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";

		fifo-depth = <0x100>;

		interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

CRA Git | Maintained and supported by SUSTech CRA and CCSE