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

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

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

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

64bit dts changes with some adjustments to the pcie controller,
usb clocks, grf phandles for the rk3399 CRUs, epd pinctrl settings,
a phandle to the rk3399 tsadc and converting boards to use the
recently introduced pin constants.

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

:
  arm64: dts: rockchip: add rockchip,grf property for RK3399 PMUCRU/CRU
  arm64: dts: rockchip: add aspm-no-l0s for rk3399
  arm64: dts: rockchip: add max-link-speed for rk3399
  arm64: dts: rockchip: use pin constants to describe gpios
  arm64: dts: rockchip: add u2phy clock for ehci and ohci of rk3399
  arm64: dts: rockchip: add rk3399 eDP HPD pinctrl
  arm64: dts: rockchip: add rk3399 thermal_zones phandle

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 560741d7 8cbb59af

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

+5 −5
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ 
			240 241 242 243 244 245 246 247

			248 249 250 251 252 253 254 255>;

		default-brightness-level = <128>;

		enable-gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>;

		enable-gpios = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&bl_en>;

		pwms = <&pwm0 0 1000000 PWM_POLARITY_INVERTED>;
@@ -101,7 +101,7 @@ 
		compatible = "mmc-pwrseq-emmc";

		pinctrl-0 = <&emmc_reset>;

		pinctrl-names = "default";

		reset-gpios = <&gpio2 3 GPIO_ACTIVE_HIGH>;

		reset-gpios = <&gpio2 RK_PA3 GPIO_ACTIVE_HIGH>;

	};



	keys: gpio-keys {
@@ -111,7 +111,7 @@ 


		power {

			wakeup-source;

			gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;

			gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>;

			label = "GPIO Power";

			linux,code = <KEY_POWER>;

		};
@@ -121,7 +121,7 @@ 
	vcc_host: vcc-host-regulator {

		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&gpio0 4 GPIO_ACTIVE_HIGH>;

		gpio = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&host_vbus_drv>;

		regulator-name = "vcc_host";
@@ -166,7 +166,7 @@ 
	phy-supply = <&vcc_lan>;

	phy-mode = "rmii";

	clock_in_out = "output";

	snps,reset-gpio = <&gpio3 12 0>;

	snps,reset-gpio = <&gpio3 RK_PB4 GPIO_ACTIVE_HIGH>;

	snps,reset-active-low;

	snps,reset-delays-us = <0 10000 1000000>;

	pinctrl-names = "default";

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

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


	ir: ir-receiver {

		compatible = "gpio-ir-receiver";

		gpios = <&gpio3 30 GPIO_ACTIVE_LOW>;

		gpios = <&gpio3 RK_PD6 GPIO_ACTIVE_LOW>;

		pinctrl-names = "default";

		pinctrl-0 = <&ir_int>;

	};
@@ -77,7 +77,7 @@ 
		pinctrl-0 = <&pwr_key>;



		power {

			gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;

			gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>;

			label = "GPIO Power";

			linux,code = <KEY_POWER>;

			wakeup-source;
@@ -88,13 +88,13 @@ 
		compatible = "gpio-leds";



		blue {

			gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;

			gpios = <&gpio2 RK_PA2 GPIO_ACTIVE_HIGH>;

			label = "geekbox:blue:led";

			default-state = "on";

		};



		red {

			gpios = <&gpio2 3 GPIO_ACTIVE_HIGH>;

			gpios = <&gpio2 RK_PA3 GPIO_ACTIVE_HIGH>;

			label = "geekbox:red:led";

			default-state = "off";

		};
@@ -146,7 +146,7 @@ 
		pinctrl-names = "default";

		pinctrl-0 = <&pmic_int>, <&pmic_sleep>;

		interrupt-parent = <&gpio0>;

		interrupts = <5 IRQ_TYPE_LEVEL_LOW>;

		interrupts = <RK_PA5 IRQ_TYPE_LEVEL_LOW>;

		rockchip,system-power-controller;

		vcc1-supply = <&vcc_sys>;

		vcc2-supply = <&vcc_sys>;

arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts

+7 −7
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
		compatible = "mmc-pwrseq-emmc";

		pinctrl-0 = <&emmc_reset>;

		pinctrl-names = "default";

		reset-gpios = <&gpio2 3 GPIO_ACTIVE_HIGH>;

		reset-gpios = <&gpio2 RK_PA3 GPIO_ACTIVE_HIGH>;

	};



	ext_gmac: external-gmac-clock {
@@ -78,7 +78,7 @@ 


		power {

			wakeup-source;

			gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>;

			gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;

			label = "GPIO Power";

			linux,code = <KEY_POWER>;

		};
@@ -88,7 +88,7 @@ 
		compatible = "gpio-leds";



		red {

			gpios = <&gpio3 29 GPIO_ACTIVE_HIGH>;

			gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>;

			label = "orion:red:led";

			pinctrl-names = "default";

			pinctrl-0 = <&led_ctl>;
@@ -96,7 +96,7 @@ 
		};



		blue {

			gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;

			gpios = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>;

			label = "orion:blue:led";

			pinctrl-names = "default";

			pinctrl-0 = <&stby_pwren>;
@@ -117,7 +117,7 @@ 
	/* supplies both host and otg */

	vcc_host: vcc-host-regulator {

		compatible = "regulator-fixed";

		gpio = <&gpio0 4 GPIO_ACTIVE_LOW>;

		gpio = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;

		pinctrl-names = "default";

		pinctrl-0 = <&host_vbus_drv>;

		regulator-name = "vcc_host";
@@ -149,7 +149,7 @@ 
	vcc_sd: vcc-sd-regulator {

		compatible = "regulator-fixed";

		regulator-name = "vcc_sd";

		gpio = <&gpio3 11 GPIO_ACTIVE_LOW>;

		gpio = <&gpio3 RK_PB3 GPIO_ACTIVE_LOW>;

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <3300000>;

		vin-supply = <&vcc_io>;
@@ -217,7 +217,7 @@ 
	phy-mode = "rgmii";

	pinctrl-names = "default";

	pinctrl-0 = <&rgmii_pins>;

	snps,reset-gpio = <&gpio3 12 0>;

	snps,reset-gpio = <&gpio3 RK_PB4 GPIO_ACTIVE_HIGH>;

	snps,reset-active-low;

	snps,reset-delays-us = <0 10000 1000000>;

	tx_delay = <0x30>;

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

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



		power {

			gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;

			gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>;

			label = "GPIO Power";

			linux,code = <KEY_POWER>;

			wakeup-source;
@@ -105,7 +105,7 @@ 
		compatible = "rockchip,rk808";

		reg = <0x1b>;

		interrupt-parent = <&gpio0>;

		interrupts = <5 IRQ_TYPE_LEVEL_LOW>;

		interrupts = <RK_PA5 IRQ_TYPE_LEVEL_LOW>;

		pinctrl-names = "default";

		pinctrl-0 = <&pmic_int>, <&pmic_sleep>;

		rockchip,system-power-controller;
@@ -236,7 +236,7 @@ 
		compatible = "bosch,bma250";

		reg = <0x18>;

		interrupt-parent = <&gpio2>;

		interrupts = <17 IRQ_TYPE_LEVEL_LOW>;

		interrupts = <RK_PC1 IRQ_TYPE_LEVEL_LOW>;

	};

};
@@ -247,8 +247,8 @@ 
		compatible = "silead,gsl1680";

		reg = <0x40>;

		interrupt-parent = <&gpio3>;

		interrupts = <28 IRQ_TYPE_EDGE_FALLING>;

		power-gpios = <&gpio3 15 GPIO_ACTIVE_HIGH>;

		interrupts = <RK_PD4 IRQ_TYPE_EDGE_FALLING>;

		power-gpios = <&gpio3 RK_PB7 GPIO_ACTIVE_HIGH>;

		touchscreen-size-x = <800>;

		touchscreen-size-y = <1280>;

		silead,max-fingers = <5>;

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

+8 −8
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
		compatible = "mmc-pwrseq-emmc";

		pinctrl-0 = <&emmc_reset>;

		pinctrl-names = "default";

		reset-gpios = <&gpio2 3 GPIO_ACTIVE_HIGH>;

		reset-gpios = <&gpio2 RK_PA3 GPIO_ACTIVE_HIGH>;

	};



	keys: gpio-keys {
@@ -71,7 +71,7 @@ 


		power {

			wakeup-source;

			gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;

			gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>;

			label = "GPIO Power";

			linux,code = <KEY_POWER>;

		};
@@ -81,7 +81,7 @@ 
		compatible = "gpio-leds";



		work {

			gpios = <&gpio3 29 GPIO_ACTIVE_HIGH>;

			gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>;

			label = "r88:green:led";

			pinctrl-names = "default";

			pinctrl-0 = <&led_ctl>;
@@ -90,7 +90,7 @@ 


	ir: ir-receiver {

		compatible = "gpio-ir-receiver";

		gpios = <&gpio3 30 GPIO_ACTIVE_LOW>;

		gpios = <&gpio3 RK_PD6 GPIO_ACTIVE_LOW>;

		pinctrl-names = "default";

		pinctrl-0 = <&ir_int>;

	};
@@ -104,10 +104,10 @@ 


		reset-gpios =

			/* BT_RST_N */

			<&gpio3 5 GPIO_ACTIVE_LOW>,

			<&gpio3 RK_PA5 GPIO_ACTIVE_LOW>,



			/* WL_REG_ON */

			<&gpio3 4 GPIO_ACTIVE_LOW>;

			<&gpio3 RK_PA4 GPIO_ACTIVE_LOW>;

	};



	vcc_18: vcc18-regulator {
@@ -124,7 +124,7 @@ 
	vcc_host: vcc-host-regulator {

		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&gpio0 4 GPIO_ACTIVE_HIGH>;

		gpio = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&host_vbus_drv>;

		regulator-name = "vcc_host";
@@ -199,7 +199,7 @@ 
	phy-supply = <&vcc_lan>;

	phy-mode = "rmii";

	clock_in_out = "output";

	snps,reset-gpio = <&gpio3 12 0>;

	snps,reset-gpio = <&gpio3 RK_PB4 GPIO_ACTIVE_HIGH>;

	snps,reset-active-low;

	snps,reset-delays-us = <0 10000 1000000>;

	pinctrl-names = "default";