hc
2024-08-13 72be3801e63d82671c9d90577a9efb3126a6aa37
kernel/arch/arm64/boot/dts/rockchip/NK-6A13_V0A.dtsi
....@@ -134,7 +134,7 @@
134134 rk_headset: rk-headset {
135135 status = "okay";
136136 compatible = "rockchip_headset";
137
- headset_gpio = <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>;//HP_DET_L_GPIO3_D5_d_3V3
137
+ headset_gpio = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>;//HP_DET_L_GPIO3_D5_d_3V3
138138 spk_ctl_gpio = <&gpio4 RK_PB4 GPIO_ACTIVE_LOW>;//SPK_CTL_GPIO4_B4_u_3V3
139139 pinctrl-names = "default";
140140 pinctrl-0 = <&hp_det>;
....@@ -896,7 +896,7 @@
896896
897897 headphone {
898898 hp_det: hp-det {
899
- rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
899
+ rockchip,pins = <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
900900 };
901901
902902 spk_con: spk-con {
....@@ -975,17 +975,15 @@
975975 <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>,
976976 <2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,
977977 <2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>,
978
- <4 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>, //vcc_5v
979
- <0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>, //I2C4_SDA_M2_3V3
980
- <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>, //I2C4_SCL_M2_3V3
981
- <4 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>, //I2C5_SDA_M2_3V3
982
- <4 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>, //I2C5_SCL_M2_3V3
983
- <1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>, //SPI0_MISO_M2_1V8
984
- <1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>, //SPI0_MISO_M2_1V8
985
- <1 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>, //SPI0_CLK_M2_1V8
986
- <1 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>, //SPI0_CS0_M2_1V8
987
- <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>, //SPI4_MISO_M2_1V8
988
- <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>; //SPI4_MOSI_M2_1V8
978
+ <4 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>, //vcc_5v
979
+ <1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>, //SPI0_MISO_M2_1V8 41
980
+ <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>, //SPI4_MISO_M2_1V8 32
981
+ <1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>, //SPI0_MOSI_M2_3V3 42
982
+ <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>, //SPI4_MOSI_M2_1V8 33
983
+ <1 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>, //SPI0_CLK_M2_1V8 43
984
+ <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>, //SPI4_CLK_M2_1V8 34
985
+ <1 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>, //SPI0_CS0_M2_1V8 44
986
+ <1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>; //SPI4_CS0_M2_1V8 35
989987 };
990988 };
991989 };
....@@ -1153,6 +1151,8 @@
11531151
11541152 &can0 {
11551153 status = "okay";
1154
+ pinctrl-names = "default";
1155
+ pinctrl-0 = <&can0m0_pins>;
11561156 };
11571157
11581158