From 2f7c68cb55ecb7331f2381deb497c27155f32faf Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Wed, 03 Jan 2024 09:43:39 +0000
Subject: [PATCH] update kernel to 5.10.198

---
 kernel/arch/arm64/boot/dts/rockchip/px30s-pinctrl.dtsi |  251 ++++++++++++++++++++++++-------------------------
 1 files changed, 124 insertions(+), 127 deletions(-)

diff --git a/kernel/arch/arm64/boot/dts/rockchip/px30s-pinctrl.dtsi b/kernel/arch/arm64/boot/dts/rockchip/px30s-pinctrl.dtsi
index 9b5de14..5d8869a 100644
--- a/kernel/arch/arm64/boot/dts/rockchip/px30s-pinctrl.dtsi
+++ b/kernel/arch/arm64/boot/dts/rockchip/px30s-pinctrl.dtsi
@@ -1,123 +1,120 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2022 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  */
 
-/ {
-	pcfg-for-s {
-		/* default for px30 and 4ma for px30s */
-		pcfg_pull_none_n_4ma: pcfg-pull-none-n-4ma {
-			bias-disable;
-			drive-strength-s = <4>;
-		};
-		pcfg_pull_up_n_4ma: pcfg-pull-up-n-4ma {
-			bias-pull-up;
-			drive-strength-s = <4>;
-		};
-		pcfg_pull_down_n_4ma: pcfg-pull-down-n-4ma {
-			bias-pull-down;
-			drive-strength-s = <4>;
-		};
+&pinctrl {
+	/* default for px30 and 4ma for px30s */
+	pcfg_pull_none_n_4ma: pcfg-pull-none-n-4ma {
+		bias-disable;
+		drive-strength-s = <4>;
+	};
+	pcfg_pull_up_n_4ma: pcfg-pull-up-n-4ma {
+		bias-pull-up;
+		drive-strength-s = <4>;
+	};
+	pcfg_pull_down_n_4ma: pcfg-pull-down-n-4ma {
+		bias-pull-down;
+		drive-strength-s = <4>;
+	};
 
-		/* default for px30 and 6ma for px30s */
-		pcfg_pull_none_0_6ma: pcfg-pull-none-0-6ma {
-			bias-disable;
-			drive-strength-s = <6>;
-		};
-		pcfg_pull_up_0_6ma: pcfg-pull-up-0-6ma {
-			bias-pull-up;
-			drive-strength-s = <6>;
-		};
-		pcfg_pull_down_0_6ma: pcfg-pull-down-0-6ma {
-			bias-pull-down;
-			drive-strength-s = <6>;
-		};
+	/* default for px30 and 6ma for px30s */
+	pcfg_pull_none_0_6ma: pcfg-pull-none-0-6ma {
+		bias-disable;
+		drive-strength-s = <6>;
+	};
+	pcfg_pull_up_0_6ma: pcfg-pull-up-0-6ma {
+		bias-pull-up;
+		drive-strength-s = <6>;
+	};
+	pcfg_pull_down_0_6ma: pcfg-pull-down-0-6ma {
+		bias-pull-down;
+		drive-strength-s = <6>;
+	};
 
-		/* 4ma for px30 and 6ma for px30s */
-		pcfg_pull_none_4_6ma: pcfg-pull-none-4-6ma {
-			bias-disable;
-			drive-strength = <4>;
-			drive-strength-s = <6>;
-		};
-		pcfg_pull_up_4_6ma: pcfg-pull-up-4-6ma {
-			bias-pull-up;
-			drive-strength = <4>;
-			drive-strength-s = <6>;
-		};
-		pcfg_pull_down_4_6ma: pcfg-pull-down-4-6ma {
-			bias-pull-down;
-			drive-strength = <4>;
-			drive-strength-s = <6>;
-		};
+	/* 4ma for px30 and 6ma for px30s */
+	pcfg_pull_none_4_6ma: pcfg-pull-none-4-6ma {
+		bias-disable;
+		drive-strength = <4>;
+		drive-strength-s = <6>;
+	};
+	pcfg_pull_up_4_6ma: pcfg-pull-up-4-6ma {
+		bias-pull-up;
+		drive-strength = <4>;
+		drive-strength-s = <6>;
+	};
+	pcfg_pull_down_4_6ma: pcfg-pull-down-4-6ma {
+		bias-pull-down;
+		drive-strength = <4>;
+		drive-strength-s = <6>;
+	};
 
-		/* 8ma for px30 and 6ma for px30s */
-		pcfg_pull_none_8_6ma: pcfg-pull-none-8-6ma {
-			bias-disable;
-			drive-strength = <8>;
-			drive-strength-s = <6>;
-		};
-		pcfg_pull_up_8_6ma: pcfg-pull-up-8-6ma {
-			bias-pull-up;
-			drive-strength = <8>;
-			drive-strength-s = <6>;
-		};
-		pcfg_pull_down_8_6ma: pcfg-pull-down-8-6ma {
-			bias-pull-down;
-			drive-strength = <8>;
-			drive-strength-s = <6>;
-		};
+	/* 8ma for px30 and 6ma for px30s */
+	pcfg_pull_none_8_6ma: pcfg-pull-none-8-6ma {
+		bias-disable;
+		drive-strength = <8>;
+		drive-strength-s = <6>;
+	};
+	pcfg_pull_up_8_6ma: pcfg-pull-up-8-6ma {
+		bias-pull-up;
+		drive-strength = <8>;
+		drive-strength-s = <6>;
+	};
+	pcfg_pull_down_8_6ma: pcfg-pull-down-8-6ma {
+		bias-pull-down;
+		drive-strength = <8>;
+		drive-strength-s = <6>;
+	};
 
-		/* 8ma for px30 and 4ma for px30s */
-		pcfg_pull_none_8_4ma: pcfg-pull-none-8-4ma {
-			bias-disable;
-			drive-strength = <8>;
-			drive-strength-s = <4>;
-		};
-		pcfg_pull_up_8_4ma: pcfg-pull-up-8-4ma {
-			bias-pull-up;
-			drive-strength = <8>;
-			drive-strength-s = <4>;
-		};
-		pcfg_pull_down_8_4ma: pcfg-pull-down-8-4ma {
-			bias-pull-down;
-			drive-strength = <8>;
-			drive-strength-s = <4>;
-		};
+	/* 8ma for px30 and 4ma for px30s */
+	pcfg_pull_none_8_4ma: pcfg-pull-none-8-4ma {
+		bias-disable;
+		drive-strength = <8>;
+		drive-strength-s = <4>;
+	};
+	pcfg_pull_up_8_4ma: pcfg-pull-up-8-4ma {
+		bias-pull-up;
+		drive-strength = <8>;
+		drive-strength-s = <4>;
+	};
+	pcfg_pull_down_8_4ma: pcfg-pull-down-8-4ma {
+		bias-pull-down;
+		drive-strength = <8>;
+		drive-strength-s = <4>;
+	};
 
-		/* 12ma for px30 and 4ma for px30s */
-		pcfg_pull_none_12_4ma: pcfg-pull-none-12-4ma {
-			bias-disable;
-			drive-strength = <12>;
-			drive-strength-s = <4>;
-		};
-		pcfg_pull_up_12_4ma: pcfg-pull-up-12-4ma {
-			bias-pull-up;
-			drive-strength = <12>;
-			drive-strength-s = <4>;
-		};
-		pcfg_pull_down_12_4ma: pcfg-pull-down-12-4ma {
-			bias-pull-down;
-			drive-strength = <12>;
-			drive-strength-s = <4>;
-		};
+	/* 12ma for px30 and 4ma for px30s */
+	pcfg_pull_none_12_4ma: pcfg-pull-none-12-4ma {
+		bias-disable;
+		drive-strength = <12>;
+		drive-strength-s = <4>;
+	};
+	pcfg_pull_up_12_4ma: pcfg-pull-up-12-4ma {
+		bias-pull-up;
+		drive-strength = <12>;
+		drive-strength-s = <4>;
+	};
+	pcfg_pull_down_12_4ma: pcfg-pull-down-12-4ma {
+		bias-pull-down;
+		drive-strength = <12>;
+		drive-strength-s = <4>;
+	};
 
-		/* 12ma for px30 and 6ma for px30s */
-		pcfg_pull_none_12_6ma: pcfg-pull-none-12-6ma {
-			bias-disable;
-			drive-strength = <12>;
-			drive-strength-s = <6>;
-		};
-		pcfg_pull_up_12_6ma: pcfg-pull-up-12-6ma {
-			bias-pull-up;
-			drive-strength = <12>;
-			drive-strength-s = <6>;
-		};
-		pcfg_pull_down_12_6ma: pcfg-pull-down-12-6ma {
-			bias-pull-down;
-			drive-strength = <12>;
-			drive-strength-s = <6>;
-		};
+	/* 12ma for px30 and 6ma for px30s */
+	pcfg_pull_none_12_6ma: pcfg-pull-none-12-6ma {
+		bias-disable;
+		drive-strength = <12>;
+		drive-strength-s = <6>;
+	};
+	pcfg_pull_up_12_6ma: pcfg-pull-up-12-6ma {
+		bias-pull-up;
+		drive-strength = <12>;
+		drive-strength-s = <6>;
+	};
+	pcfg_pull_down_12_6ma: pcfg-pull-down-12-6ma {
+		bias-pull-down;
+		drive-strength = <12>;
+		drive-strength-s = <6>;
 	};
 };
 
@@ -126,47 +123,47 @@
 	emmc {
 		emmc_clk: emmc-clk {
 			rockchip,pins =
-				<1 RK_PB1 RK_FUNC_2 &pcfg_pull_none_8_6ma>;
+				<1 RK_PB1 2 &pcfg_pull_none_8_6ma>;
 		};
 
 		emmc_cmd: emmc-cmd {
 			rockchip,pins =
-				<1 RK_PB2 RK_FUNC_2 &pcfg_pull_up_8_6ma>;
+				<1 RK_PB2 2 &pcfg_pull_up_8_6ma>;
 		};
 
 		emmc_pwren: emmc-pwren {
 			rockchip,pins =
-				<1 RK_PB0 RK_FUNC_2 &pcfg_pull_none>;
+				<1 RK_PB0 2 &pcfg_pull_none>;
 		};
 
 		emmc_rstnout: emmc-rstnout {
 			rockchip,pins =
-				<1 RK_PB3 RK_FUNC_2 &pcfg_pull_none>;
+				<1 RK_PB3 2 &pcfg_pull_none>;
 		};
 
 		emmc_bus1: emmc-bus1 {
 			rockchip,pins =
-				<1 RK_PA0 RK_FUNC_2 &pcfg_pull_up_8_6ma>;
+				<1 RK_PA0 2 &pcfg_pull_up_8_6ma>;
 		};
 
 		emmc_bus4: emmc-bus4 {
 			rockchip,pins =
-				<1 RK_PA0 RK_FUNC_2 &pcfg_pull_up_8_6ma>,
-				<1 RK_PA1 RK_FUNC_2 &pcfg_pull_up_8_6ma>,
-				<1 RK_PA2 RK_FUNC_2 &pcfg_pull_up_8_6ma>,
-				<1 RK_PA3 RK_FUNC_2 &pcfg_pull_up_8_6ma>;
+				<1 RK_PA0 2 &pcfg_pull_up_8_6ma>,
+				<1 RK_PA1 2 &pcfg_pull_up_8_6ma>,
+				<1 RK_PA2 2 &pcfg_pull_up_8_6ma>,
+				<1 RK_PA3 2 &pcfg_pull_up_8_6ma>;
 		};
 
 		emmc_bus8: emmc-bus8 {
 			rockchip,pins =
-				<1 RK_PA0 RK_FUNC_2 &pcfg_pull_up_8_6ma>,
-				<1 RK_PA1 RK_FUNC_2 &pcfg_pull_up_8_6ma>,
-				<1 RK_PA2 RK_FUNC_2 &pcfg_pull_up_8_6ma>,
-				<1 RK_PA3 RK_FUNC_2 &pcfg_pull_up_8_6ma>,
-				<1 RK_PA4 RK_FUNC_2 &pcfg_pull_up_8_6ma>,
-				<1 RK_PA5 RK_FUNC_2 &pcfg_pull_up_8_6ma>,
-				<1 RK_PA6 RK_FUNC_2 &pcfg_pull_up_8_6ma>,
-				<1 RK_PA7 RK_FUNC_2 &pcfg_pull_up_8_6ma>;
+				<1 RK_PA0 2 &pcfg_pull_up_8_6ma>,
+				<1 RK_PA1 2 &pcfg_pull_up_8_6ma>,
+				<1 RK_PA2 2 &pcfg_pull_up_8_6ma>,
+				<1 RK_PA3 2 &pcfg_pull_up_8_6ma>,
+				<1 RK_PA4 2 &pcfg_pull_up_8_6ma>,
+				<1 RK_PA5 2 &pcfg_pull_up_8_6ma>,
+				<1 RK_PA6 2 &pcfg_pull_up_8_6ma>,
+				<1 RK_PA7 2 &pcfg_pull_up_8_6ma>;
 		};
 	};
 };

--
Gitblit v1.6.2