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

Commit a405fd1b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v4.4-rockchip-dts32-fixes1' of... 

Merge tag 'v4.4-rockchip-dts32-fixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into fixes

Merge "ARM: rockchip: devicetree fixes for 4.4" from Heiko Stuebner:

Two fixes to Rockchip devicetree files, disabling the mmc-tuning
on the veyron-minnie board for now and adding the init state for
the over-temperature-protection to prevent glitches making the
system reboot sometimes.

* tag 'v4.4-rockchip-dts32-fixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: Add OTP gpio pinctrl to rk3288 tsadc node
  ARM: dts: rockchip: temporarily remove emmc hs200 speed from rk3288 minnie
parents 5530f851 784359b8

arch/arm/boot/dts/rk3288-veyron-minnie.dts

+4 −0
Original line number Diff line number Diff line
@@ -86,6 +86,10 @@ 
	};

};



&emmc {

	/delete-property/mmc-hs200-1_8v;

};



&gpio_keys {

	pinctrl-0 = <&pwr_key_l &ap_lid_int_l &volum_down_l &volum_up_l>;

arch/arm/boot/dts/rk3288.dtsi

+8 −2
Original line number Diff line number Diff line
@@ -452,8 +452,10 @@ 
		clock-names = "tsadc", "apb_pclk";

		resets = <&cru SRST_TSADC>;

		reset-names = "tsadc-apb";

		pinctrl-names = "default";

		pinctrl-0 = <&otp_out>;

		pinctrl-names = "init", "default", "sleep";

		pinctrl-0 = <&otp_gpio>;

		pinctrl-1 = <&otp_out>;

		pinctrl-2 = <&otp_gpio>;

		#thermal-sensor-cells = <1>;

		rockchip,hw-tshut-temp = <95000>;

		status = "disabled";
@@ -1395,6 +1397,10 @@ 
		};



		tsadc {

			otp_gpio: otp-gpio {

				rockchip,pins = <0 10 RK_FUNC_GPIO &pcfg_pull_none>;

			};



			otp_out: otp-out {

				rockchip,pins = <0 10 RK_FUNC_1 &pcfg_pull_none>;

			};