Skip to content

Commit 27e0c54

Browse files
Rocky Haorkhuangtao
authored andcommitted
arm64: dts: rockchip: update pinctrl for px30
1 move pinctrl into board level dts file. 2 remove pinctrl for sleep state. in sleep state we do not change pin control and keep the pin control in otp state, which is used by atf as a flag to control pmic's state. Change-Id: Ib68b20d4f4ba79d99255f1deb509ff8a741deef2 Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
1 parent 46d3be8 commit 27e0c54

8 files changed

Lines changed: 21 additions & 4 deletions

arch/arm64/boot/dts/rockchip/px30-evb-ddr3-lvds-v10.dts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,9 @@
577577
};
578578

579579
&tsadc {
580+
pinctrl-names = "init", "default";
581+
pinctrl-0 = <&tsadc_otp_gpio>;
582+
pinctrl-1 = <&tsadc_otp_out>;
580583
status = "okay";
581584
};
582585

arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -807,6 +807,9 @@
807807
};
808808

809809
&tsadc {
810+
pinctrl-names = "init", "default";
811+
pinctrl-0 = <&tsadc_otp_gpio>;
812+
pinctrl-1 = <&tsadc_otp_out>;
810813
status = "okay";
811814
};
812815

arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -730,6 +730,9 @@
730730
};
731731

732732
&tsadc {
733+
pinctrl-names = "init", "default";
734+
pinctrl-0 = <&tsadc_otp_gpio>;
735+
pinctrl-1 = <&tsadc_otp_out>;
733736
status = "okay";
734737
};
735738

arch/arm64/boot/dts/rockchip/px30.dtsi

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -854,10 +854,6 @@
854854
assigned-clock-rates = <50000>;
855855
resets = <&cru SRST_TSADC>;
856856
reset-names = "tsadc-apb";
857-
pinctrl-names = "init", "default", "sleep";
858-
pinctrl-0 = <&tsadc_otp_gpio>;
859-
pinctrl-1 = <&tsadc_otp_out>;
860-
pinctrl-2 = <&tsadc_otp_gpio>;
861857
#thermal-sensor-cells = <1>;
862858
rockchip,hw-tshut-temp = <100000>;
863859
status = "disabled";

arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -719,6 +719,9 @@
719719
};
720720

721721
&tsadc {
722+
pinctrl-names = "init", "default";
723+
pinctrl-0 = <&tsadc_otp_gpio>;
724+
pinctrl-1 = <&tsadc_otp_out>;
722725
status = "okay";
723726
};
724727

arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v10.dts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1140,6 +1140,9 @@
11401140
};
11411141

11421142
&tsadc {
1143+
pinctrl-names = "init", "default";
1144+
pinctrl-0 = <&tsadc_otp_gpio>;
1145+
pinctrl-1 = <&tsadc_otp_out>;
11431146
status = "okay";
11441147
};
11451148

arch/arm64/boot/dts/rockchip/rk3326-evb-linux-lp3-v10.dts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -837,6 +837,9 @@
837837
};
838838

839839
&tsadc {
840+
pinctrl-names = "init", "default";
841+
pinctrl-0 = <&tsadc_otp_gpio>;
842+
pinctrl-1 = <&tsadc_otp_out>;
840843
status = "okay";
841844
};
842845

arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -837,6 +837,9 @@
837837
};
838838

839839
&tsadc {
840+
pinctrl-names = "init", "default";
841+
pinctrl-0 = <&tsadc_otp_gpio>;
842+
pinctrl-1 = <&tsadc_otp_out>;
840843
status = "okay";
841844
};
842845

0 commit comments

Comments
 (0)