Commit 104f1e3f authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski
Browse files

Merge tag 'v7.1-rockchip-dts32-1' of... 

Merge tag 'v7.1-rockchip-dts32-1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/dt

A number of dt-schema cleanups that are log standing, so not suitable
as fix for the current release.

* tag 'v7.1-rockchip-dts32-1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip

:
  ARM: dts: rockchip: Pass linux,code to the power key on rk3288-veyron-pinky
  ARM: dts: rockchip: Fix LED node names on rk3288-phycore-rdk
  ARM: dts: rockchip: Fix GMAC description n RK3288 boards
  ARM: dts: rockchip: Fix RTC description on rk3288-firefly-reload
  ARM: dts: rockchip: Add missing the touchscreen interrupt on rk3288-phycore-rdk
  ARM: dts: rockchip: Fix the trackpad supply on rk3288-veyron-jerry
  ARM: dts: rockchip: Fix the Bluetooth node name on rk3288-veyron
  ARM: dts: rockchip: Remove invalid regulator-property from rk3288-veyron
  ARM: dts: rockchip: Use mount-matrix on rk3188-bqedison2qc
  ARM: dts: rockchip: Fix RTC compatible on rk3288-phycore-rdk
  ARM: dts: rockchip: Move PHY reset to ethernet-phy node on rk3036 boards
  ARM: dts: rockchip: Remove rockchip,grf from rk3288 tsadc

Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
parents 0ba8e918 94c8dc1f

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

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ memory@60000000 { 


&emac {

	phy = <&phy0>;

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

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

	pinctrl-names = "default";

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

	status = "okay";
@@ -28,6 +26,8 @@ mdio { 


		phy0: ethernet-phy@0 {

			reg = <0>;

			reset-gpios = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;

			reset-assert-us = <10000>;

		};

	};

};

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

+2 −2
Original line number Diff line number Diff line
@@ -102,8 +102,6 @@ &acodec { 


&emac {

	phy = <&phy0>;

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

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

	pinctrl-names = "default";

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

	status = "okay";
@@ -114,6 +112,8 @@ mdio { 


		phy0: ethernet-phy@0 {

			reg = <0>;

			reset-gpios = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;

			reset-assert-us = <10000>;

		};

	};

};

arch/arm/boot/dts/rockchip/rk3188-bqedison2qc.dts

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ lis3de: accelerometer@29 { 
		interrupts = <RK_PB7 IRQ_TYPE_EDGE_RISING>;

		pinctrl-names = "default";

		pinctrl-0 = <&gsensor_int>;

		rotation-matrix = "1", "0", "0",

		mount-matrix = "1", "0", "0",

				  "0", "-1", "0",

				  "0", "0", "1";

		vdd-supply = <&vcc_io>;

arch/arm/boot/dts/rockchip/rk3288-firefly-reload.dts

+1 −2
Original line number Diff line number Diff line
@@ -197,11 +197,10 @@ &hdmi { 
};



&i2c0 {

	hym8563: hym8563@51 {

	hym8563: rtc@51 {

		compatible = "haoyu,hym8563";

		reg = <0x51>;

		#clock-cells = <0>;

		clock-frequency = <32768>;

		clock-output-names = "xin32k";

		interrupt-parent = <&gpio7>;

		interrupts = <RK_PA4 IRQ_TYPE_EDGE_FALLING>;

arch/arm/boot/dts/rockchip/rk3288-phycore-rdk.dts

+10 −6
Original line number Diff line number Diff line
@@ -86,6 +86,10 @@ &i2c1 { 
	touchscreen@44 {

		compatible = "st,stmpe811";

		reg = <0x44>;

		interrupt-parent = <&gpio5>;

		interrupts = <RK_PB4 IRQ_TYPE_EDGE_FALLING>;

		pinctrl-names = "default";

		pinctrl-0 = <&ts_irq_pin>;

	};



	adc@64 {
@@ -94,7 +98,7 @@ adc@64 { 
	};



	i2c_rtc: rtc@68 {

		compatible = "rv4162";

		compatible = "microcrystal,rv4162";

		reg = <0x68>;

		pinctrl-names = "default";

		pinctrl-0 = <&i2c_rtc_int>;
@@ -121,25 +125,25 @@ leddim: leddimmer@62 { 
		compatible = "nxp,pca9533";

		reg = <0x62>;



		led1 {

		led-1 {

			label = "red:user1";

			linux,default-trigger = "none";

			type = <PCA9532_TYPE_LED>;

		};



		led2 {

		led-2 {

			label = "green:user2";

			linux,default-trigger = "none";

			type = <PCA9532_TYPE_LED>;

		};



		led3 {

		led-3 {

			label = "blue:user3";

			linux,default-trigger = "none";

			type = <PCA9532_TYPE_LED>;

		};



		led4 {

		led-4 {

			label = "red:user4";

			linux,default-trigger = "none";

			type = <PCA9532_TYPE_LED>;
@@ -199,7 +203,7 @@ sdmmc_pwr: sdmmc-pwr { 


	touchscreen {

		ts_irq_pin: ts-irq-pin {

			rockchip,pins = <5 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;

			rockchip,pins = <5 RK_PB4 RK_FUNC_GPIO &pcfg_pull_up>;

		};

	};