Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb9503e9 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'v4.11-rockchip-dts32-1' of... 

Merge tag 'v4.11-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt

Bit of cleanup for the cortex-a9 uarts to have that soc-specific
spare-compatible as all others have, conversion to gpio constants
and addition of rk3288 qos nodes that need to be saved before a
power-domain gets turned off.

* tag 'v4.11-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip

:
  ARM: dts: rockchip: add soc-specific uart compatibles for rk3066/rk3188
  ARM: dts: rockchip: use pin constants to describe gpios
  ARM: dts: rockchip: add qos node for rk3288

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 828a34b9 ec7c98ec

arch/arm/boot/dts/rk3036-evb.dts

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&emac_xfer>, <&emac_mdio>;

	phy = <&phy0>;

	phy-reset-gpios = <&gpio2 22 GPIO_ACTIVE_LOW>; /* PHY_RST */

	phy-reset-gpios = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>; /* PHY_RST */

	phy-reset-duration = <10>; /* millisecond */



	status = "okay";

arch/arm/boot/dts/rk3036-kylin.dts

+6 −6
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
		compatible = "gpio-leds";



		work {

			gpios = <&gpio2 30 GPIO_ACTIVE_HIGH>;

			gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>;

			label = "kylin:red:led";

			pinctrl-names = "default";

			pinctrl-0 = <&led_ctl>;
@@ -74,9 +74,9 @@ 
		 * - SDIO_RESET_L_WL_RST

		 * - SDIO_RESET_L_BT_EN

		 */

		reset-gpios = <&gpio0 26 GPIO_ACTIVE_LOW>, /* WL_REG_ON */

			      <&gpio0 27 GPIO_ACTIVE_LOW>, /* WL_RST */

			      <&gpio2 9  GPIO_ACTIVE_LOW>; /* BT_EN */

		reset-gpios = <&gpio0 RK_PD2 GPIO_ACTIVE_LOW>, /* WL_REG_ON */

			      <&gpio0 RK_PD3 GPIO_ACTIVE_LOW>, /* WL_RST */

			      <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>; /* BT_EN */

	};



	sound {
@@ -121,7 +121,7 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&emac_xfer>, <&emac_mdio>;

	phy = <&phy0>;

	phy-reset-gpios = <&gpio2 22 GPIO_ACTIVE_LOW>; /* PHY_RST */

	phy-reset-gpios = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>; /* PHY_RST */

	phy-reset-duration = <10>; /* millisecond */



	status = "okay";
@@ -148,7 +148,7 @@ 
		compatible = "rockchip,rk808";

		reg = <0x1b>;

		interrupt-parent = <&gpio2>;

		interrupts = <2 IRQ_TYPE_LEVEL_LOW>;

		interrupts = <RK_PA2 IRQ_TYPE_LEVEL_LOW>;

		pinctrl-names = "default";

		pinctrl-0 = <&pmic_int &global_pwroff>;

		rockchip,system-power-controller;

arch/arm/boot/dts/rk3066a-bqcurie2.dts

+4 −4
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ 
		regulator-name = "sdmmc-supply";

		regulator-min-microvolt = <3000000>;

		regulator-max-microvolt = <3000000>;

		gpio = <&gpio3 7 GPIO_ACTIVE_LOW>;

		gpio = <&gpio3 RK_PA7 GPIO_ACTIVE_LOW>;

		startup-delay-us = <100000>;

		vin-supply = <&vcc_io>;

	};
@@ -81,7 +81,7 @@ 
		autorepeat;



		power {

			gpios = <&gpio6 2 GPIO_ACTIVE_LOW>; /* GPIO6_A2 */

			gpios = <&gpio6 RK_PA2 GPIO_ACTIVE_LOW>; /* GPIO6_A2 */

			linux,code = <KEY_POWER>;

			label = "GPIO Key Power";

			linux,input-type = <1>;
@@ -89,7 +89,7 @@ 
			debounce-interval = <100>;

		};

		volume-down {

			gpios = <&gpio4 21 GPIO_ACTIVE_LOW>; /* GPIO4_C5 */

			gpios = <&gpio4 RK_PC5 GPIO_ACTIVE_LOW>; /* GPIO4_C5 */

			linux,code = <KEY_VOLUMEDOWN>;

			label = "GPIO Key Vol-";

			linux,input-type = <1>;
@@ -111,7 +111,7 @@ 
		reg = <0x2d>;



		interrupt-parent = <&gpio6>;

		interrupts = <6 IRQ_TYPE_LEVEL_LOW>;

		interrupts = <RK_PA6 IRQ_TYPE_LEVEL_LOW>;



		vcc5-supply = <&vcc_io>;

		vcc6-supply = <&vcc_io>;

arch/arm/boot/dts/rk3066a-marsboard.dts

+3 −3
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 
		regulator-name = "sdmmc-supply";

		regulator-min-microvolt = <3000000>;

		regulator-max-microvolt = <3000000>;

		gpio = <&gpio3 7 GPIO_ACTIVE_LOW>;

		gpio = <&gpio3 RK_PA7 GPIO_ACTIVE_LOW>;

		startup-delay-us = <100000>;

		vin-supply = <&vcc_io>;

	};
@@ -91,7 +91,7 @@ 
		reg = <0x2d>;



		interrupt-parent = <&gpio6>;

		interrupts = <4 IRQ_TYPE_LEVEL_LOW>;

		interrupts = <RK_PA4 IRQ_TYPE_LEVEL_LOW>;



		vcc1-supply = <&vsys>;

		vcc2-supply = <&vsys>;
@@ -186,7 +186,7 @@ 
	phy0: ethernet-phy@0 {

		reg = <0>;

		interrupt-parent = <&gpio1>;

		interrupts = <26 IRQ_TYPE_LEVEL_LOW>;

		interrupts = <RK_PD2 IRQ_TYPE_LEVEL_LOW>;

	};

};

arch/arm/boot/dts/rk3066a-mk808.dts

+5 −5
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 


		blue {

			label = "mk808:blue:power";

			gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>;

			gpios = <&gpio0 RK_PA3 GPIO_ACTIVE_HIGH>;

			default-state = "off";

			linux,default-trigger = "default-on";

		};
@@ -77,7 +77,7 @@ 
	vcc_host: usb-host-regulator {

		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&gpio0 6 GPIO_ACTIVE_HIGH>;

		gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;

		pinctrl-0 = <&host_drv>;

		pinctrl-names = "default";

		regulator-always-on;
@@ -91,7 +91,7 @@ 
	vcc_otg: usb-otg-regulator {

		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&gpio0 5 GPIO_ACTIVE_HIGH>;

		gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;

		pinctrl-0 = <&otg_drv>;

		pinctrl-names = "default";

		regulator-always-on;
@@ -104,7 +104,7 @@ 


	vcc_sd: sdmmc-regulator {

		compatible = "regulator-fixed";

		gpio = <&gpio3 7 GPIO_ACTIVE_LOW>;

		gpio = <&gpio3 RK_PA7 GPIO_ACTIVE_LOW>;

		pinctrl-0 = <&sdmmc_pwr>;

		pinctrl-names = "default";

		regulator-name = "vcc_sd";
@@ -117,7 +117,7 @@ 
	vcc_wifi: sdio-regulator {

		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&gpio3 24 GPIO_ACTIVE_HIGH>;

		gpio = <&gpio3 RK_PD0 GPIO_ACTIVE_HIGH>;

		pinctrl-0 = <&wifi_pwr>;

		pinctrl-names = "default";

		regulator-name = "vcc_wifi";