From 62c46c9150c4afde7e5b25436263fddf79d66f0b Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Fri, 16 Aug 2024 02:15:25 +0000
Subject: [PATCH] del .mod
---
kernel/arch/arm64/boot/dts/rockchip/NK-6A13_V0A.dtsi | 46 +++++++++++++++++++++++++---------------------
1 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/kernel/arch/arm64/boot/dts/rockchip/NK-6A13_V0A.dtsi b/kernel/arch/arm64/boot/dts/rockchip/NK-6A13_V0A.dtsi
index 69b88b7..ec9d948 100755
--- a/kernel/arch/arm64/boot/dts/rockchip/NK-6A13_V0A.dtsi
+++ b/kernel/arch/arm64/boot/dts/rockchip/NK-6A13_V0A.dtsi
@@ -134,7 +134,7 @@
rk_headset: rk-headset {
status = "okay";
compatible = "rockchip_headset";
- headset_gpio = <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>;//HP_DET_L_GPIO3_D5_d_3V3
+ headset_gpio = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>;//HP_DET_L_GPIO3_D5_d_3V3
spk_ctl_gpio = <&gpio4 RK_PB4 GPIO_ACTIVE_LOW>;//SPK_CTL_GPIO4_B4_u_3V3
pinctrl-names = "default";
pinctrl-0 = <&hp_det>;
@@ -365,13 +365,13 @@
};
&backlight {
- pwms = <&pwm10 0 25000 0>;
+ pwms = <&pwm3 0 25000 0>;
status = "okay";
};
&backlight1 {
pwms = <&pwm11 0 25000 0>;
- status = "okay";
+ status = "disabled";
};
&combphy0_ps {
@@ -517,12 +517,12 @@
/* Should work with at least 128MB cma reserved above. */
&hdmirx_ctrler {
- status = "disabled";
+ status = "okay";
#sound-dai-cells = <1>;
/* Effective level used to trigger HPD: 0-low, 1-high */
hpd-trigger-level = <1>;
- hdmirx-det-gpios = <&gpio1 RK_PD5 GPIO_ACTIVE_LOW>;
+ hdmirx-det-gpios = <&gpio1 RK_PB6 GPIO_ACTIVE_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&hdmim1_rx &hdmirx_det>;
};
@@ -890,13 +890,13 @@
hdmi {
hdmirx_det: hdmirx-det {
- rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_up>;
+ rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
headphone {
hp_det: hp-det {
- rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
+ rockchip,pins = <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
};
spk_con: spk-con {
@@ -975,23 +975,21 @@
<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>,
<2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,
<2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>,
- <4 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>, //vcc_5v
- <0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>, //I2C4_SDA_M2_3V3
- <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>, //I2C4_SCL_M2_3V3
- <4 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>, //I2C5_SDA_M2_3V3
- <4 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>, //I2C5_SCL_M2_3V3
- <1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>, //SPI0_MISO_M2_1V8
- <1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>, //SPI0_MISO_M2_1V8
- <1 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>, //SPI0_CLK_M2_1V8
- <1 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>, //SPI0_CS0_M2_1V8
- <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>, //SPI4_MISO_M2_1V8
- <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>; //SPI4_MOSI_M2_1V8
+ <4 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>, //vcc_5v
+ <1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>, //SPI0_MISO_M2_1V8 41
+ <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>, //SPI4_MISO_M2_1V8 32
+ <1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>, //SPI0_MOSI_M2_3V3 42
+ <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>, //SPI4_MOSI_M2_1V8 33
+ <1 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>, //SPI0_CLK_M2_1V8 43
+ <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>, //SPI4_CLK_M2_1V8 34
+ <1 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>, //SPI0_CS0_M2_1V8 44
+ <1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>; //SPI4_CS0_M2_1V8 35
};
};
};
&pwm3 {
- pinctrl-0 = <&pwm3m1_pins>;
status = "okay";
+ pinctrl-0 = <&pwm3m1_pins>;
};
&route_dsi0 {
@@ -1005,12 +1003,12 @@
};
&pwm10 {
- status = "okay";
+ status = "disabled";
pinctrl-0 = <&pwm10m2_pins>;
};
&pwm11 {
- status = "okay";
+ status = "disabled";
pinctrl-0 = <&pwm11m3_pins>;
};
@@ -1024,6 +1022,10 @@
&sata0 {
status = "disabled";
+};
+
+&sata2 {
+ status = "okay";
};
&sdio {
@@ -1153,6 +1155,8 @@
&can0 {
status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&can0m0_pins>;
};
--
Gitblit v1.6.2