ARM: dts: rockchip: Sync rk3288-vyasa dts from linux

Sync rk3288-vyasa dts file from Linux. This sync has changes required to work HDMI output on Vyasa RK3288 board. This sync excludes the io_domains node since it is not available in rk3288.dtsi. Changes like vcc50_hdmi, vdd10_lcd and ddc-i2c-bus are not merged to Linux yet but wil resync later if any further updates on this. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

ARM: dts: rockchip: Sync rk3288-vyasa dts from linux
Sync rk3288-vyasa dts file from Linux. This sync has changes required to work HDMI output on Vyasa RK3288 board. This sync excludes the io_domains node since it is not available in rk3288.dtsi. Changes like vcc50_hdmi, vdd10_lcd and ddc-i2c-bus are not merged to Linux yet but wil resync later if any further updates on this. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Jagan Teki · Kever Yang
1 parent 38070170b8
Showing 1 changed file with 32 additions and 47 deletions Side-by-side Diff
arch/arm/dts/rk3288-vyasa.dts
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (C) 2017 Jagan Teki <jagan@amarulasolutions.com>
- *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPL or the X11 license, at your option. Note that this dual
- * licensing only applies to this file, and not this project as a
- * whole.
- *
- *  a) This file is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License as
- *     published by the Free Software Foundation; either version 2 of the
- *     License, or (at your option) any later version.
- *
- *     This file is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- * Or, alternatively,
- *
- *  b) Permission is hereby granted, free of charge, to any person
- *     obtaining a copy of this software and associated documentation
- *     files (the "Software"), to deal in the Software without
- *     restriction, including without limitation the rights to use,
- *     copy, modify, merge, publish, distribute, sublicense, and/or
- *     sell copies of the Software, and to permit persons to whom the
- *     Software is furnished to do so, subject to the following
- *     conditions:
- *
- *     The above copyright notice and this permission notice shall be
- *     included in all copies or substantial portions of the Software.
- *
- *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- *     OTHER DEALINGS IN THE SOFTWARE.
  */
  
 /dts-v1/;
@@ -115,6 +78,17 @@
 		vin-supply = <&vcc_io>;
 	};
  
+	vcc50_hdmi: vcc50-hdmi {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc50_hdmi";
+		enable-active-high;
+		gpio = <&gpio7 RK_PB4 GPIO_ACTIVE_HIGH>; /* HDMI_EN */
+		pinctrl-names = "default";
+		pinctrl-0 = <&vcc50_hdmi_en>;
+		regulator-always-on;
+		regulator-boot-on;
+		vin-supply = <&vsus_5v>;
+	};
 	vusb1_5v: vusb1-5v {
 		compatible = "regulator-fixed";
 		regulator-name = "vusb1_5v";
@@ -158,7 +132,6 @@
 &emmc {
 	bus-width = <8>;
 	cap-mmc-highspeed;
-	disable-wp;
 	non-removable;
 	pinctrl-names = "default";
 	pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_pwr &emmc_bus8>;
@@ -188,7 +161,7 @@
 };
  
 &hdmi {
-	ddc-i2c-bus = <&i2c2>;
+	ddc-i2c-bus = <&i2c5>;
 	status = "okay";
 };
  
  
@@ -324,15 +297,15 @@
 				};
 			};
  
-			vcc10_lcd: LDO_REG6 {
-				regulator-name = "vcc10_lcd";
+			vdd10_lcd: LDO_REG6 {
+				regulator-name = "vdd10_lcd";
 				regulator-min-microvolt = <1000000>;
 				regulator-max-microvolt = <1000000>;
 				regulator-always-on;
 				regulator-boot-on;
 				regulator-state-mem {
 					regulator-on-in-suspend;
-					regulator-suspend-microvolt = <1800000>;
+					regulator-suspend-microvolt = <1000000>;
 				};
 			};
  
@@ -385,7 +358,7 @@
 	};
 };
  
-&i2c2 {
+&i2c5 {
 	status = "okay";
 };
  
@@ -402,6 +375,12 @@
 	status = "okay";
 };
  
+&tsadc {
+	rockchip,hw-tshut-mode = <1>; /* tshut mode 0:CRU 1:GPIO */
+	rockchip,hw-tshut-polarity = <1>; /* tshut polarity 0:LOW 1:HIGH */
+	status = "okay";
+};
+
 &uart2 {
 	status = "okay";
 };
  
  
@@ -463,15 +442,21 @@
 		};
 	};
  
+	hdmi {
+		vcc50_hdmi_en: vcc50-hdmi-en {
+			rockchip,pins = <7 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
 	pmic {
 		pmic_int: pmic-int {
-			rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
  
 	usb_host {
 		phy_pwr_en: phy-pwr-en {
-			rockchip,pins = <RK_GPIO2 RK_PB1 RK_FUNC_GPIO &pcfg_output_high>;
+			rockchip,pins = <2 RK_PB1 RK_FUNC_GPIO &pcfg_output_high>;
 		};
  
 		usb2_pwr_en: usb2-pwr-en {
@@ -481,7 +466,7 @@
  
 	usb_otg {
 		otg_vbus_drv: otg-vbus-drv {
-			rockchip,pins = <RK_GPIO0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
  
 		};
 	};
	1	+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
1	2	/*
2	3	* Copyright (C) 2017 Jagan Teki <jagan@amarulasolutions.com>
3		- *
4		- * This file is dual-licensed: you can use it either under the terms
5		- * of the GPL or the X11 license, at your option. Note that this dual
6		- * licensing only applies to this file, and not this project as a
7		- * whole.
8		- *
9		- * a) This file is free software; you can redistribute it and/or
10		- * modify it under the terms of the GNU General Public License as
11		- * published by the Free Software Foundation; either version 2 of the
12		- * License, or (at your option) any later version.
13		- *
14		- * This file is distributed in the hope that it will be useful,
15		- * but WITHOUT ANY WARRANTY; without even the implied warranty of
16		- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17		- * GNU General Public License for more details.
18		- *
19		- * Or, alternatively,
20		- *
21		- * b) Permission is hereby granted, free of charge, to any person
22		- * obtaining a copy of this software and associated documentation
23		- * files (the "Software"), to deal in the Software without
24		- * restriction, including without limitation the rights to use,
25		- * copy, modify, merge, publish, distribute, sublicense, and/or
26		- * sell copies of the Software, and to permit persons to whom the
27		- * Software is furnished to do so, subject to the following
28		- * conditions:
29		- *
30		- * The above copyright notice and this permission notice shall be
31		- * included in all copies or substantial portions of the Software.
32		- *
33		- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
34		- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
35		- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
36		- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
37		- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
38		- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
39		- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
40		- * OTHER DEALINGS IN THE SOFTWARE.
41	4	*/
42	5
43	6	/dts-v1/;
...	...	@@ -115,6 +78,17 @@
115	78	vin-supply = <&vcc_io>;
116	79	};
117	80
	81	+ vcc50_hdmi: vcc50-hdmi {
	82	+ compatible = "regulator-fixed";
	83	+ regulator-name = "vcc50_hdmi";
	84	+ enable-active-high;
	85	+ gpio = <&gpio7 RK_PB4 GPIO_ACTIVE_HIGH>; /* HDMI_EN */
	86	+ pinctrl-names = "default";
	87	+ pinctrl-0 = <&vcc50_hdmi_en>;
	88	+ regulator-always-on;
	89	+ regulator-boot-on;
	90	+ vin-supply = <&vsus_5v>;
	91	+ };
118	92	vusb1_5v: vusb1-5v {
119	93	compatible = "regulator-fixed";
120	94	regulator-name = "vusb1_5v";
...	...	@@ -158,7 +132,6 @@
158	132	&emmc {
159	133	bus-width = <8>;
160	134	cap-mmc-highspeed;
161		- disable-wp;
162	135	non-removable;
163	136	pinctrl-names = "default";
164	137	pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_pwr &emmc_bus8>;
...	...	@@ -188,7 +161,7 @@
188	161	};
189	162
190	163	&hdmi {
191		- ddc-i2c-bus = <&i2c2>;
	164	+ ddc-i2c-bus = <&i2c5>;
192	165	status = "okay";
193	166	};
194	167
195	168
...	...	@@ -324,15 +297,15 @@
324	297	};
325	298	};
326	299
327		- vcc10_lcd: LDO_REG6 {
328		- regulator-name = "vcc10_lcd";
	300	+ vdd10_lcd: LDO_REG6 {
	301	+ regulator-name = "vdd10_lcd";
329	302	regulator-min-microvolt = <1000000>;
330	303	regulator-max-microvolt = <1000000>;
331	304	regulator-always-on;
332	305	regulator-boot-on;
333	306	regulator-state-mem {
334	307	regulator-on-in-suspend;
335		- regulator-suspend-microvolt = <1800000>;
	308	+ regulator-suspend-microvolt = <1000000>;
336	309	};
337	310	};
338	311
...	...	@@ -385,7 +358,7 @@
385	358	};
386	359	};
387	360
388		-&i2c2 {
	361	+&i2c5 {
389	362	status = "okay";
390	363	};
391	364
...	...	@@ -402,6 +375,12 @@
402	375	status = "okay";
403	376	};
404	377
	378	+&tsadc {
	379	+ rockchip,hw-tshut-mode = <1>; /* tshut mode 0:CRU 1:GPIO */
	380	+ rockchip,hw-tshut-polarity = <1>; /* tshut polarity 0:LOW 1:HIGH */
	381	+ status = "okay";
	382	+};
	383	+
405	384	&uart2 {
406	385	status = "okay";
407	386	};
408	387
409	388
...	...	@@ -463,15 +442,21 @@
463	442	};
464	443	};
465	444
	445	+ hdmi {
	446	+ vcc50_hdmi_en: vcc50-hdmi-en {
	447	+ rockchip,pins = <7 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
	448	+ };
	449	+ };
	450	+
466	451	pmic {
467	452	pmic_int: pmic-int {
468		- rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>;
	453	+ rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;
469	454	};
470	455	};
471	456
472	457	usb_host {
473	458	phy_pwr_en: phy-pwr-en {
474		- rockchip,pins = <RK_GPIO2 RK_PB1 RK_FUNC_GPIO &pcfg_output_high>;
	459	+ rockchip,pins = <2 RK_PB1 RK_FUNC_GPIO &pcfg_output_high>;
475	460	};
476	461
477	462	usb2_pwr_en: usb2-pwr-en {
...	...	@@ -481,7 +466,7 @@
481	466
482	467	usb_otg {
483	468	otg_vbus_drv: otg-vbus-drv {
484		- rockchip,pins = <RK_GPIO0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
	469	+ rockchip,pins = <0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
485	470
486	471	};
487	472	};