github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 22:14:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

arm64: dts: rockchip: bulk convert gpios to their constant counterparts (v2)

Browse Source 
According to upstream commit d64420e816 ("arm64: dts: rockchip:
bulk convert gpios to their constant counterparts") replace
RK_FUNC_x -> x and RK_GPIOx -> x.

sed -i -e "
/rockchip,pins *=/bcheck
b # to end of script
:append-next-line
N
:check
/^[^;]*$/bappend-next-line
s/<RK_GPIO\([0-9]\) /<\1 /g
s/<\([^ ][^ ]*  *\)0 /<\1RK_PA0 /g
s/<\([^ ][^ ]*  *\)1 /<\1RK_PA1 /g
s/<\([^ ][^ ]*  *\)2 /<\1RK_PA2 /g
s/<\([^ ][^ ]*  *\)3 /<\1RK_PA3 /g
s/<\([^ ][^ ]*  *\)4 /<\1RK_PA4 /g
s/<\([^ ][^ ]*  *\)5 /<\1RK_PA5 /g
s/<\([^ ][^ ]*  *\)6 /<\1RK_PA6 /g
s/<\([^ ][^ ]*  *\)7 /<\1RK_PA7 /g
s/<\([^ ][^ ]*  *\)8 /<\1RK_PB0 /g
s/<\([^ ][^ ]*  *\)9 /<\1RK_PB1 /g
s/<\([^ ][^ ]*  *\)10 /<\1RK_PB2 /g
s/<\([^ ][^ ]*  *\)11 /<\1RK_PB3 /g
s/<\([^ ][^ ]*  *\)12 /<\1RK_PB4 /g
s/<\([^ ][^ ]*  *\)13 /<\1RK_PB5 /g
s/<\([^ ][^ ]*  *\)14 /<\1RK_PB6 /g
s/<\([^ ][^ ]*  *\)15 /<\1RK_PB7 /g
s/<\([^ ][^ ]*  *\)16 /<\1RK_PC0 /g
s/<\([^ ][^ ]*  *\)17 /<\1RK_PC1 /g
s/<\([^ ][^ ]*  *\)18 /<\1RK_PC2 /g
s/<\([^ ][^ ]*  *\)19 /<\1RK_PC3 /g
s/<\([^ ][^ ]*  *\)20 /<\1RK_PC4 /g
s/<\([^ ][^ ]*  *\)21 /<\1RK_PC5 /g
s/<\([^ ][^ ]*  *\)22 /<\1RK_PC6 /g
s/<\([^ ][^ ]*  *\)23 /<\1RK_PC7 /g
s/<\([^ ][^ ]*  *\)24 /<\1RK_PD0 /g
s/<\([^ ][^ ]*  *\)25 /<\1RK_PD1 /g
s/<\([^ ][^ ]*  *\)26 /<\1RK_PD2 /g
s/<\([^ ][^ ]*  *\)27 /<\1RK_PD3 /g
s/<\([^ ][^ ]*  *\)28 /<\1RK_PD4 /g
s/<\([^ ][^ ]*  *\)29 /<\1RK_PD5 /g
s/<\([^ ][^ ]*  *\)30 /<\1RK_PD6 /g
s/<\([^ ][^ ]*  *\)31 /<\1RK_PD7 /g
s/<\([^ ][^ ]*  *[^ ][^ ]*  *\)0 /<\1RK_FUNC_GPIO /g
s/<\([^ ][^ ]*  *[^ ][^ ]*  *\)RK_FUNC_\([1-9]\) /<\1\2 /g
" *.dts *.dtsi

Change-Id: I789e702620a4d0331d54474d48aaf68133795859
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
This commit is contained in:
Tao Huang 2021-03-25 19:40:11 +08:00
parent f2c8914ffe
commit 77bcbf172b
86 changed files with 711 additions and 711 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
arch/arm64/boot/dts/rockchip/px30-ad-d6-anx6345.dts
View File

@ -639,34 +639,34 @@ &pinctrl {
lcdc {
lcdc_rgb_pins: lcdc-rgb-pins {
rockchip,pins =
<3 RK_PA0 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_DCLK */
<3 RK_PA1 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_HSYNC */
<3 RK_PA2 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_VSYNC */
<3 RK_PA3 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_DEN */
<3 RK_PD3 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D23 */
<3 RK_PD2 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D22 */
<3 RK_PD1 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D21 */
<3 RK_PD0 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D20 */
<3 RK_PC7 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D19 */
<3 RK_PC6 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D18 */
<3 RK_PC5 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D17 */
<3 RK_PC4 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D16 */
<3 RK_PC3 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D15 */
<3 RK_PC2 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D14 */
<3 RK_PC1 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D13 */
<3 RK_PC0 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D12 */
<3 RK_PB7 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D11 */
<3 RK_PB6 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D10 */
<3 RK_PB5 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D9 */
<3 RK_PB4 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D8 */
<3 RK_PB3 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D7 */
<3 RK_PB2 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D6 */
<3 RK_PB1 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D5 */
<3 RK_PB0 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D4 */
<3 RK_PA7 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D3 */
<3 RK_PA6 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D2 */
<3 RK_PA5 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D1 */
<3 RK_PA4 RK_FUNC_1 &pcfg_pull_none_8ma>; /* LCDC_D0 */
<3 RK_PA0 1 &pcfg_pull_none_8ma>, /* LCDC_DCLK */
<3 RK_PA1 1 &pcfg_pull_none_8ma>, /* LCDC_HSYNC */
<3 RK_PA2 1 &pcfg_pull_none_8ma>, /* LCDC_VSYNC */
<3 RK_PA3 1 &pcfg_pull_none_8ma>, /* LCDC_DEN */
<3 RK_PD3 1 &pcfg_pull_none_8ma>, /* LCDC_D23 */
<3 RK_PD2 1 &pcfg_pull_none_8ma>, /* LCDC_D22 */
<3 RK_PD1 1 &pcfg_pull_none_8ma>, /* LCDC_D21 */
<3 RK_PD0 1 &pcfg_pull_none_8ma>, /* LCDC_D20 */
<3 RK_PC7 1 &pcfg_pull_none_8ma>, /* LCDC_D19 */
<3 RK_PC6 1 &pcfg_pull_none_8ma>, /* LCDC_D18 */
<3 RK_PC5 1 &pcfg_pull_none_8ma>, /* LCDC_D17 */
<3 RK_PC4 1 &pcfg_pull_none_8ma>, /* LCDC_D16 */
<3 RK_PC3 1 &pcfg_pull_none_8ma>, /* LCDC_D15 */
<3 RK_PC2 1 &pcfg_pull_none_8ma>, /* LCDC_D14 */
<3 RK_PC1 1 &pcfg_pull_none_8ma>, /* LCDC_D13 */
<3 RK_PC0 1 &pcfg_pull_none_8ma>, /* LCDC_D12 */
<3 RK_PB7 1 &pcfg_pull_none_8ma>, /* LCDC_D11 */
<3 RK_PB6 1 &pcfg_pull_none_8ma>, /* LCDC_D10 */
<3 RK_PB5 1 &pcfg_pull_none_8ma>, /* LCDC_D9 */
<3 RK_PB4 1 &pcfg_pull_none_8ma>, /* LCDC_D8 */
<3 RK_PB3 1 &pcfg_pull_none_8ma>, /* LCDC_D7 */
<3 RK_PB2 1 &pcfg_pull_none_8ma>, /* LCDC_D6 */
<3 RK_PB1 1 &pcfg_pull_none_8ma>, /* LCDC_D5 */
<3 RK_PB0 1 &pcfg_pull_none_8ma>, /* LCDC_D4 */
<3 RK_PA7 1 &pcfg_pull_none_8ma>, /* LCDC_D3 */
<3 RK_PA6 1 &pcfg_pull_none_8ma>, /* LCDC_D2 */
<3 RK_PA5 1 &pcfg_pull_none_8ma>, /* LCDC_D1 */
<3 RK_PA4 1 &pcfg_pull_none_8ma>; /* LCDC_D0 */
};
lcdc_sleep_pins: lcdc-sleep-pins {
@ -715,12 +715,12 @@ soc_slppin_gpio: soc_slppin_gpio {
soc_slppin_slp: soc_slppin_slp {
rockchip,pins =
<0 RK_PA4 RK_FUNC_1 &pcfg_pull_none>;
<0 RK_PA4 1 &pcfg_pull_none>;
};
soc_slppin_rst: soc_slppin_rst {
rockchip,pins =
<0 RK_PA4 RK_FUNC_2 &pcfg_pull_none>;
<0 RK_PA4 2 &pcfg_pull_none>;
};
};

2
arch/arm64/boot/dts/rockchip/px30-ad-r35-mb.dtsi
View File

@ -784,7 +784,7 @@ &pinctrl {
pmic {
pmic_int: pmic_int {
rockchip,pins =
<0 7 RK_FUNC_GPIO &pcfg_pull_up>;
<0 RK_PA7 RK_FUNC_GPIO &pcfg_pull_up>;
};
};

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

@ -527,7 +527,7 @@ &pinctrl {
pmic {
pmic_int: pmic_int {
rockchip,pins =
<0 7 RK_FUNC_GPIO &pcfg_pull_up>;
<0 RK_PA7 RK_FUNC_GPIO &pcfg_pull_up>;
};
};

4
arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-linux.dts
View File

@ -914,12 +914,12 @@ soc_slppin_gpio: soc_slppin_gpio {
soc_slppin_slp: soc_slppin_slp {
rockchip,pins =
<0 RK_PA4 RK_FUNC_1 &pcfg_pull_none>;
<0 RK_PA4 1 &pcfg_pull_none>;
};
soc_slppin_rst: soc_slppin_rst {
rockchip,pins =
<0 RK_PA4 RK_FUNC_2 &pcfg_pull_none>;
<0 RK_PA4 2 &pcfg_pull_none>;
};
};

4
arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-linux.dts
View File

@ -603,12 +603,12 @@ soc_slppin_gpio: soc_slppin_gpio {
soc_slppin_slp: soc_slppin_slp {
rockchip,pins =
<0 RK_PA4 RK_FUNC_1 &pcfg_pull_none>;
<0 RK_PA4 1 &pcfg_pull_none>;
};
soc_slppin_rst: soc_slppin_rst {
rockchip,pins =
<0 RK_PA4 RK_FUNC_2 &pcfg_pull_none>;
<0 RK_PA4 2 &pcfg_pull_none>;
};
};

4
arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10-robot-no-gpu-linux.dts
View File

@ -603,12 +603,12 @@ soc_slppin_gpio: soc_slppin_gpio {
soc_slppin_slp: soc_slppin_slp {
rockchip,pins =
<0 RK_PA4 RK_FUNC_1 &pcfg_pull_none>;
<0 RK_PA4 1 &pcfg_pull_none>;
};
soc_slppin_rst: soc_slppin_rst {
rockchip,pins =
<0 RK_PA4 RK_FUNC_2 &pcfg_pull_none>;
<0 RK_PA4 2 &pcfg_pull_none>;
};
};

4
arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dtsi
View File

@ -650,12 +650,12 @@ soc_slppin_gpio: soc_slppin_gpio {
soc_slppin_slp: soc_slppin_slp {
rockchip,pins =
<0 RK_PA4 RK_FUNC_1 &pcfg_pull_none>;
<0 RK_PA4 1 &pcfg_pull_none>;
};
soc_slppin_rst: soc_slppin_rst {
rockchip,pins =
<0 RK_PA4 RK_FUNC_2 &pcfg_pull_none>;
<0 RK_PA4 2 &pcfg_pull_none>;
};
};

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

@ -701,12 +701,12 @@ soc_slppin_gpio: soc_slppin_gpio {
soc_slppin_slp: soc_slppin_slp {
rockchip,pins =
<0 RK_PA4 RK_FUNC_1 &pcfg_pull_none>;
<0 RK_PA4 1 &pcfg_pull_none>;
};
soc_slppin_rst: soc_slppin_rst {
rockchip,pins =
<0 RK_PA4 RK_FUNC_2 &pcfg_pull_none>;
<0 RK_PA4 2 &pcfg_pull_none>;
};
};

4
arch/arm64/boot/dts/rockchip/px30-z7-a0-rk618-dsi.dts
View File

@ -831,12 +831,12 @@ soc_slppin_gpio: soc_slppin_gpio {
soc_slppin_slp: soc_slppin_slp {
rockchip,pins =
<0 RK_PA4 RK_FUNC_1 &pcfg_pull_none>;
<0 RK_PA4 1 &pcfg_pull_none>;
};
soc_slppin_rst: soc_slppin_rst {
rockchip,pins =
<0 RK_PA4 RK_FUNC_2 &pcfg_pull_none>;
<0 RK_PA4 2 &pcfg_pull_none>;
};
};

14
arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi
View File

@ -667,12 +667,12 @@ &pinctrl {
pmic {
pmic_int: pmic_int {
rockchip,pins =
<0 RK_PA1 0 &pcfg_pull_up>;
<0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
};
soc_slppin_gpio: soc_slppin_gpio {
rockchip,pins =
<0 RK_PA4 0 &pcfg_output_low>;
<0 RK_PA4 RK_FUNC_GPIO &pcfg_output_low>;
};
soc_slppin_slp: soc_slppin_slp {
@ -682,33 +682,33 @@ soc_slppin_slp: soc_slppin_slp {
vsel_gpio: vsel-gpio {
rockchip,pins =
<0 RK_PA5 0 &pcfg_pull_down>;
<0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins =
<4 RK_PC0 0 &pcfg_pull_none>;
<4 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
usb2 {
otg_vbus_drv: otg-vbus-drv {
rockchip,pins = <0 RK_PB7 0 &pcfg_pull_none>;
rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
wireless-bluetooth {
uart4_rts_gpio: uart4-rts-gpio {
rockchip,pins = <4 RK_PB7 0 &pcfg_pull_none>;
rockchip,pins = <4 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
wireless-wlan {
wifi_wake_host: wifi-wake-host {
rockchip,pins =
<4 RK_PC1 0 &pcfg_pull_up>;
<4 RK_PC1 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
};

2
arch/arm64/boot/dts/rockchip/rk1808.dtsi
View File

@ -3016,7 +3016,7 @@ uart7_xfer: uart7-xfer {
tsadc {
tsadc_otp_gpio: tsadc-otp-gpio {
rockchip,pins =
<0 RK_PA6 0 &pcfg_pull_none>;
<0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
};
tsadc_otp_out: tsadc-otp-out {

8
arch/arm64/boot/dts/rockchip/rk3308-ai-va-v10.dts
View File

@ -604,19 +604,19 @@ &pinctrl {
buttons {
mic_mute: mic-mute {
rockchip,pins = <0 RK_PC0 0 &pcfg_pull_up>;
rockchip,pins = <0 RK_PC0 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
rotary {
rotary_gpio: rotary-gpio {
rockchip,pins =
<2 RK_PB3 0 &pcfg_pull_none>,
<2 RK_PB4 0 &pcfg_pull_none>;
<2 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>,
<2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins = <0 RK_PA2 0 &pcfg_pull_none>;
rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

6
arch/arm64/boot/dts/rockchip/rk3308-evb-ext-v10.dtsi
View File

@ -196,11 +196,11 @@ spi_panel {
spi_init_cmd: spi-init-cmd {
rockchip,pins =
/* spi sdi */
<1 RK_PC7 0 &pcfg_pull_none>,
<1 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>,
/* spi scl */
<1 RK_PD0 0 &pcfg_pull_none>,
<1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>,
/* spi cs */
<1 RK_PD1 0 &pcfg_pull_none>;
<1 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

6
arch/arm64/boot/dts/rockchip/rk3308-evb-v10.dtsi
View File

@ -721,20 +721,20 @@ &pinctrl {
buttons {
pwr_key: pwr-key {
rockchip,pins = <0 RK_PA6 0 &pcfg_pull_up>;
rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
usb {
usb_drv: usb-drv {
rockchip,pins =
<0 RK_PC5 0 &pcfg_pull_none>;
<0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins = <0 RK_PA2 0 &pcfg_pull_none>;
rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

8
arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi
View File

@ -771,25 +771,25 @@ &pinctrl {
buttons {
pwr_key: pwr-key {
rockchip,pins = <0 RK_PA6 0 &pcfg_pull_up>;
rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
usb {
usb_drv: usb-drv {
rockchip,pins = <0 RK_PC5 0 &pcfg_pull_none>;
rockchip,pins = <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins = <0 RK_PA2 0 &pcfg_pull_none>;
rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
wireless-wlan {
wifi_wake_host: wifi-wake-host {
rockchip,pins = <0 RK_PA0 0 &pcfg_pull_up>;
rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
};

8
arch/arm64/boot/dts/rockchip/rk3308b-evb-v10.dtsi
View File

@ -676,25 +676,25 @@ &pinctrl {
buttons {
pwr_key: pwr-key {
rockchip,pins = <0 RK_PA6 0 &pcfg_pull_up>;
rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
usb {
usb_drv: usb-drv {
rockchip,pins = <0 RK_PC5 0 &pcfg_pull_none>;
rockchip,pins = <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins = <4 RK_PD6 0 &pcfg_pull_none>;
rockchip,pins = <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
wireless-wlan {
wifi_wake_host: wifi-wake-host {
rockchip,pins = <2 RK_PB4 0 &pcfg_pull_up>;
rockchip,pins = <2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
};

4
arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dtsi
View File

@ -685,12 +685,12 @@ soc_slppin_gpio: soc_slppin_gpio {
soc_slppin_slp: soc_slppin_slp {
rockchip,pins =
<0 RK_PA4 RK_FUNC_1 &pcfg_pull_none>;
<0 RK_PA4 1 &pcfg_pull_none>;
};
soc_slppin_rst: soc_slppin_rst {
rockchip,pins =
<0 RK_PA4 RK_FUNC_2 &pcfg_pull_none>;
<0 RK_PA4 2 &pcfg_pull_none>;
};
};

28
arch/arm64/boot/dts/rockchip/rk3326-86v-v10.dts
View File

@ -622,18 +622,18 @@ hp_det: hp-det {
lcdc {
lcdc_m1_rgb_pins: lcdc-m1-rgb-pins {
rockchip,pins =
<3 RK_PA0 RK_FUNC_1 &pcfg_pull_none>, /* LCDC_DCLK */
<3 RK_PA4 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D0 */
<3 RK_PA6 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D2 */
<3 RK_PB2 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D6 */
<3 RK_PB3 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D7 */
<3 RK_PB5 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D9 */
<3 RK_PC0 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D12 */
<3 RK_PC1 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D13 */
<3 RK_PC2 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D14 */
<3 RK_PC3 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D15 */
<3 RK_PC4 RK_FUNC_1 &pcfg_pull_none_8ma>, /* LCDC_D16 */
<3 RK_PC5 RK_FUNC_1 &pcfg_pull_none_8ma>; /* LCDC_D17 */
<3 RK_PA0 1 &pcfg_pull_none>, /* LCDC_DCLK */
<3 RK_PA4 1 &pcfg_pull_none_8ma>, /* LCDC_D0 */
<3 RK_PA6 1 &pcfg_pull_none_8ma>, /* LCDC_D2 */
<3 RK_PB2 1 &pcfg_pull_none_8ma>, /* LCDC_D6 */
<3 RK_PB3 1 &pcfg_pull_none_8ma>, /* LCDC_D7 */
<3 RK_PB5 1 &pcfg_pull_none_8ma>, /* LCDC_D9 */
<3 RK_PC0 1 &pcfg_pull_none_8ma>, /* LCDC_D12 */
<3 RK_PC1 1 &pcfg_pull_none_8ma>, /* LCDC_D13 */
<3 RK_PC2 1 &pcfg_pull_none_8ma>, /* LCDC_D14 */
<3 RK_PC3 1 &pcfg_pull_none_8ma>, /* LCDC_D15 */
<3 RK_PC4 1 &pcfg_pull_none_8ma>, /* LCDC_D16 */
<3 RK_PC5 1 &pcfg_pull_none_8ma>; /* LCDC_D17 */
};
lcdc_m1_sleep_pins: lcdc-m1-sleep-pins {
@ -666,12 +666,12 @@ soc_slppin_gpio: soc_slppin_gpio {
soc_slppin_slp: soc_slppin_slp {
rockchip,pins =
<0 RK_PA4 RK_FUNC_1 &pcfg_pull_none>;
<0 RK_PA4 1 &pcfg_pull_none>;
};
soc_slppin_rst: soc_slppin_rst {
rockchip,pins =
<0 RK_PA4 RK_FUNC_2 &pcfg_pull_none>;
<0 RK_PA4 2 &pcfg_pull_none>;
};
};

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

@ -1117,12 +1117,12 @@ soc_slppin_gpio: soc_slppin_gpio {
soc_slppin_slp: soc_slppin_slp {
rockchip,pins =
<0 RK_PA4 RK_FUNC_1 &pcfg_pull_none>;
<0 RK_PA4 1 &pcfg_pull_none>;
};
soc_slppin_rst: soc_slppin_rst {
rockchip,pins =
<0 RK_PA4 RK_FUNC_2 &pcfg_pull_none>;
<0 RK_PA4 2 &pcfg_pull_none>;
};
};

4
arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11-i2s-dmic.dts
View File

@ -1132,12 +1132,12 @@ soc_slppin_gpio: soc_slppin_gpio {
soc_slppin_slp: soc_slppin_slp {
rockchip,pins =
<0 RK_PA4 RK_FUNC_1 &pcfg_pull_none>;
<0 RK_PA4 1 &pcfg_pull_none>;
};
soc_slppin_rst: soc_slppin_rst {
rockchip,pins =
<0 RK_PA4 RK_FUNC_2 &pcfg_pull_none>;
<0 RK_PA4 2 &pcfg_pull_none>;
};
};

4
arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v11.dts
View File

@ -1119,12 +1119,12 @@ soc_slppin_gpio: soc_slppin_gpio {
soc_slppin_slp: soc_slppin_slp {
rockchip,pins =
<0 RK_PA4 RK_FUNC_1 &pcfg_pull_none>;
<0 RK_PA4 1 &pcfg_pull_none>;
};
soc_slppin_rst: soc_slppin_rst {
rockchip,pins =
<0 RK_PA4 RK_FUNC_2 &pcfg_pull_none>;
<0 RK_PA4 2 &pcfg_pull_none>;
};
};

4
arch/arm64/boot/dts/rockchip/rk3326-evb-ai-va-v12.dts
View File

@ -1119,12 +1119,12 @@ soc_slppin_gpio: soc_slppin_gpio {
soc_slppin_slp: soc_slppin_slp {
rockchip,pins =
<0 RK_PA4 RK_FUNC_1 &pcfg_pull_none>;
<0 RK_PA4 1 &pcfg_pull_none>;
};
soc_slppin_rst: soc_slppin_rst {
rockchip,pins =
<0 RK_PA4 RK_FUNC_2 &pcfg_pull_none>;
<0 RK_PA4 2 &pcfg_pull_none>;
};
};

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

@ -967,17 +967,17 @@ &pinctrl {
cif-pin-m0 {
cif_pin_m0: cif-pin-m0 {
rockchip,pins =
<2 RK_PA0 RK_FUNC_1 &pcfg_pull_none>,/* cif_data2 */
<2 RK_PA1 RK_FUNC_1 &pcfg_pull_none>,/* cif_data3 */
<2 RK_PA2 RK_FUNC_1 &pcfg_pull_none>,/* cif_data4 */
<2 RK_PA3 RK_FUNC_1 &pcfg_pull_none>,/* cif_data5 */
<2 RK_PA4 RK_FUNC_1 &pcfg_pull_none>,/* cif_data6 */
<2 RK_PA5 RK_FUNC_1 &pcfg_pull_none>,/* cif_data7 */
<2 RK_PA6 RK_FUNC_1 &pcfg_pull_none>,/* cif_data8 */
<2 RK_PA7 RK_FUNC_1 &pcfg_pull_none>,/* cif_data9 */
<2 RK_PB0 RK_FUNC_1 &pcfg_pull_none>,/* cif_sync */
<2 RK_PB1 RK_FUNC_1 &pcfg_pull_none>,/* cif_href */
<2 RK_PB2 RK_FUNC_1 &pcfg_pull_none>;/* cif_clkin */
<2 RK_PA0 1 &pcfg_pull_none>,/* cif_data2 */
<2 RK_PA1 1 &pcfg_pull_none>,/* cif_data3 */
<2 RK_PA2 1 &pcfg_pull_none>,/* cif_data4 */
<2 RK_PA3 1 &pcfg_pull_none>,/* cif_data5 */
<2 RK_PA4 1 &pcfg_pull_none>,/* cif_data6 */
<2 RK_PA5 1 &pcfg_pull_none>,/* cif_data7 */
<2 RK_PA6 1 &pcfg_pull_none>,/* cif_data8 */
<2 RK_PA7 1 &pcfg_pull_none>,/* cif_data9 */
<2 RK_PB0 1 &pcfg_pull_none>,/* cif_sync */
<2 RK_PB1 1 &pcfg_pull_none>,/* cif_href */
<2 RK_PB2 1 &pcfg_pull_none>;/* cif_clkin */
};
};
@ -1000,12 +1000,12 @@ soc_slppin_gpio: soc_slppin_gpio {
soc_slppin_slp: soc_slppin_slp {
rockchip,pins =
<0 RK_PA4 RK_FUNC_1 &pcfg_pull_none>;
<0 RK_PA4 1 &pcfg_pull_none>;
};
soc_slppin_rst: soc_slppin_rst {
rockchip,pins =
<0 RK_PA4 RK_FUNC_2 &pcfg_pull_none>;
<0 RK_PA4 2 &pcfg_pull_none>;
};
};

48
arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-linux.dts
View File

@ -682,32 +682,32 @@ &pinctrl {
cif-pin-m0 {
cif_pin_m0: cif-pin-m0 {
rockchip,pins =
<2 RK_PA0 RK_FUNC_1 &pcfg_pull_none>,/* cif_data2 */
<2 RK_PA1 RK_FUNC_1 &pcfg_pull_none>,/* cif_data3 */
<2 RK_PA2 RK_FUNC_1 &pcfg_pull_none>,/* cif_data4 */
<2 RK_PA3 RK_FUNC_1 &pcfg_pull_none>,/* cif_data5 */
<2 RK_PA4 RK_FUNC_1 &pcfg_pull_none>,/* cif_data6 */
<2 RK_PA5 RK_FUNC_1 &pcfg_pull_none>,/* cif_data7 */
<2 RK_PA6 RK_FUNC_1 &pcfg_pull_none>,/* cif_data8 */
<2 RK_PA7 RK_FUNC_1 &pcfg_pull_none>,/* cif_data9 */
<2 RK_PB0 RK_FUNC_1 &pcfg_pull_none>,/* cif_sync */
<2 RK_PB1 RK_FUNC_1 &pcfg_pull_none>,/* cif_href */
<2 RK_PB2 RK_FUNC_1 &pcfg_pull_none>;/* cif_clkin */
<2 RK_PA0 1 &pcfg_pull_none>,/* cif_data2 */
<2 RK_PA1 1 &pcfg_pull_none>,/* cif_data3 */
<2 RK_PA2 1 &pcfg_pull_none>,/* cif_data4 */
<2 RK_PA3 1 &pcfg_pull_none>,/* cif_data5 */
<2 RK_PA4 1 &pcfg_pull_none>,/* cif_data6 */
<2 RK_PA5 1 &pcfg_pull_none>,/* cif_data7 */
<2 RK_PA6 1 &pcfg_pull_none>,/* cif_data8 */
<2 RK_PA7 1 &pcfg_pull_none>,/* cif_data9 */
<2 RK_PB0 1 &pcfg_pull_none>,/* cif_sync */
<2 RK_PB1 1 &pcfg_pull_none>,/* cif_href */
<2 RK_PB2 1 &pcfg_pull_none>;/* cif_clkin */
};
cif_pin_m1: cif-pin-m1 {
rockchip,pins =
<3 RK_PA3 RK_FUNC_3 &pcfg_pull_none>,/* cif_data2 */
<3 RK_PA5 RK_FUNC_3 &pcfg_pull_none>,/* cif_data3 */
<3 RK_PA7 RK_FUNC_3 &pcfg_pull_none>,/* cif_data4 */
<3 RK_PB0 RK_FUNC_3 &pcfg_pull_none>,/* cif_data5 */
<3 RK_PB1 RK_FUNC_3 &pcfg_pull_none>,/* cif_data6 */
<3 RK_PB4 RK_FUNC_3 &pcfg_pull_none>,/* cif_data7 */
<3 RK_PB6 RK_FUNC_3 &pcfg_pull_none>,/* cif_data8 */
<3 RK_PB7 RK_FUNC_3 &pcfg_pull_none>,/* cif_data9 */
<3 RK_PD1 RK_FUNC_3 &pcfg_pull_none>,/* cif_sync */
<3 RK_PD2 RK_FUNC_3 &pcfg_pull_none>,/* cif_href */
<3 RK_PD3 RK_FUNC_3 &pcfg_pull_none>;/* cif_clkin */
<3 RK_PA3 3 &pcfg_pull_none>,/* cif_data2 */
<3 RK_PA5 3 &pcfg_pull_none>,/* cif_data3 */
<3 RK_PA7 3 &pcfg_pull_none>,/* cif_data4 */
<3 RK_PB0 3 &pcfg_pull_none>,/* cif_data5 */
<3 RK_PB1 3 &pcfg_pull_none>,/* cif_data6 */
<3 RK_PB4 3 &pcfg_pull_none>,/* cif_data7 */
<3 RK_PB6 3 &pcfg_pull_none>,/* cif_data8 */
<3 RK_PB7 3 &pcfg_pull_none>,/* cif_data9 */
<3 RK_PD1 3 &pcfg_pull_none>,/* cif_sync */
<3 RK_PD2 3 &pcfg_pull_none>,/* cif_href */
<3 RK_PD3 3 &pcfg_pull_none>;/* cif_clkin */
};
};
@ -724,12 +724,12 @@ soc_slppin_gpio: soc_slppin_gpio {
soc_slppin_slp: soc_slppin_slp {
rockchip,pins =
<0 RK_PA4 RK_FUNC_1 &pcfg_pull_none>;
<0 RK_PA4 1 &pcfg_pull_none>;
};
soc_slppin_rst: soc_slppin_rst {
rockchip,pins =
<0 RK_PA4 RK_FUNC_2 &pcfg_pull_none>;
<0 RK_PA4 2 &pcfg_pull_none>;
};
};

26
arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-robot-no-gpu-linux.dts
View File

@ -677,17 +677,17 @@ &pinctrl {
cif-pin-m0 {
cif_pin_m0: cif-pin-m0 {
rockchip,pins =
<2 RK_PA0 RK_FUNC_1 &pcfg_pull_none>,/* cif_data2 */
<2 RK_PA1 RK_FUNC_1 &pcfg_pull_none>,/* cif_data3 */
<2 RK_PA2 RK_FUNC_1 &pcfg_pull_none>,/* cif_data4 */
<2 RK_PA3 RK_FUNC_1 &pcfg_pull_none>,/* cif_data5 */
<2 RK_PA4 RK_FUNC_1 &pcfg_pull_none>,/* cif_data6 */
<2 RK_PA5 RK_FUNC_1 &pcfg_pull_none>,/* cif_data7 */
<2 RK_PA6 RK_FUNC_1 &pcfg_pull_none>,/* cif_data8 */
<2 RK_PA7 RK_FUNC_1 &pcfg_pull_none>,/* cif_data9 */
<2 RK_PB0 RK_FUNC_1 &pcfg_pull_none>,/* cif_sync */
<2 RK_PB1 RK_FUNC_1 &pcfg_pull_none>,/* cif_href */
<2 RK_PB2 RK_FUNC_1 &pcfg_pull_none>;/* cif_clkin */
<2 RK_PA0 1 &pcfg_pull_none>,/* cif_data2 */
<2 RK_PA1 1 &pcfg_pull_none>,/* cif_data3 */
<2 RK_PA2 1 &pcfg_pull_none>,/* cif_data4 */
<2 RK_PA3 1 &pcfg_pull_none>,/* cif_data5 */
<2 RK_PA4 1 &pcfg_pull_none>,/* cif_data6 */
<2 RK_PA5 1 &pcfg_pull_none>,/* cif_data7 */
<2 RK_PA6 1 &pcfg_pull_none>,/* cif_data8 */
<2 RK_PA7 1 &pcfg_pull_none>,/* cif_data9 */
<2 RK_PB0 1 &pcfg_pull_none>,/* cif_sync */
<2 RK_PB1 1 &pcfg_pull_none>,/* cif_href */
<2 RK_PB2 1 &pcfg_pull_none>;/* cif_clkin */
};
};
@ -704,12 +704,12 @@ soc_slppin_gpio: soc_slppin_gpio {
soc_slppin_slp: soc_slppin_slp {
rockchip,pins =
<0 RK_PA4 RK_FUNC_1 &pcfg_pull_none>;
<0 RK_PA4 1 &pcfg_pull_none>;
};
soc_slppin_rst: soc_slppin_rst {
rockchip,pins =
<0 RK_PA4 RK_FUNC_2 &pcfg_pull_none>;
<0 RK_PA4 2 &pcfg_pull_none>;
};
};

4
arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi
View File

@ -744,12 +744,12 @@ soc_slppin_gpio: soc_slppin_gpio {
soc_slppin_slp: soc_slppin_slp {
rockchip,pins =
<0 RK_PA4 RK_FUNC_1 &pcfg_pull_none>;
<0 RK_PA4 1 &pcfg_pull_none>;
};
soc_slppin_rst: soc_slppin_rst {
rockchip,pins =
<0 RK_PA4 RK_FUNC_2 &pcfg_pull_none>;
<0 RK_PA4 2 &pcfg_pull_none>;
};
};

4
arch/arm64/boot/dts/rockchip/rk3328-box-liantong.dtsi
View File

@ -346,7 +346,7 @@ &pinctrl {
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins =
<1 18 RK_FUNC_GPIO &pcfg_pull_none>;
<1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
@ -365,7 +365,7 @@ otg_vbus_drv: otg-vbus-drv {
wireless-bluetooth {
uart0_gpios: uart0-gpios {
rockchip,pins =
<1 10 RK_FUNC_GPIO &pcfg_pull_none>;
<1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

4
arch/arm64/boot/dts/rockchip/rk3328-evb-android.dtsi
View File

@ -421,7 +421,7 @@ pmic_int_l: pmic-int-l {
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins =
<1 18 RK_FUNC_GPIO &pcfg_pull_none>;
<1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
@ -440,7 +440,7 @@ otg_vbus_drv: otg-vbus-drv {
wireless-bluetooth {
uart0_gpios: uart0-gpios {
rockchip,pins =
<1 10 RK_FUNC_GPIO &pcfg_pull_none>;
<1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

6
arch/arm64/boot/dts/rockchip/rk3328-rock64-android.dtsi
View File

@ -344,19 +344,19 @@ &mpp_srv {
&pinctrl {
pmic {
pmic_int_l: pmic-int-l {
rockchip,pins = <2 6 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
usb2 {
usb20_host_drv: usb20-host-drv {
rockchip,pins = <0 27 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
usb3 {
usb30_host_drv: usb30-host-drv {
rockchip,pins = <0 0 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

24
arch/arm64/boot/dts/rockchip/rk3368-808-evb.dts
View File

@ -25,7 +25,7 @@ &cif {
&cif_clkout {
/* cif_clkout */
rockchip,pins = <1 11 RK_FUNC_1 &pcfg_pull_none_4ma>;
rockchip,pins = <1 RK_PB3 1 &pcfg_pull_none_4ma>;
};
&dmc {
@ -36,24 +36,24 @@ &dmc {
&isp_dvp_d2d9 {
rockchip,pins =
/* cif_data4 ... cif_data9 */
<1 2 RK_FUNC_1 &pcfg_pull_down>,
<1 3 RK_FUNC_1 &pcfg_pull_down>,
<1 4 RK_FUNC_1 &pcfg_pull_down>,
<1 5 RK_FUNC_1 &pcfg_pull_down>,
<1 6 RK_FUNC_1 &pcfg_pull_down>,
<1 7 RK_FUNC_1 &pcfg_pull_down>,
<1 RK_PA2 1 &pcfg_pull_down>,
<1 RK_PA3 1 &pcfg_pull_down>,
<1 RK_PA4 1 &pcfg_pull_down>,
<1 RK_PA5 1 &pcfg_pull_down>,
<1 RK_PA6 1 &pcfg_pull_down>,
<1 RK_PA7 1 &pcfg_pull_down>,
/* cif_sync, cif_href */
<1 8 RK_FUNC_1 &pcfg_pull_down>,
<1 9 RK_FUNC_1 &pcfg_pull_down>,
<1 RK_PB0 1 &pcfg_pull_down>,
<1 RK_PB1 1 &pcfg_pull_down>,
/* cif_clkin */
<1 10 RK_FUNC_1 &pcfg_pull_down>;
<1 RK_PB2 1 &pcfg_pull_down>;
};
&isp_dvp_d10d11 {
rockchip,pins =
/* cif_data10, cif_data11 */
<1 14 RK_FUNC_1 &pcfg_pull_down>,
<1 15 RK_FUNC_1 &pcfg_pull_down>;
<1 RK_PB6 1 &pcfg_pull_down>,
<1 RK_PB7 1 &pcfg_pull_down>;
};
&i2c3 {

26
arch/arm64/boot/dts/rockchip/rk3368-808.dtsi
View File

@ -908,57 +908,57 @@ hp_det: hp-det {
i2s {
i2s_2ch_bus: i2s-2ch-bus {
rockchip,pins = <2 12 RK_FUNC_1 &pcfg_pull_none>,
<2 13 RK_FUNC_1 &pcfg_pull_none>,
<2 14 RK_FUNC_1 &pcfg_pull_none>,
<2 15 RK_FUNC_1 &pcfg_pull_none>,
<2 16 RK_FUNC_1 &pcfg_pull_none>;
rockchip,pins = <2 RK_PB4 1 &pcfg_pull_none>,
<2 RK_PB5 1 &pcfg_pull_none>,
<2 RK_PB6 1 &pcfg_pull_none>,
<2 RK_PB7 1 &pcfg_pull_none>,
<2 RK_PC0 1 &pcfg_pull_none>;
};
};
pmic {
pmic_sleep: pmic-sleep {
rockchip,pins = <0 0 RK_FUNC_2 &pcfg_pull_none>;
rockchip,pins = <0 RK_PA0 2 &pcfg_pull_none>;
};
pmic_int: pmic-int {
rockchip,pins = <0 1 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
mpu6500 {
mpu6500_irq_gpio: mpu6500-irq-gpio {
rockchip,pins = <2 17 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <2 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
ak8963 {
ak8963_irq_gpio: ak8963_irq_gpio {
rockchip,pins = <2 18 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <2 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
dc_det {
dc_irq_gpio: dc-irq-gpio {
rockchip,pins = <0 17 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins = <3 4 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
usb {
otg_vbus_drv: otg-vbus-drv {
rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
wireless-bluetooth {
uart0_rts_gpio: uart0-rts-gpio {
rockchip,pins = <2 27 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};

76
arch/arm64/boot/dts/rockchip/rk3368-android.dtsi
View File

@ -281,77 +281,77 @@ &usb_otg {
&pinctrl {
isp {
cif_clkout: cif-clkout {
rockchip,pins = <1 11 RK_FUNC_1 &pcfg_pull_none>;//cif_clkout
rockchip,pins = <1 RK_PB3 1 &pcfg_pull_none>;//cif_clkout
};
isp_dvp_d2d9: isp-dvp-d2d9 {
rockchip,pins =
<1 0 RK_FUNC_1 &pcfg_pull_none>,//cif_data2
<1 1 RK_FUNC_1 &pcfg_pull_none>,//cif_data3
<1 2 RK_FUNC_1 &pcfg_pull_none>,//cif_data4
<1 3 RK_FUNC_1 &pcfg_pull_none>,//cif_data5
<1 4 RK_FUNC_1 &pcfg_pull_none>,//cif_data6
<1 5 RK_FUNC_1 &pcfg_pull_none>,//cif_data7
<1 6 RK_FUNC_1 &pcfg_pull_none>,//cif_data8
<1 7 RK_FUNC_1 &pcfg_pull_none>,//cif_data9
<1 8 RK_FUNC_1 &pcfg_pull_none>,//cif_sync
<1 9 RK_FUNC_1 &pcfg_pull_none>,//cif_href
<1 10 RK_FUNC_1 &pcfg_pull_none>,//cif_clkin
<1 11 RK_FUNC_1 &pcfg_pull_none>;//cif_clkout
<1 RK_PA0 1 &pcfg_pull_none>,//cif_data2
<1 RK_PA1 1 &pcfg_pull_none>,//cif_data3
<1 RK_PA2 1 &pcfg_pull_none>,//cif_data4
<1 RK_PA3 1 &pcfg_pull_none>,//cif_data5
<1 RK_PA4 1 &pcfg_pull_none>,//cif_data6
<1 RK_PA5 1 &pcfg_pull_none>,//cif_data7
<1 RK_PA6 1 &pcfg_pull_none>,//cif_data8
<1 RK_PA7 1 &pcfg_pull_none>,//cif_data9
<1 RK_PB0 1 &pcfg_pull_none>,//cif_sync
<1 RK_PB1 1 &pcfg_pull_none>,//cif_href
<1 RK_PB2 1 &pcfg_pull_none>,//cif_clkin
<1 RK_PB3 1 &pcfg_pull_none>;//cif_clkout
};
isp_dvp_d0d1: isp-dvp-d0d1 {
rockchip,pins =
<1 12 RK_FUNC_1 &pcfg_pull_none>,//cif_data0
<1 13 RK_FUNC_1 &pcfg_pull_none>;//cif_data1
<1 RK_PB4 1 &pcfg_pull_none>,//cif_data0
<1 RK_PB5 1 &pcfg_pull_none>;//cif_data1
};
isp_dvp_d10d11:isp_d10d11 {
rockchip,pins =
<1 14 RK_FUNC_1 &pcfg_pull_none>,//cif_data10
<1 15 RK_FUNC_1 &pcfg_pull_none>;//cif_data11
<1 RK_PB6 1 &pcfg_pull_none>,//cif_data10
<1 RK_PB7 1 &pcfg_pull_none>;//cif_data11
};
isp_dvp_d0d7: isp-dvp-d0d7 {
rockchip,pins =
<1 12 RK_FUNC_1 &pcfg_pull_none>,//cif_data0
<1 13 RK_FUNC_1 &pcfg_pull_none>,//cif_data1
<1 0 RK_FUNC_1 &pcfg_pull_none>,//cif_data2
<1 1 RK_FUNC_1 &pcfg_pull_none>,//cif_data3
<1 2 RK_FUNC_1 &pcfg_pull_none>,//cif_data4
<1 3 RK_FUNC_1 &pcfg_pull_none>,//cif_data5
<1 4 RK_FUNC_1 &pcfg_pull_none>,//cif_data6
<1 5 RK_FUNC_1 &pcfg_pull_none>;//cif_data7
<1 RK_PB4 1 &pcfg_pull_none>,//cif_data0
<1 RK_PB5 1 &pcfg_pull_none>,//cif_data1
<1 RK_PA0 1 &pcfg_pull_none>,//cif_data2
<1 RK_PA1 1 &pcfg_pull_none>,//cif_data3
<1 RK_PA2 1 &pcfg_pull_none>,//cif_data4
<1 RK_PA3 1 &pcfg_pull_none>,//cif_data5
<1 RK_PA4 1 &pcfg_pull_none>,//cif_data6
<1 RK_PA5 1 &pcfg_pull_none>;//cif_data7
};
isp_dvp_d4d11: isp-dvp-d4d11 {
rockchip,pins =
<1 2 RK_FUNC_1 &pcfg_pull_none>,//cif_data4
<1 3 RK_FUNC_1 &pcfg_pull_none>,//cif_data5
<1 4 RK_FUNC_1 &pcfg_pull_none>,//cif_data6
<1 5 RK_FUNC_1 &pcfg_pull_none>,//cif_data7
<1 6 RK_FUNC_1 &pcfg_pull_none>,//cif_data8
<1 7 RK_FUNC_1 &pcfg_pull_none>,//cif_data9
<1 14 RK_FUNC_1 &pcfg_pull_none>,//cif_data10
<1 17 RK_FUNC_1 &pcfg_pull_none>;//cif_data11
<1 RK_PA2 1 &pcfg_pull_none>,//cif_data4
<1 RK_PA3 1 &pcfg_pull_none>,//cif_data5
<1 RK_PA4 1 &pcfg_pull_none>,//cif_data6
<1 RK_PA5 1 &pcfg_pull_none>,//cif_data7
<1 RK_PA6 1 &pcfg_pull_none>,//cif_data8
<1 RK_PA7 1 &pcfg_pull_none>,//cif_data9
<1 RK_PB6 1 &pcfg_pull_none>,//cif_data10
<1 RK_PC1 1 &pcfg_pull_none>;//cif_data11
};
isp_shutter: isp-shutter {
rockchip,pins =
<3 19 RK_FUNC_2 &pcfg_pull_none>, //SHUTTEREN
<3 22 RK_FUNC_2 &pcfg_pull_none>;//SHUTTERTRIG
<3 RK_PC3 2 &pcfg_pull_none>, //SHUTTEREN
<3 RK_PC6 2 &pcfg_pull_none>;//SHUTTERTRIG
};
isp_flash_trigger: isp-flash-trigger {
rockchip,pins = <3 20 RK_FUNC_2 &pcfg_pull_none>; //ISP_FLASHTRIGOU
rockchip,pins = <3 RK_PC4 2 &pcfg_pull_none>; //ISP_FLASHTRIGOU
};
isp_prelight: isp-prelight {
rockchip,pins = <3 21 RK_FUNC_2 &pcfg_pull_none>;//ISP_PRELIGHTTRIG
rockchip,pins = <3 RK_PC5 2 &pcfg_pull_none>;//ISP_PRELIGHTTRIG
};
isp_flash_trigger_as_gpio: isp_flash_trigger_as_gpio {
rockchip,pins = <3 20 RK_FUNC_GPIO &pcfg_pull_none>;//ISP_FLASHTRIGOU
rockchip,pins = <3 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>;//ISP_FLASHTRIGOU
};
};
};

14
arch/arm64/boot/dts/rockchip/rk3368-p9.dtsi
View File

@ -798,40 +798,40 @@ &tsadc {
&pinctrl {
pmic {
pmic_int_l: pmic-int-l {
rockchip,pins = <RK_GPIO0 1 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
};
vsel_gpio: vsel-gpio {
rockchip,pins = <0 0 RK_FUNC_GPIO &pcfg_pull_down>;
rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
mpu6500 {
mpu6500_irq_gpio: mpu6500-irq-gpio {
rockchip,pins = <3 14 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <3 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
dc_det {
dc_irq_gpio: dc-irq-gpio {
rockchip,pins = <0 17 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins = <3 4 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
usb2 {
host_vbus_drv: host-vbus-drv {
rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
wireless-bluetooth {
uart0_rts_gpio: uart0-rts-gpio {
rockchip,pins = <2 27 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

24
arch/arm64/boot/dts/rockchip/rk3368-px5-evb-android.dts
View File

@ -918,31 +918,31 @@ &uart4 {
&pinctrl {
pmic {
pmic_int: pmic-int {
rockchip,pins = <RK_GPIO0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
dc_det {
dc_irq_gpio: dc-irq-gpio {
rockchip,pins = <RK_GPIO0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins = <RK_GPIO3 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <3 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
usb2 {
host_vbus_drv: host-vbus-drv {
rockchip,pins = <RK_GPIO0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
wireless-bluetooth {
uart0_rts_gpio: uart0-rts-gpio {
rockchip,pins = <RK_GPIO2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
@ -951,7 +951,7 @@ gpio0_c7: gpio0-c7 {
rockchip,pins = <0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_down>;
};
gpio0_a3: gpio0-a3 {
rockchip,pins = <0 RK_PA3 RK_FUNC_3 &pcfg_pull_none>;
rockchip,pins = <0 RK_PA3 3 &pcfg_pull_none>;
};
gpio0_c2: gpio0-c2 {
rockchip,pins = <0 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
@ -979,12 +979,12 @@ gpio3_b2: gpio3-b2 {
};
i2s {
i2s_8ch_bus: i2s-8ch-bus {
rockchip,pins = <2 12 RK_FUNC_1 &pcfg_pull_none>,
<2 13 RK_FUNC_1 &pcfg_pull_none>,
<2 14 RK_FUNC_1 &pcfg_pull_none>,
<2 15 RK_FUNC_1 &pcfg_pull_none>,
<2 16 RK_FUNC_1 &pcfg_pull_none>,
<2 18 RK_FUNC_1 &pcfg_pull_none>;
rockchip,pins = <2 RK_PB4 1 &pcfg_pull_none>,
<2 RK_PB5 1 &pcfg_pull_none>,
<2 RK_PB6 1 &pcfg_pull_none>,
<2 RK_PB7 1 &pcfg_pull_none>,
<2 RK_PC0 1 &pcfg_pull_none>,
<2 RK_PC2 1 &pcfg_pull_none>;
};
};
};

40
arch/arm64/boot/dts/rockchip/rk3368-r88-dcdc.dts
View File

@ -374,76 +374,76 @@ pcfg_pull_up_drv_8ma: pcfg-pull-up-drv-8ma {
pmic {
pmic_int: pmic-int {
rockchip,pins = <RK_GPIO0 5 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
};
vsel1_gpio:vsel1_gpio{
rockchip,pins = <0 0 RK_FUNC_GPIO &pcfg_pull_down>;
rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
emmc {
emmc_bus8: emmc-bus8 {
rockchip,pins = <1 18 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,
<1 19 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,
<1 20 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,
<1 21 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,
<1 22 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,
<1 23 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,
<1 24 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,
<1 25 RK_FUNC_2 &pcfg_pull_up_drv_8ma>;
rockchip,pins = <1 RK_PC2 2 &pcfg_pull_up_drv_8ma>,
<1 RK_PC3 2 &pcfg_pull_up_drv_8ma>,
<1 RK_PC4 2 &pcfg_pull_up_drv_8ma>,
<1 RK_PC5 2 &pcfg_pull_up_drv_8ma>,
<1 RK_PC6 2 &pcfg_pull_up_drv_8ma>,
<1 RK_PC7 2 &pcfg_pull_up_drv_8ma>,
<1 RK_PD0 2 &pcfg_pull_up_drv_8ma>,
<1 RK_PD1 2 &pcfg_pull_up_drv_8ma>;
};
emmc-clk {
rockchip,pins = <2 4 RK_FUNC_2 &pcfg_pull_none_drv_8ma>;
rockchip,pins = <2 RK_PA4 2 &pcfg_pull_none_drv_8ma>;
};
emmc-cmd {
rockchip,pins = <1 26 RK_FUNC_2 &pcfg_pull_up_drv_8ma>;
rockchip,pins = <1 RK_PD2 2 &pcfg_pull_up_drv_8ma>;
};
emmc_reset: emmc-reset {
rockchip,pins = <2 3 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <2 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
ir {
ir_int: ir-int {
rockchip,pins = <3 30 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <3 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
keys {
pwr_key: pwr-key {
rockchip,pins = <0 2 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
leds {
stby_pwren: stby-pwren {
rockchip,pins = <0 12 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
};
led_ctl: led-ctl {
rockchip,pins = <3 29 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins = <3 4 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
wireless-bluetooth {
uart0_gpios: uart0-gpios {
rockchip,pins = <2 27 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
usb {
host_vbus_drv: host-vbus-drv {
rockchip,pins = <0 4 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

4
arch/arm64/boot/dts/rockchip/rk3368-sheep-lvds.dts
View File

@ -648,13 +648,13 @@ &hdmi {
&pinctrl {
pmic {
pmic_int_l: pmic-int-l {
rockchip,pins = <RK_GPIO0 1 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
usb2 {
host_vbus_drv: host-vbus-drv {
rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

8
arch/arm64/boot/dts/rockchip/rk3368-sheep.dts
View File

@ -719,22 +719,22 @@ &tsadc {
&pinctrl {
pmic {
pmic_int_l: pmic-int-l {
rockchip,pins = <RK_GPIO0 1 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
};
vsel_gpio: vsel-gpio {
rockchip,pins = <0 0 RK_FUNC_GPIO &pcfg_pull_down>;
rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
dc_det {
dc_irq_gpio: dc-irq-gpio {
rockchip,pins = <0 17 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
usb2 {
host_vbus_drv: host-vbus-drv {
rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
};
otg_vbus_drv: otg-bus-drv {

6
arch/arm64/boot/dts/rockchip/rk3368-sziauto-rk618.dts
View File

@ -787,19 +787,19 @@ &tsadc {
&pinctrl {
pmic {
pmic_int_l: pmic-int-l {
rockchip,pins = <RK_GPIO0 1 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
usb2 {
host_vbus_drv: host-vbus-drv {
rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins = <3 4 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

42
arch/arm64/boot/dts/rockchip/rk3368-tablet.dts
View File

@ -216,7 +216,7 @@ xin32k: xin32k {
&cif_clkout {
/* cif_clkout */
rockchip,pins = <1 11 RK_FUNC_1 &pcfg_pull_none_4ma>;
rockchip,pins = <1 RK_PB3 1 &pcfg_pull_none_4ma>;
};
&cpu_l0 {
@ -812,24 +812,24 @@ &io_domains {
&isp_dvp_d2d9 {
rockchip,pins =
/* cif_data4 ... cif_data9 */
<1 2 RK_FUNC_1 &pcfg_pull_down>,
<1 3 RK_FUNC_1 &pcfg_pull_down>,
<1 4 RK_FUNC_1 &pcfg_pull_down>,
<1 5 RK_FUNC_1 &pcfg_pull_down>,
<1 6 RK_FUNC_1 &pcfg_pull_down>,
<1 7 RK_FUNC_1 &pcfg_pull_down>,
<1 RK_PA2 1 &pcfg_pull_down>,
<1 RK_PA3 1 &pcfg_pull_down>,
<1 RK_PA4 1 &pcfg_pull_down>,
<1 RK_PA5 1 &pcfg_pull_down>,
<1 RK_PA6 1 &pcfg_pull_down>,
<1 RK_PA7 1 &pcfg_pull_down>,
/* cif_sync, cif_href */
<1 8 RK_FUNC_1 &pcfg_pull_down>,
<1 9 RK_FUNC_1 &pcfg_pull_down>,
<1 RK_PB0 1 &pcfg_pull_down>,
<1 RK_PB1 1 &pcfg_pull_down>,
/* cif_clkin */
<1 10 RK_FUNC_1 &pcfg_pull_down>;
<1 RK_PB2 1 &pcfg_pull_down>;
};
&isp_dvp_d10d11 {
rockchip,pins =
/* cif_data10, cif_data11 */
<1 14 RK_FUNC_1 &pcfg_pull_down>,
<1 15 RK_FUNC_1 &pcfg_pull_down>;
<1 RK_PB6 1 &pcfg_pull_down>,
<1 RK_PB7 1 &pcfg_pull_down>;
};
&isp_mmu {
@ -892,34 +892,34 @@ camera_pwr: camera-pwr {
headphone {
hp_det: hp-det {
rockchip,pins = <0 23 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
pmic {
pmic_int_l: pmic-int-l {
rockchip,pins = <RK_GPIO0 1 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
};
vsel_gpio: vsel-gpio {
rockchip,pins = <0 0 RK_FUNC_GPIO &pcfg_pull_down>;
rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
mpu6500 {
mpu6500_irq_gpio: mpu6500-irq-gpio {
rockchip,pins = <3 14 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <3 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
cm3218 {
cm3218_irq_gpio: cm3218-irq-gpio {
rockchip,pins = <3 15 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
dc_det {
dc_irq_gpio: dc-irq-gpio {
rockchip,pins = <0 17 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
@ -930,19 +930,19 @@ pcfg_pull_none_4ma: pcfg-pull-none-4ma {
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins = <3 4 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
usb2 {
host_vbus_drv: host-vbus-drv {
rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
wireless-bluetooth {
uart0_rts_gpio: uart0-rts-gpio {
rockchip,pins = <2 27 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

16
arch/arm64/boot/dts/rockchip/rk3368-xikp.dtsi
View File

@ -844,46 +844,46 @@ &tsadc {
&pinctrl {
pmic {
pmic_int_l: pmic-int-l {
rockchip,pins = <RK_GPIO0 1 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
};
vsel_gpio: vsel-gpio {
rockchip,pins = <0 0 RK_FUNC_GPIO &pcfg_pull_down>;
rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
mpu6500 {
mpu6500_irq_gpio: mpu6500-irq-gpio {
rockchip,pins = <3 14 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <3 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
cm3218 {
cm3218_irq_gpio: cm3218-irq-gpio {
rockchip,pins = <3 15 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
dc_det {
dc_irq_gpio: dc-irq-gpio {
rockchip,pins = <0 17 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins = <3 4 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
usb2 {
host_vbus_drv: host-vbus-drv {
rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
wireless-bluetooth {
uart0_rts_gpio: uart0-rts-gpio {
rockchip,pins = <2 27 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

42
arch/arm64/boot/dts/rockchip/rk3368a-817-tablet-bnd.dts
View File

@ -195,7 +195,7 @@ xin32k: xin32k {
&cif_clkout {
/* cif_clkout */
rockchip,pins = <1 11 RK_FUNC_1 &pcfg_pull_none_4ma>;
rockchip,pins = <1 RK_PB3 1 &pcfg_pull_none_4ma>;
};
&cpu_l0 {
@ -788,24 +788,24 @@ &io_domains {
&isp_dvp_d2d9 {
rockchip,pins =
/* cif_data4 ... cif_data9 */
<1 2 RK_FUNC_1 &pcfg_pull_down>,
<1 3 RK_FUNC_1 &pcfg_pull_down>,
<1 4 RK_FUNC_1 &pcfg_pull_down>,
<1 5 RK_FUNC_1 &pcfg_pull_down>,
<1 6 RK_FUNC_1 &pcfg_pull_down>,
<1 7 RK_FUNC_1 &pcfg_pull_down>,
<1 RK_PA2 1 &pcfg_pull_down>,
<1 RK_PA3 1 &pcfg_pull_down>,
<1 RK_PA4 1 &pcfg_pull_down>,
<1 RK_PA5 1 &pcfg_pull_down>,
<1 RK_PA6 1 &pcfg_pull_down>,
<1 RK_PA7 1 &pcfg_pull_down>,
/* cif_sync, cif_href */
<1 8 RK_FUNC_1 &pcfg_pull_down>,
<1 9 RK_FUNC_1 &pcfg_pull_down>,
<1 RK_PB0 1 &pcfg_pull_down>,
<1 RK_PB1 1 &pcfg_pull_down>,
/* cif_clkin */
<1 10 RK_FUNC_1 &pcfg_pull_down>;
<1 RK_PB2 1 &pcfg_pull_down>;
};
&isp_dvp_d10d11 {
rockchip,pins =
/* cif_data10, cif_data11 */
<1 14 RK_FUNC_1 &pcfg_pull_down>,
<1 15 RK_FUNC_1 &pcfg_pull_down>;
<1 RK_PB6 1 &pcfg_pull_down>,
<1 RK_PB7 1 &pcfg_pull_down>;
};
&isp_mmu {
@ -863,7 +863,7 @@ &pinctrl {
headphone {
hp_det: hp-det {
rockchip,pins = <0 23 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
@ -880,28 +880,28 @@ soc_slppin_gpio: soc_slppin_gpio {
soc_slppin_slp: soc_slppin_slp {
rockchip,pins =
<0 RK_PA0 RK_FUNC_1 &pcfg_pull_none>;
<0 RK_PA0 1 &pcfg_pull_none>;
};
soc_slppin_rst: soc_slppin_rst {
rockchip,pins =
<0 RK_PA0 RK_FUNC_2 &pcfg_pull_none>;
<0 RK_PA0 2 &pcfg_pull_none>;
};
vsel_gpio: vsel-gpio {
rockchip,pins = <0 0 RK_FUNC_GPIO &pcfg_pull_down>;
rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
sc7a30 {
sc7a30_irq_gpio: sc7a30_irq_gpio {
rockchip,pins = <3 14 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <3 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
dc_det {
dc_irq_gpio: dc-irq-gpio {
rockchip,pins = <0 17 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
@ -934,19 +934,19 @@ pcfg_input: pcfg-input {
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins = <3 4 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
usb2 {
host_vbus_drv: host-vbus-drv {
rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
wireless-bluetooth {
uart0_rts_gpio: uart0-rts-gpio {
rockchip,pins = <2 27 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

44
arch/arm64/boot/dts/rockchip/rk3368a-817-tablet.dts
View File

@ -196,7 +196,7 @@ xin32k: xin32k {
&cif_clkout {
/* cif_clkout */
rockchip,pins = <1 11 RK_FUNC_1 &pcfg_pull_none_4ma>;
rockchip,pins = <1 RK_PB3 1 &pcfg_pull_none_4ma>;
};
&cpu_l0 {
@ -1040,24 +1040,24 @@ &io_domains {
&isp_dvp_d2d9 {
rockchip,pins =
/* cif_data4 ... cif_data9 */
<1 2 RK_FUNC_1 &pcfg_pull_down>,
<1 3 RK_FUNC_1 &pcfg_pull_down>,
<1 4 RK_FUNC_1 &pcfg_pull_down>,
<1 5 RK_FUNC_1 &pcfg_pull_down>,
<1 6 RK_FUNC_1 &pcfg_pull_down>,
<1 7 RK_FUNC_1 &pcfg_pull_down>,
<1 RK_PA2 1 &pcfg_pull_down>,
<1 RK_PA3 1 &pcfg_pull_down>,
<1 RK_PA4 1 &pcfg_pull_down>,
<1 RK_PA5 1 &pcfg_pull_down>,
<1 RK_PA6 1 &pcfg_pull_down>,
<1 RK_PA7 1 &pcfg_pull_down>,
/* cif_sync, cif_href */
<1 8 RK_FUNC_1 &pcfg_pull_down>,
<1 9 RK_FUNC_1 &pcfg_pull_down>,
<1 RK_PB0 1 &pcfg_pull_down>,
<1 RK_PB1 1 &pcfg_pull_down>,
/* cif_clkin */
<1 10 RK_FUNC_1 &pcfg_pull_down>;
<1 RK_PB2 1 &pcfg_pull_down>;
};
&isp_dvp_d10d11 {
rockchip,pins =
/* cif_data10, cif_data11 */
<1 14 RK_FUNC_1 &pcfg_pull_down>,
<1 15 RK_FUNC_1 &pcfg_pull_down>;
<1 RK_PB6 1 &pcfg_pull_down>,
<1 RK_PB7 1 &pcfg_pull_down>;
};
&isp_mmu {
@ -1120,7 +1120,7 @@ &pinctrl {
headphone {
hp_det: hp-det {
rockchip,pins = <0 23 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
@ -1137,34 +1137,34 @@ soc_slppin_gpio: soc_slppin_gpio {
soc_slppin_slp: soc_slppin_slp {
rockchip,pins =
<0 RK_PA0 RK_FUNC_1 &pcfg_pull_none>;
<0 RK_PA0 1 &pcfg_pull_none>;
};
soc_slppin_rst: soc_slppin_rst {
rockchip,pins =
<0 RK_PA0 RK_FUNC_2 &pcfg_pull_none>;
<0 RK_PA0 2 &pcfg_pull_none>;
};
vsel_gpio: vsel-gpio {
rockchip,pins = <0 0 RK_FUNC_GPIO &pcfg_pull_down>;
rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
mpu6500 {
mpu6500_irq_gpio: mpu6500-irq-gpio {
rockchip,pins = <3 14 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <3 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
cm3218 {
cm3218_irq_gpio: cm3218-irq-gpio {
rockchip,pins = <3 15 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
dc_det {
dc_irq_gpio: dc-irq-gpio {
rockchip,pins = <0 17 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
@ -1197,19 +1197,19 @@ pcfg_input: pcfg-input {
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins = <3 4 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
usb2 {
host_vbus_drv: host-vbus-drv {
rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
wireless-bluetooth {
uart0_rts_gpio: uart0-rts-gpio {
rockchip,pins = <2 27 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

26
arch/arm64/boot/dts/rockchip/rk3399-android.dtsi
View File

@ -300,39 +300,39 @@ isp {
cif_clkout: cif-clkout {
rockchip,pins =
/*cif_clkout*/
<2 11 RK_FUNC_3 &pcfg_pull_none>;
<2 RK_PB3 3 &pcfg_pull_none>;
};
isp_dvp_d0d7: isp-dvp-d0d7 {
rockchip,pins =
/*cif_data0*/
<2 0 RK_FUNC_3 &pcfg_pull_none>,
<2 RK_PA0 3 &pcfg_pull_none>,
/*cif_data1*/
<2 1 RK_FUNC_3 &pcfg_pull_none>,
<2 RK_PA1 3 &pcfg_pull_none>,
/*cif_data2*/
<2 2 RK_FUNC_3 &pcfg_pull_none>,
<2 RK_PA2 3 &pcfg_pull_none>,
/*cif_data3*/
<2 3 RK_FUNC_3 &pcfg_pull_none>,
<2 RK_PA3 3 &pcfg_pull_none>,
/*cif_data4*/
<2 4 RK_FUNC_3 &pcfg_pull_none>,
<2 RK_PA4 3 &pcfg_pull_none>,
/*cif_data5*/
<2 5 RK_FUNC_3 &pcfg_pull_none>,
<2 RK_PA5 3 &pcfg_pull_none>,
/*cif_data6*/
<2 6 RK_FUNC_3 &pcfg_pull_none>,
<2 RK_PA6 3 &pcfg_pull_none>,
/*cif_data7*/
<2 7 RK_FUNC_3 &pcfg_pull_none>,
<2 RK_PA7 3 &pcfg_pull_none>,
/*cif_sync*/
<2 8 RK_FUNC_3 &pcfg_pull_none>,
<2 RK_PB0 3 &pcfg_pull_none>,
/*cif_href*/
<2 9 RK_FUNC_3 &pcfg_pull_none>,
<2 RK_PB1 3 &pcfg_pull_none>,
/*cif_clkin*/
<2 10 RK_FUNC_3 &pcfg_pull_none>;
<2 RK_PB2 3 &pcfg_pull_none>;
};
};
buttons {
pwrbtn: pwrbtn {
rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
};

30
arch/arm64/boot/dts/rockchip/rk3399-box-rev1.dts
View File

@ -52,57 +52,57 @@ &pinctrl {
sdio0 {
sdio0_bus1: sdio0-bus1 {
rockchip,pins =
<2 20 RK_FUNC_1 &pcfg_pull_up_20ma>;
<2 RK_PC4 1 &pcfg_pull_up_20ma>;
};
sdio0_bus4: sdio0-bus4 {
rockchip,pins =
<2 20 RK_FUNC_1 &pcfg_pull_up_20ma>,
<2 21 RK_FUNC_1 &pcfg_pull_up_20ma>,
<2 22 RK_FUNC_1 &pcfg_pull_up_20ma>,
<2 23 RK_FUNC_1 &pcfg_pull_up_20ma>;
<2 RK_PC4 1 &pcfg_pull_up_20ma>,
<2 RK_PC5 1 &pcfg_pull_up_20ma>,
<2 RK_PC6 1 &pcfg_pull_up_20ma>,
<2 RK_PC7 1 &pcfg_pull_up_20ma>;
};
sdio0_cmd: sdio0-cmd {
rockchip,pins =
<2 24 RK_FUNC_1 &pcfg_pull_up_20ma>;
<2 RK_PD0 1 &pcfg_pull_up_20ma>;
};
sdio0_clk: sdio0-clk {
rockchip,pins =
<2 25 RK_FUNC_1 &pcfg_pull_none_20ma>;
<2 RK_PD1 1 &pcfg_pull_none_20ma>;
};
};
sdmmc {
sdmmc_bus1: sdmmc-bus1 {
rockchip,pins =
<4 8 RK_FUNC_1 &pcfg_pull_up_8ma>;
<4 RK_PB0 1 &pcfg_pull_up_8ma>;
};
sdmmc_bus4: sdmmc-bus4 {
rockchip,pins =
<4 8 RK_FUNC_1 &pcfg_pull_up_8ma>,
<4 9 RK_FUNC_1 &pcfg_pull_up_8ma>,
<4 10 RK_FUNC_1 &pcfg_pull_up_8ma>,
<4 11 RK_FUNC_1 &pcfg_pull_up_8ma>;
<4 RK_PB0 1 &pcfg_pull_up_8ma>,
<4 RK_PB1 1 &pcfg_pull_up_8ma>,
<4 RK_PB2 1 &pcfg_pull_up_8ma>,
<4 RK_PB3 1 &pcfg_pull_up_8ma>;
};
sdmmc_clk: sdmmc-clk {
rockchip,pins =
<4 12 RK_FUNC_1 &pcfg_pull_none_18ma>;
<4 RK_PB4 1 &pcfg_pull_none_18ma>;
};
sdmmc_cmd: sdmmc-cmd {
rockchip,pins =
<4 13 RK_FUNC_1 &pcfg_pull_up_8ma>;
<4 RK_PB5 1 &pcfg_pull_up_8ma>;
};
};
fusb30x {
fusb0_int: fusb0-int {
rockchip,pins =
<1 2 RK_FUNC_GPIO &pcfg_pull_up>;
<1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
};

32
arch/arm64/boot/dts/rockchip/rk3399-box-rev2.dts
View File

@ -55,64 +55,64 @@ &pinctrl {
sdio0 {
sdio0_bus1: sdio0-bus1 {
rockchip,pins =
<2 20 RK_FUNC_1 &pcfg_pull_up_20ma>;
<2 RK_PC4 1 &pcfg_pull_up_20ma>;
};
sdio0_bus4: sdio0-bus4 {
rockchip,pins =
<2 20 RK_FUNC_1 &pcfg_pull_up_20ma>,
<2 21 RK_FUNC_1 &pcfg_pull_up_20ma>,
<2 22 RK_FUNC_1 &pcfg_pull_up_20ma>,
<2 23 RK_FUNC_1 &pcfg_pull_up_20ma>;
<2 RK_PC4 1 &pcfg_pull_up_20ma>,
<2 RK_PC5 1 &pcfg_pull_up_20ma>,
<2 RK_PC6 1 &pcfg_pull_up_20ma>,
<2 RK_PC7 1 &pcfg_pull_up_20ma>;
};
sdio0_cmd: sdio0-cmd {
rockchip,pins =
<2 24 RK_FUNC_1 &pcfg_pull_up_20ma>;
<2 RK_PD0 1 &pcfg_pull_up_20ma>;
};
sdio0_clk: sdio0-clk {
rockchip,pins =
<2 25 RK_FUNC_1 &pcfg_pull_none_20ma>;
<2 RK_PD1 1 &pcfg_pull_none_20ma>;
};
};
sdmmc {
sdmmc_bus1: sdmmc-bus1 {
rockchip,pins =
<4 8 RK_FUNC_1 &pcfg_pull_up_8ma>;
<4 RK_PB0 1 &pcfg_pull_up_8ma>;
};
sdmmc_bus4: sdmmc-bus4 {
rockchip,pins =
<4 8 RK_FUNC_1 &pcfg_pull_up_8ma>,
<4 9 RK_FUNC_1 &pcfg_pull_up_8ma>,
<4 10 RK_FUNC_1 &pcfg_pull_up_8ma>,
<4 11 RK_FUNC_1 &pcfg_pull_up_8ma>;
<4 RK_PB0 1 &pcfg_pull_up_8ma>,
<4 RK_PB1 1 &pcfg_pull_up_8ma>,
<4 RK_PB2 1 &pcfg_pull_up_8ma>,
<4 RK_PB3 1 &pcfg_pull_up_8ma>;
};
sdmmc_clk: sdmmc-clk {
rockchip,pins =
<4 12 RK_FUNC_1 &pcfg_pull_none_18ma>;
<4 RK_PB4 1 &pcfg_pull_none_18ma>;
};
sdmmc_cmd: sdmmc-cmd {
rockchip,pins =
<4 13 RK_FUNC_1 &pcfg_pull_up_8ma>;
<4 RK_PB5 1 &pcfg_pull_up_8ma>;
};
};
fusb30x {
fusb0_int: fusb0-int {
rockchip,pins =
<1 2 RK_FUNC_GPIO &pcfg_pull_up>;
<1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
compat {
cpt_gpio: cpt-gpio {
rockchip,pins =
<1 18 RK_FUNC_GPIO &pcfg_output_low>;
<1 RK_PC2 RK_FUNC_GPIO &pcfg_output_low>;
};
};
};

14
arch/arm64/boot/dts/rockchip/rk3399-box.dtsi
View File

@ -792,45 +792,45 @@ &pinctrl {
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins =
<0 10 RK_FUNC_GPIO &pcfg_pull_none>;
<0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
wireless-bluetooth {
uart0_gpios: uart0-gpios {
rockchip,pins =
<2 19 RK_FUNC_GPIO &pcfg_pull_none>;
<2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
usb2 {
host_vbus_drv: host-vbus-drv {
rockchip,pins =
<4 25 RK_FUNC_GPIO &pcfg_pull_none>;
<4 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
pmic {
pmic_int_l: pmic-int-l {
rockchip,pins =
<1 21 RK_FUNC_GPIO &pcfg_pull_up>;
<1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
};
vsel1_gpio: vsel1-gpio {
rockchip,pins =
<1 17 RK_FUNC_GPIO &pcfg_pull_down>;
<1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
};
vsel2_gpio: vsel2-gpio {
rockchip,pins =
<1 14 RK_FUNC_GPIO &pcfg_pull_down>;
<1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
gmac {
rgmii_sleep_pins: rgmii-sleep-pins {
rockchip,pins =
<3 15 RK_FUNC_GPIO &pcfg_output_low>;
<3 RK_PB7 RK_FUNC_GPIO &pcfg_output_low>;
};
};
};

2
arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android-avb.dts
View File

@ -382,7 +382,7 @@ &tc358749x_sound {
&pinctrl {
lcd-panel {
lcd_panel_reset: lcd-panel-reset {
rockchip,pins = <1 23 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <1 RK_PC7 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
};

2
arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android.dts
View File

@ -150,7 +150,7 @@ &tc358749x_sound {
&pinctrl {
lcd-panel {
lcd_panel_reset: lcd-panel-reset {
rockchip,pins = <1 23 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <1 RK_PC7 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
};

2
arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-linux.dts
View File

@ -310,7 +310,7 @@ &vopl_mmu {
&pinctrl {
lcd-panel {
lcd_panel_reset: lcd-panel-reset {
rockchip,pins = <1 23 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <1 RK_PC7 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
};

2
arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-v13-android-avb.dts
View File

@ -418,7 +418,7 @@ &tc358749x_sound {
&pinctrl {
lcd-panel {
lcd_panel_reset: lcd-panel-reset {
rockchip,pins = <1 23 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <1 RK_PC7 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
};

62
arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dtsi
View File

@ -1266,71 +1266,71 @@ &pinctrl {
ak8963 {
ak8963_irq_gpio: ak8963-irq-gpio {
rockchip,pins = <1 0 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
charger {
charger_ok: charge-ok {
rockchip,pins =
<0 5 RK_FUNC_GPIO &pcfg_pull_up>;
<0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
i2s0 {
i2s0_8ch_bus: i2s0-8ch-bus {
rockchip,pins =
<3 24 RK_FUNC_1 &pcfg_pull_none>,
<3 26 RK_FUNC_1 &pcfg_pull_none>,
<3 27 RK_FUNC_1 &pcfg_pull_none>,
<3 28 RK_FUNC_1 &pcfg_pull_none>,
<3 29 RK_FUNC_1 &pcfg_pull_none>,
<3 30 RK_FUNC_1 &pcfg_pull_none>,
<3 31 RK_FUNC_1 &pcfg_pull_none>;
<3 RK_PD0 1 &pcfg_pull_none>,
<3 RK_PD2 1 &pcfg_pull_none>,
<3 RK_PD3 1 &pcfg_pull_none>,
<3 RK_PD4 1 &pcfg_pull_none>,
<3 RK_PD5 1 &pcfg_pull_none>,
<3 RK_PD6 1 &pcfg_pull_none>,
<3 RK_PD7 1 &pcfg_pull_none>;
};
i2s_8ch_mclk: i2s-8ch-mclk {
rockchip,pins = <4 0 RK_FUNC_1 &pcfg_pull_none>;
rockchip,pins = <4 RK_PA0 1 &pcfg_pull_none>;
};
};
i2s1 {
i2s1_2ch_bus: i2s1-2ch-bus {
rockchip,pins =
<4 3 RK_FUNC_1 &pcfg_pull_none>,
<4 5 RK_FUNC_1 &pcfg_pull_none>,
<4 6 RK_FUNC_1 &pcfg_pull_none>,
<4 7 RK_FUNC_1 &pcfg_pull_none>;
<4 RK_PA3 1 &pcfg_pull_none>,
<4 RK_PA5 1 &pcfg_pull_none>,
<4 RK_PA6 1 &pcfg_pull_none>,
<4 RK_PA7 1 &pcfg_pull_none>;
};
};
headphone {
hp_det: hp-det {
rockchip,pins =
<0 11 0 &pcfg_pull_up>;
<0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
hdmiin {
hdmiin_gpios: hdmiin_gpios {
rockchip,pins =
<0 13 RK_FUNC_GPIO &pcfg_pull_none>,
<3 25 RK_FUNC_GPIO &pcfg_pull_none>,
<0 2 RK_FUNC_GPIO &pcfg_pull_none>,
<4 4 RK_FUNC_GPIO &pcfg_pull_none>;
<0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,
<3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>,
<0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>,
<4 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
fusb30x {
fusb0_int: fusb0-int {
rockchip,pins = <1 2 RK_FUNC_GPIO &pcfg_pull_up>,
<1 18 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>,
<1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
mpu6500 {
mpu6500_irq_gpio: mpu6500-irq-gpio {
rockchip,pins = <1 22 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
@ -1352,7 +1352,7 @@ vsel2_gpio: vsel2-gpio {
soc_slppin_gpio: soc-slppin-gpio {
rockchip,pins =
<1 RK_PA5 0 &pcfg_output_low>;
<1 RK_PA5 RK_FUNC_GPIO &pcfg_output_low>;
};
soc_slppin_slp: soc-slppin-slp {
@ -1364,29 +1364,29 @@ soc_slppin_slp: soc-slppin-slp {
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins =
<0 10 RK_FUNC_GPIO &pcfg_pull_none>;
<0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
wireless-bluetooth {
uart0_gpios: uart0-gpios {
rockchip,pins =
<2 19 RK_FUNC_GPIO &pcfg_pull_none>;
<2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
};
bt_reset_gpio: bt-reset-gpio {
rockchip,pins =
<0 9 RK_FUNC_GPIO &pcfg_pull_none>;
<0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
};
bt_wake_gpio: bt-wake-gpio {
rockchip,pins =
<0 4 RK_FUNC_GPIO &pcfg_pull_none>;
<0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
};
bt_irq_gpio: bt-irq-gpio {
rockchip,pins =
<2 27 RK_FUNC_GPIO &pcfg_pull_down>;
<2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
@ -1407,21 +1407,21 @@ lte_reset: lte-reset {
usb2 {
host_vbus_drv: host-vbus-drv {
rockchip,pins =
<0 8 RK_FUNC_GPIO &pcfg_pull_none>;
<0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
vcc_sd {
vcc_sd_h: vcc-sd-h {
rockchip,pins =
<0 1 RK_FUNC_GPIO &pcfg_pull_up>;
<0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
usbnet {
usbnet_pwr_drv: usbnet-pwr-drv {
rockchip,pins =
<4 18 RK_FUNC_GPIO &pcfg_pull_none>;
<4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

18
arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi
View File

@ -580,50 +580,50 @@ &saradc {
&pinctrl {
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins = <0 10 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
wireless-bluetooth {
uart0_gpios: uart0-gpios {
rockchip,pins = <2 19 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
pmic {
pmic_int_l: pmic-int-l {
rockchip,pins =
<1 21 RK_FUNC_GPIO &pcfg_pull_up>;
<1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
};
pmic_dvs2: pmic-dvs2 {
rockchip,pins =
<1 18 RK_FUNC_GPIO &pcfg_pull_down>;
<1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
};
vsel1_gpio: vsel1-gpio {
rockchip,pins =
<1 17 RK_FUNC_GPIO &pcfg_pull_down>;
<1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
};
vsel2_gpio: vsel2-gpio {
rockchip,pins =
<1 14 RK_FUNC_GPIO &pcfg_pull_down>;
<1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
usb2 {
host_vbus_drv: host-vbus-drv {
rockchip,pins =
<4 25 RK_FUNC_GPIO &pcfg_pull_none>;
<4 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
fusb30x {
fusb0_int: fusb0-int {
rockchip,pins = <1 2 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
};
fusb1_int: fusb1-int {
rockchip,pins = <1 24 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
};

10
arch/arm64/boot/dts/rockchip/rk3399-excavator-sapphire.dtsi
View File

@ -298,26 +298,26 @@ &pinctrl {
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins =
<0 10 RK_FUNC_GPIO &pcfg_pull_none>;
<0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
wireless-bluetooth {
uart0_gpios: uart0-gpios {
rockchip,pins =
<2 19 RK_FUNC_GPIO &pcfg_pull_none>;
<2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
};
bt_reset_gpio: bt-reset-gpio {
rockchip,pins =
<0 9 RK_FUNC_GPIO &pcfg_pull_none>;
<0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
};
bt_wake_gpio: bt-wake-gpio {
rockchip,pins =
<2 26 RK_FUNC_GPIO &pcfg_pull_none>;
<2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
};
bt_irq_gpio: bt-irq-gpio {
rockchip,pins =
<0 4 RK_FUNC_GPIO &pcfg_pull_down>;
<0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
};

26
arch/arm64/boot/dts/rockchip/rk3399-firefly-android.dts
View File

@ -848,79 +848,79 @@ &pinctrl {
lcd-panel {
lcd_panel_reset: lcd-panel-reset {
rockchip,pins = <4 29 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <4 RK_PD5 RK_FUNC_GPIO &pcfg_pull_up>;
};
lcd_en: lcd-en {
rockchip,pins = <1 1 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
pcie {
pcie_drv: pcie-drv {
rockchip,pins =
<1 17 RK_FUNC_GPIO &pcfg_pull_none>;
<1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
};
pcie_3g_drv: pcie-3g-drv {
rockchip,pins =
<0 2 RK_FUNC_GPIO &pcfg_pull_up>;
<0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
pmic {
vsel1_gpio: vsel1-gpio {
rockchip,pins =
<1 18 RK_FUNC_GPIO &pcfg_pull_down>;
<1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
};
vsel2_gpio: vsel2-gpio {
rockchip,pins =
<1 14 RK_FUNC_GPIO &pcfg_pull_down>;
<1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins =
<0 10 RK_FUNC_GPIO &pcfg_pull_none>;
<0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
wireless-bluetooth {
uart0_gpios: uart0-gpios {
rockchip,pins =
<2 19 RK_FUNC_GPIO &pcfg_pull_none>;
<2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
rt5640 {
rt5640_hpcon: rt5640-hpcon {
rockchip,pins = <4 21 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <4 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
pmic {
pmic_int_l: pmic-int-l {
rockchip,pins =
<1 21 RK_FUNC_GPIO &pcfg_pull_up>;
<1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
};
pmic_dvs2: pmic-dvs2 {
rockchip,pins =
<1 18 RK_FUNC_GPIO &pcfg_pull_down>;
<1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
usb2 {
host_vbus_drv: host-vbus-drv {
rockchip,pins =
<4 25 RK_FUNC_GPIO &pcfg_pull_none>;
<4 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
fusb30x {
fusb0_int: fusb0-int {
rockchip,pins = <1 2 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
};

28
arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts
View File

@ -801,85 +801,85 @@ &pmu_io_domains {
&pinctrl {
buttons {
pwrbtn: pwrbtn {
rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
lcd-panel {
lcd_panel_reset: lcd-panel-reset {
rockchip,pins = <4 29 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <4 RK_PD5 RK_FUNC_GPIO &pcfg_pull_up>;
};
lcd_en: lcd-en {
rockchip,pins = <1 1 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
pcie {
pcie_drv: pcie-drv {
rockchip,pins =
<1 17 RK_FUNC_GPIO &pcfg_pull_none>;
<1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
};
pcie_3g_drv: pcie-3g-drv {
rockchip,pins =
<0 2 RK_FUNC_GPIO &pcfg_pull_up>;
<0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
pmic {
vsel1_gpio: vsel1-gpio {
rockchip,pins =
<1 18 RK_FUNC_GPIO &pcfg_pull_down>;
<1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
};
vsel2_gpio: vsel2-gpio {
rockchip,pins =
<1 14 RK_FUNC_GPIO &pcfg_pull_down>;
<1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins =
<0 10 RK_FUNC_GPIO &pcfg_pull_none>;
<0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
wireless-bluetooth {
uart0_gpios: uart0-gpios {
rockchip,pins =
<2 19 RK_FUNC_GPIO &pcfg_pull_none>;
<2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
rt5640 {
rt5640_hpcon: rt5640-hpcon {
rockchip,pins = <4 21 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <4 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
pmic {
pmic_int_l: pmic-int-l {
rockchip,pins =
<1 21 RK_FUNC_GPIO &pcfg_pull_up>;
<1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
};
pmic_dvs2: pmic-dvs2 {
rockchip,pins =
<1 18 RK_FUNC_GPIO &pcfg_pull_down>;
<1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
usb2 {
host_vbus_drv: host-vbus-drv {
rockchip,pins =
<4 25 RK_FUNC_GPIO &pcfg_pull_none>;
<4 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
fusb30x {
fusb0_int: fusb0-int {
rockchip,pins = <1 2 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
};

2
arch/arm64/boot/dts/rockchip/rk3399-gru-gru.dts
View File

@ -154,7 +154,7 @@ fingerprint@0 {
&pinctrl {
discrete-regulators {
fp_en: fp-en {
rockchip,pins = <RK_GPIO1 1 RK_FUNC_GPIO
rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO
&pcfg_pull_none>;
};
};

12
arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r0.dts
View File

@ -91,28 +91,28 @@ &cros_ec {
/* Pinctrl overrides for -r0; in same order as parent */
&ec_ap_int_l {
rockchip,pins = <0 2 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
};
&pp1500_en {
rockchip,pins = <RK_GPIO1 11 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <1 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
};
&pp1800_audio_en {
rockchip,pins = <RK_GPIO0 1 RK_FUNC_GPIO
rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO
&pcfg_pull_none>;
};
&pp3000_en {
rockchip,pins = <RK_GPIO1 12 RK_FUNC_GPIO
rockchip,pins = <1 RK_PB4 RK_FUNC_GPIO
&pcfg_pull_none>;
};
&wlan_module_pd_l {
rockchip,pins = <RK_GPIO0 8 RK_FUNC_GPIO
rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO
&pcfg_pull_none>;
};
&sdmmc_cd_gpio {
rockchip,pins = <4 26 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
};

2
arch/arm64/boot/dts/rockchip/rk3399-gru-kevin-r1.dts
View File

@ -78,7 +78,7 @@ KEY_RESERVED
&pinctrl {
pen-eject {
pen_eject_l: pen-eject-l {
rockchip,pins = <RK_GPIO0 13 RK_FUNC_GPIO
rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO
&pcfg_pull_up>;
};
};

44
arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi
View File

@ -240,67 +240,67 @@ isp {
cif_clkout: cif-clkout {
rockchip,pins =
/* cif_clkout */
<2 11 RK_FUNC_3 &pcfg_pull_none>;
<2 RK_PB3 3 &pcfg_pull_none>;
};
isp_dvp_d0d7: isp-dvp-d0d7 {
rockchip,pins =
<4 27 RK_FUNC_GPIO &pcfg_pull_none>,
<4 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>,
/* cif_clkout */
<2 11 RK_FUNC_3 &pcfg_pull_none>,
<2 RK_PB3 3 &pcfg_pull_none>,
/* cif_data0 */
<2 0 RK_FUNC_3 &pcfg_pull_none>,
<2 RK_PA0 3 &pcfg_pull_none>,
/* cif_data1 */
<2 1 RK_FUNC_3 &pcfg_pull_none>,
<2 RK_PA1 3 &pcfg_pull_none>,
/* cif_data2 */
<2 2 RK_FUNC_3 &pcfg_pull_none>,
<2 RK_PA2 3 &pcfg_pull_none>,
/* cif_data3 */
<2 3 RK_FUNC_3 &pcfg_pull_none>,
<2 RK_PA3 3 &pcfg_pull_none>,
/* cif_data4 */
<2 4 RK_FUNC_3 &pcfg_pull_none>,
<2 RK_PA4 3 &pcfg_pull_none>,
/* cif_data5 */
<2 5 RK_FUNC_3 &pcfg_pull_none>,
<2 RK_PA5 3 &pcfg_pull_none>,
/* cif_data6 */
<2 6 RK_FUNC_3 &pcfg_pull_none>,
<2 RK_PA6 3 &pcfg_pull_none>,
/* cif_data7 */
<2 7 RK_FUNC_3 &pcfg_pull_none>,
<2 RK_PA7 3 &pcfg_pull_none>,
/* cif_sync */
<2 8 RK_FUNC_3 &pcfg_pull_none>,
<2 RK_PB0 3 &pcfg_pull_none>,
/* cif_href */
<2 9 RK_FUNC_3 &pcfg_pull_none>,
<2 RK_PB1 3 &pcfg_pull_none>,
/* cif_clkin */
<2 10 RK_FUNC_3 &pcfg_pull_none>;
<2 RK_PB2 3 &pcfg_pull_none>;
};
isp_shutter: isp-shutter {
rockchip,pins =
/* SHUTTEREN */
<1 1 RK_FUNC_1 &pcfg_pull_none>,
<1 RK_PA1 1 &pcfg_pull_none>,
/* SHUTTERTRIG */
<1 0 RK_FUNC_1 &pcfg_pull_none>;
<1 RK_PA0 1 &pcfg_pull_none>;
};
isp_flash_trigger: isp-flash-trigger {
/* ISP_FLASHTRIGOU */
rockchip,pins = <1 3 RK_FUNC_1 &pcfg_pull_none>;
rockchip,pins = <1 RK_PA3 1 &pcfg_pull_none>;
};
isp_flash_trigger_as_gpio: isp-flash-trigger-as-gpio {
/* ISP_FLASHTRIGOU */
rockchip,pins = <0 17 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
cam_pins {
cam0_default_pins: cam0-default-pins {
rockchip,pins =
<4 27 RK_FUNC_GPIO &pcfg_pull_none>,
<2 11 RK_FUNC_3 &pcfg_pull_none>;
<4 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>,
<2 RK_PB3 3 &pcfg_pull_none>;
};
cam0_sleep_pins: cam0-sleep-pins {
rockchip,pins =
<4 27 RK_FUNC_3 &pcfg_pull_none>,
<2 11 RK_FUNC_GPIO &pcfg_pull_none>;
<4 RK_PD3 3 &pcfg_pull_none>,
<2 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

36
arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts
View File

@ -958,101 +958,101 @@ &rockchip_suspend {
&pinctrl {
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins = <0 10 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
wireless-bluetooth {
uart0_gpios: uart0-gpios {
rockchip,pins = <2 19 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
};
bt_reset_gpio: bt-reset-gpio {
rockchip,pins = <0 9 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
};
bt_wake_gpio: bt-wake-gpio {
rockchip,pins = <2 26 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
};
bt_irq_gpio: bt-irq-gpio {
rockchip,pins = <0 4 RK_FUNC_GPIO &pcfg_pull_down>;
rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
pmic {
pmic_int_l: pmic-int-l {
rockchip,pins =
<1 21 RK_FUNC_GPIO &pcfg_pull_up>;
<1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
};
pmic_dvs2: pmic-dvs2 {
rockchip,pins =
<1 18 RK_FUNC_GPIO &pcfg_pull_down>;
<1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
};
vsel1_gpio: vsel1-gpio {
rockchip,pins =
<1 17 RK_FUNC_GPIO &pcfg_pull_down>;
<1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
};
vsel2_gpio: vsel2-gpio {
rockchip,pins =
<1 14 RK_FUNC_GPIO &pcfg_pull_down>;
<1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
hallsensor {
mh248_irq_gpio: mh248-irq-gpio {
rockchip,pins = <1 2 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
headphone {
hp_det: hp-det {
rockchip,pins = <4 28 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <4 RK_PD4 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
lsm330_a {
lsm330a_irq_gpio: lsm330a-irq-gpio {
rockchip,pins = <2 27 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
lsm330_g {
lsm330g_irq_gpio: lsm330g-irq-gpio {
rockchip,pins = <1 20 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <1 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
mpu6500 {
mpu6500_irq_gpio: mpu6500-irq-gpio {
rockchip,pins = <2 27 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
ak8963 {
ak8963_irq_gpio: ak8963-irq-gpio {
rockchip,pins = <2 28 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <2 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
cm3218 {
cm3218_irq_gpio: cm3218-irq-gpio {
rockchip,pins = <4 24 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <4 RK_PD0 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
usb2 {
host_vbus_drv: host-vbus-drv {
rockchip,pins =
<4 25 RK_FUNC_GPIO &pcfg_pull_none>;
<4 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
fusb30x {
fusb0_int: fusb0-int {
rockchip,pins =
<1 1 RK_FUNC_GPIO &pcfg_pull_up>;
<1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
};

46
arch/arm64/boot/dts/rockchip/rk3399-rock960-ab.dts
View File

@ -885,109 +885,109 @@ &pinctrl {
sdio0 {
sdio0_bus1: sdio0-bus1 {
rockchip,pins =
<2 20 RK_FUNC_1 &pcfg_pull_up_20ma>;
<2 RK_PC4 1 &pcfg_pull_up_20ma>;
};
sdio0_bus4: sdio0-bus4 {
rockchip,pins =
<2 20 RK_FUNC_1 &pcfg_pull_up_20ma>,
<2 21 RK_FUNC_1 &pcfg_pull_up_20ma>,
<2 22 RK_FUNC_1 &pcfg_pull_up_20ma>,
<2 23 RK_FUNC_1 &pcfg_pull_up_20ma>;
<2 RK_PC4 1 &pcfg_pull_up_20ma>,
<2 RK_PC5 1 &pcfg_pull_up_20ma>,
<2 RK_PC6 1 &pcfg_pull_up_20ma>,
<2 RK_PC7 1 &pcfg_pull_up_20ma>;
};
sdio0_cmd: sdio0-cmd {
rockchip,pins =
<2 24 RK_FUNC_1 &pcfg_pull_up_20ma>;
<2 RK_PD0 1 &pcfg_pull_up_20ma>;
};
sdio0_clk: sdio0-clk {
rockchip,pins =
<2 25 RK_FUNC_1 &pcfg_pull_none_20ma>;
<2 RK_PD1 1 &pcfg_pull_none_20ma>;
};
};
sdmmc {
sdmmc_bus1: sdmmc-bus1 {
rockchip,pins =
<4 8 RK_FUNC_1 &pcfg_pull_up_8ma>;
<4 RK_PB0 1 &pcfg_pull_up_8ma>;
};
sdmmc_bus4: sdmmc-bus4 {
rockchip,pins =
<4 8 RK_FUNC_1 &pcfg_pull_up_8ma>,
<4 9 RK_FUNC_1 &pcfg_pull_up_8ma>,
<4 10 RK_FUNC_1 &pcfg_pull_up_8ma>,
<4 11 RK_FUNC_1 &pcfg_pull_up_8ma>;
<4 RK_PB0 1 &pcfg_pull_up_8ma>,
<4 RK_PB1 1 &pcfg_pull_up_8ma>,
<4 RK_PB2 1 &pcfg_pull_up_8ma>,
<4 RK_PB3 1 &pcfg_pull_up_8ma>;
};
sdmmc_clk: sdmmc-clk {
rockchip,pins =
<4 12 RK_FUNC_1 &pcfg_pull_none_18ma>;
<4 RK_PB4 1 &pcfg_pull_none_18ma>;
};
sdmmc_cmd: sdmmc-cmd {
rockchip,pins =
<4 13 RK_FUNC_1 &pcfg_pull_up_8ma>;
<4 RK_PB5 1 &pcfg_pull_up_8ma>;
};
};
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins =
<0 10 RK_FUNC_GPIO &pcfg_pull_none>;
<0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
wireless-bluetooth {
uart0_gpios: uart0-gpios {
rockchip,pins =
<2 19 RK_FUNC_GPIO &pcfg_pull_none>;
<2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
usb2 {
host_vbus_drv: host-vbus-drv {
rockchip,pins =
<4 25 RK_FUNC_GPIO &pcfg_pull_none>;
<4 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
pcie {
pcie_drv: pcie-drv {
rockchip,pins =
<3 11 RK_FUNC_GPIO &pcfg_pull_none>;
<3 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
pmic {
pmic_int_l: pmic-int-l {
rockchip,pins =
<1 21 RK_FUNC_GPIO &pcfg_pull_up>;
<1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
};
vsel1_gpio: vsel1-gpio {
rockchip,pins =
<1 17 RK_FUNC_GPIO &pcfg_pull_down>;
<1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
};
vsel2_gpio: vsel2-gpio {
rockchip,pins =
<1 14 RK_FUNC_GPIO &pcfg_pull_down>;
<1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
gmac {
rgmii_sleep_pins: rgmii-sleep-pins {
rockchip,pins =
<3 15 RK_FUNC_GPIO &pcfg_output_low>;
<3 RK_PB7 RK_FUNC_GPIO &pcfg_output_low>;
};
};
fusb30x {
fusb0_int: fusb0-int {
rockchip,pins =
<1 2 RK_FUNC_GPIO &pcfg_pull_up>;
<1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
};

14
arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp-avb.dts
View File

@ -101,19 +101,19 @@ hdmiin {
tc35874x_gpios: tc35874x_gpios {
rockchip,pins =
/* PWREN_3.3 */
<2 5 RK_FUNC_GPIO &pcfg_output_high>,
<2 RK_PA5 RK_FUNC_GPIO &pcfg_output_high>,
/* PWREN_1.2 */
<2 6 RK_FUNC_GPIO &pcfg_output_high>,
<2 RK_PA6 RK_FUNC_GPIO &pcfg_output_high>,
/* HDMIIN_RST */
<2 7 RK_FUNC_GPIO &pcfg_pull_none>,
<2 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>,
/* HDMIIN_STBY */
<2 8 RK_FUNC_GPIO &pcfg_output_high>,
<2 RK_PB0 RK_FUNC_GPIO &pcfg_output_high>,
/* MIPI_RST */
<2 9 RK_FUNC_GPIO &pcfg_output_high>,
<2 RK_PB1 RK_FUNC_GPIO &pcfg_output_high>,
/* CSI_CTL */
<2 10 RK_FUNC_GPIO &pcfg_output_low>,
<2 RK_PB2 RK_FUNC_GPIO &pcfg_output_low>,
/* HDMIIN_INT */
<2 12 RK_FUNC_GPIO &pcfg_pull_none>;
<2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

14
arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dtsi
View File

@ -469,19 +469,19 @@ &rt5651_sound {
&pinctrl {
lcd-panel {
lcd_panel_reset: lcd-panel-reset {
rockchip,pins = <4 30 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
hdmiin {
hdmiin_gpios: hdmiin_gpios {
rockchip,pins =
<2 5 RK_FUNC_GPIO &pcfg_pull_none>,
<2 6 RK_FUNC_GPIO &pcfg_pull_none>,
<2 7 RK_FUNC_GPIO &pcfg_pull_none>,
<2 8 RK_FUNC_GPIO &pcfg_pull_none>,
<2 9 RK_FUNC_GPIO &pcfg_pull_none>,
<2 12 RK_FUNC_GPIO &pcfg_pull_none>;
<2 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>,
<2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,
<2 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>,
<2 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
<2 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>,
<2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

18
arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux-for-rk1808-cascade.dts
View File

@ -446,26 +446,26 @@ &pcie0 {
&pinctrl {
buttons {
pwrbtn: pwrbtn {
rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
lcd-panel {
lcd_panel_reset: lcd-panel-reset {
rockchip,pins = <4 30 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
hdmiin {
hdmiin_gpios: hdmiin-gpios {
rockchip,pins =
<2 5 RK_FUNC_GPIO &pcfg_output_high>,
<2 6 RK_FUNC_GPIO &pcfg_output_high>,
<2 7 RK_FUNC_GPIO &pcfg_pull_none>,
<2 8 RK_FUNC_GPIO &pcfg_output_high>,
<2 9 RK_FUNC_GPIO &pcfg_output_high>,
<2 10 RK_FUNC_GPIO &pcfg_output_low>,
<2 12 RK_FUNC_GPIO &pcfg_pull_none>;
<2 RK_PA5 RK_FUNC_GPIO &pcfg_output_high>,
<2 RK_PA6 RK_FUNC_GPIO &pcfg_output_high>,
<2 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>,
<2 RK_PB0 RK_FUNC_GPIO &pcfg_output_high>,
<2 RK_PB1 RK_FUNC_GPIO &pcfg_output_high>,
<2 RK_PB2 RK_FUNC_GPIO &pcfg_output_low>,
<2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

18
arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts
View File

@ -427,26 +427,26 @@ &vopl_mmu {
&pinctrl {
buttons {
pwrbtn: pwrbtn {
rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
lcd-panel {
lcd_panel_reset: lcd-panel-reset {
rockchip,pins = <4 30 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
hdmiin {
hdmiin_gpios: hdmiin-gpios {
rockchip,pins =
<2 5 RK_FUNC_GPIO &pcfg_output_high>,
<2 6 RK_FUNC_GPIO &pcfg_output_high>,
<2 7 RK_FUNC_GPIO &pcfg_pull_none>,
<2 8 RK_FUNC_GPIO &pcfg_output_high>,
<2 9 RK_FUNC_GPIO &pcfg_output_high>,
<2 10 RK_FUNC_GPIO &pcfg_output_low>,
<2 12 RK_FUNC_GPIO &pcfg_pull_none>;
<2 RK_PA5 RK_FUNC_GPIO &pcfg_output_high>,
<2 RK_PA6 RK_FUNC_GPIO &pcfg_output_high>,
<2 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>,
<2 RK_PB0 RK_FUNC_GPIO &pcfg_output_high>,
<2 RK_PB1 RK_FUNC_GPIO &pcfg_output_high>,
<2 RK_PB2 RK_FUNC_GPIO &pcfg_output_low>,
<2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

18
arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-lp4-linux.dts
View File

@ -472,26 +472,26 @@ &vopl_mmu {
&pinctrl {
buttons {
pwrbtn: pwrbtn {
rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
lcd-panel {
lcd_panel_reset: lcd-panel-reset {
rockchip,pins = <4 30 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
hdmiin {
hdmiin_gpios: hdmiin-gpios {
rockchip,pins =
<2 5 RK_FUNC_GPIO &pcfg_output_high>,
<2 6 RK_FUNC_GPIO &pcfg_output_high>,
<2 7 RK_FUNC_GPIO &pcfg_pull_none>,
<2 8 RK_FUNC_GPIO &pcfg_output_high>,
<2 9 RK_FUNC_GPIO &pcfg_output_high>,
<2 10 RK_FUNC_GPIO &pcfg_output_low>,
<2 12 RK_FUNC_GPIO &pcfg_pull_none>;
<2 RK_PA5 RK_FUNC_GPIO &pcfg_output_high>,
<2 RK_PA6 RK_FUNC_GPIO &pcfg_output_high>,
<2 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>,
<2 RK_PB0 RK_FUNC_GPIO &pcfg_output_high>,
<2 RK_PB1 RK_FUNC_GPIO &pcfg_output_high>,
<2 RK_PB2 RK_FUNC_GPIO &pcfg_output_low>,
<2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

16
arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts
View File

@ -1077,34 +1077,34 @@ &rockchip_suspend {
&pinctrl {
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins = <0 10 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
wireless-bluetooth {
uart0_gpios: uart0-gpios {
rockchip,pins = <2 19 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
pmic {
pmic_int_l: pmic-int-l {
rockchip,pins =
<1 21 RK_FUNC_GPIO &pcfg_pull_up>;
<1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
};
vsel1_gpio: vsel1-gpio {
rockchip,pins =
<1 17 RK_FUNC_GPIO &pcfg_pull_down>;
<1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
};
vsel2_gpio: vsel2-gpio {
rockchip,pins =
<1 14 RK_FUNC_GPIO &pcfg_pull_down>;
<1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
headphone {
hp_det: hp-det {
rockchip,pins = <4 28 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <4 RK_PD4 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
@ -1129,7 +1129,7 @@ touchpad_irq_gpio: touchpad-irq-gpio {
charger {
charger_ok: charge-ok {
rockchip,pins =
<1 23 RK_FUNC_GPIO &pcfg_pull_up>;
<1 RK_PC7 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
@ -1149,7 +1149,7 @@ leds_gpio: leds-gpio {
usb2 {
host_vbus_drv: host-vbus-drv {
rockchip,pins =
<4 25 RK_FUNC_GPIO &pcfg_pull_none>;
<4 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
};
};

6
arch/arm64/boot/dts/rockchip/rk3399-videostrong-linux.dts
View File

@ -273,21 +273,21 @@ &vopl_mmu {
&pinctrl {
buttons {
pwrbtn: pwrbtn {
rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins =
<0 10 RK_FUNC_GPIO &pcfg_pull_none>;
<0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
wireless-bluetooth {
uart0_gpios: uart0-gpios {
rockchip,pins =
<2 19 RK_FUNC_GPIO &pcfg_pull_none>;
<2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

38
arch/arm64/boot/dts/rockchip/rk3399pro-evb-lp4-v11-linux.dts
View File

@ -1174,28 +1174,28 @@ &pinctrl {
bq2570 {
charger_ok_int: charger-ok-int {
rockchip,pins =
<1 RK_PA1 0 &pcfg_pull_up>;
<1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
fusb30x {
fusb0_int: fusb0-int {
rockchip,pins =
<1 RK_PA2 0 &pcfg_pull_up>;
<1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
headphone {
hp_det: hp-det {
rockchip,pins =
<0 RK_PB5 0 &pcfg_pull_up>;
<0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
lcd_rst {
lcd_rst_gpio: lcd-rst-gpio {
rockchip,pins =
<3 RK_PA4 0 &pcfg_pull_none>;
<3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
@ -1209,20 +1209,20 @@ npu_ref_clk: npu-ref-clk {
pmic {
pmic_int_l: pmic-int-l {
rockchip,pins =
<1 RK_PC2 0 &pcfg_pull_up>;
<1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_up>;
};
vsel1_gpio: vsel1-gpio {
rockchip,pins =
<1 RK_PC1 0 &pcfg_pull_down>;
<1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
};
vsel2_gpio: vsel2-gpio {
rockchip,pins =
<1 RK_PB6 0 &pcfg_pull_down>;
<1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
};
soc_slppin_gpio: soc-slppin-gpio {
rockchip,pins =
<1 RK_PA5 0 &pcfg_output_low>;
<1 RK_PA5 RK_FUNC_GPIO &pcfg_output_low>;
};
soc_slppin_slp: soc-slppin-slp {
@ -1239,51 +1239,51 @@ soc_slppin_rst: soc-slppin-rst {
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins =
<2 RK_PD3 0 &pcfg_pull_none>;
<2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
sdmmc {
sdmmc_bus1: sdmmc-bus1 {
rockchip,pins =
<4 8 RK_FUNC_1 &pcfg_pull_up_10ma>;
<4 RK_PB0 1 &pcfg_pull_up_10ma>;
};
sdmmc_bus4: sdmmc-bus4 {
rockchip,pins =
<4 8 RK_FUNC_1 &pcfg_pull_up_10ma>,
<4 9 RK_FUNC_1 &pcfg_pull_up_10ma>,
<4 10 RK_FUNC_1 &pcfg_pull_up_10ma>,
<4 11 RK_FUNC_1 &pcfg_pull_up_10ma>;
<4 RK_PB0 1 &pcfg_pull_up_10ma>,
<4 RK_PB1 1 &pcfg_pull_up_10ma>,
<4 RK_PB2 1 &pcfg_pull_up_10ma>,
<4 RK_PB3 1 &pcfg_pull_up_10ma>;
};
sdmmc_clk: sdmmc-clk {
rockchip,pins =
<4 12 RK_FUNC_1 &pcfg_pull_none_10ma>;
<4 RK_PB4 1 &pcfg_pull_none_10ma>;
};
sdmmc_cmd: sdmmc-cmd {
rockchip,pins =
<4 13 RK_FUNC_1 &pcfg_pull_up_10ma>;
<4 RK_PB5 1 &pcfg_pull_up_10ma>;
};
};
tp_irq {
tp_irq_gpio: tp-irq-gpio {
rockchip,pins =
<3 RK_PB0 0 &pcfg_pull_up>;
<3 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
wireless-bluetooth {
bt_irq_gpio: bt-irq-gpio {
rockchip,pins =
<0 RK_PA5 0 &pcfg_pull_down>;
<0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_down>;
};
uart0_gpios: uart0-gpios {
rockchip,pins =
<2 RK_PC3 0 &pcfg_pull_none>;
<2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

38
arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts
View File

@ -1084,28 +1084,28 @@ &pinctrl {
bq2570 {
charger_ok_int: charger-ok-int {
rockchip,pins =
<1 RK_PA1 0 &pcfg_pull_up>;
<1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
fusb30x {
fusb0_int: fusb0-int {
rockchip,pins =
<1 RK_PA2 0 &pcfg_pull_up>;
<1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
headphone {
hp_det: hp-det {
rockchip,pins =
<0 RK_PB5 0 &pcfg_pull_up>;
<0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
lcd_rst {
lcd_rst_gpio: lcd-rst-gpio {
rockchip,pins =
<3 RK_PA4 0 &pcfg_pull_none>;
<3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
@ -1119,20 +1119,20 @@ npu_ref_clk: npu-ref-clk {
pmic {
pmic_int_l: pmic-int-l {
rockchip,pins =
<1 RK_PC2 0 &pcfg_pull_up>;
<1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_up>;
};
vsel1_gpio: vsel1-gpio {
rockchip,pins =
<1 RK_PC1 0 &pcfg_pull_down>;
<1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
};
vsel2_gpio: vsel2-gpio {
rockchip,pins =
<1 RK_PB6 0 &pcfg_pull_down>;
<1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
};
soc_slppin_gpio: soc-slppin-gpio {
rockchip,pins =
<1 RK_PA5 0 &pcfg_output_low>;
<1 RK_PA5 RK_FUNC_GPIO &pcfg_output_low>;
};
soc_slppin_slp: soc-slppin-slp {
@ -1149,51 +1149,51 @@ soc_slppin_rst: soc-slppin-rst {
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins =
<2 RK_PD3 0 &pcfg_pull_none>;
<2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
sdmmc {
sdmmc_bus1: sdmmc-bus1 {
rockchip,pins =
<4 8 RK_FUNC_1 &pcfg_pull_up_10ma>;
<4 RK_PB0 1 &pcfg_pull_up_10ma>;
};
sdmmc_bus4: sdmmc-bus4 {
rockchip,pins =
<4 8 RK_FUNC_1 &pcfg_pull_up_10ma>,
<4 9 RK_FUNC_1 &pcfg_pull_up_10ma>,
<4 10 RK_FUNC_1 &pcfg_pull_up_10ma>,
<4 11 RK_FUNC_1 &pcfg_pull_up_10ma>;
<4 RK_PB0 1 &pcfg_pull_up_10ma>,
<4 RK_PB1 1 &pcfg_pull_up_10ma>,
<4 RK_PB2 1 &pcfg_pull_up_10ma>,
<4 RK_PB3 1 &pcfg_pull_up_10ma>;
};
sdmmc_clk: sdmmc-clk {
rockchip,pins =
<4 12 RK_FUNC_1 &pcfg_pull_none_10ma>;
<4 RK_PB4 1 &pcfg_pull_none_10ma>;
};
sdmmc_cmd: sdmmc-cmd {
rockchip,pins =
<4 13 RK_FUNC_1 &pcfg_pull_up_10ma>;
<4 RK_PB5 1 &pcfg_pull_up_10ma>;
};
};
tp_irq {
tp_irq_gpio: tp-irq-gpio {
rockchip,pins =
<3 RK_PB0 0 &pcfg_pull_up>;
<3 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
wireless-bluetooth {
bt_irq_gpio: bt-irq-gpio {
rockchip,pins =
<0 RK_PA5 0 &pcfg_pull_down>;
<0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_down>;
};
uart0_gpios: uart0-gpios {
rockchip,pins =
<2 RK_PC3 0 &pcfg_pull_none>;
<2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

38
arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10.dts
View File

@ -952,28 +952,28 @@ &pinctrl {
bq2570 {
charger_ok_int: charger-ok-int {
rockchip,pins =
<1 RK_PA1 0 &pcfg_pull_up>;
<1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
fusb30x {
fusb0_int: fusb0-int {
rockchip,pins =
<1 RK_PA2 0 &pcfg_pull_up>;
<1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
headphone {
hp_det: hp-det {
rockchip,pins =
<0 RK_PB5 0 &pcfg_pull_up>;
<0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
lcd_rst {
lcd_rst_gpio: lcd-rst-gpio {
rockchip,pins =
<3 RK_PA4 0 &pcfg_pull_none>;
<3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
@ -987,20 +987,20 @@ npu_ref_clk: npu-ref-clk {
pmic {
pmic_int_l: pmic-int-l {
rockchip,pins =
<1 RK_PC2 0 &pcfg_pull_up>;
<1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_up>;
};
vsel1_gpio: vsel1-gpio {
rockchip,pins =
<1 RK_PC1 0 &pcfg_pull_down>;
<1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
};
vsel2_gpio: vsel2-gpio {
rockchip,pins =
<1 RK_PB6 0 &pcfg_pull_down>;
<1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
};
soc_slppin_gpio: soc-slppin-gpio {
rockchip,pins =
<1 RK_PA5 0 &pcfg_output_low>;
<1 RK_PA5 RK_FUNC_GPIO &pcfg_output_low>;
};
soc_slppin_slp: soc-slppin-slp {
@ -1012,50 +1012,50 @@ soc_slppin_slp: soc-slppin-slp {
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins =
<2 RK_PD3 0 &pcfg_pull_none>;
<2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
sdmmc {
sdmmc_bus1: sdmmc-bus1 {
rockchip,pins =
<4 8 RK_FUNC_1 &pcfg_pull_up_10ma>;
<4 RK_PB0 1 &pcfg_pull_up_10ma>;
};
sdmmc_bus4: sdmmc-bus4 {
rockchip,pins =
<4 8 RK_FUNC_1 &pcfg_pull_up_10ma>,
<4 9 RK_FUNC_1 &pcfg_pull_up_10ma>,
<4 10 RK_FUNC_1 &pcfg_pull_up_10ma>,
<4 11 RK_FUNC_1 &pcfg_pull_up_10ma>;
<4 RK_PB0 1 &pcfg_pull_up_10ma>,
<4 RK_PB1 1 &pcfg_pull_up_10ma>,
<4 RK_PB2 1 &pcfg_pull_up_10ma>,
<4 RK_PB3 1 &pcfg_pull_up_10ma>;
};
sdmmc_clk: sdmmc-clk {
rockchip,pins =
<4 12 RK_FUNC_1 &pcfg_pull_none_10ma>;
<4 RK_PB4 1 &pcfg_pull_none_10ma>;
};
sdmmc_cmd: sdmmc-cmd {
rockchip,pins =
<4 13 RK_FUNC_1 &pcfg_pull_up_10ma>;
<4 RK_PB5 1 &pcfg_pull_up_10ma>;
};
};
tp_irq {
tp_irq_gpio: tp-irq-gpio {
rockchip,pins =
<3 RK_PB0 0 &pcfg_pull_up>;
<3 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
wireless-bluetooth {
uart0_gpios: uart0-gpios {
rockchip,pins =
<2 RK_PC3 0 &pcfg_pull_none>;
<2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
};
bt_irq_gpio: bt-irq-gpio {
rockchip,pins =
<0 RK_PA5 0 &pcfg_pull_down>;
<0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
};

40
arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts
View File

@ -1097,35 +1097,35 @@ &pinctrl {
bq2570 {
charger_ok_int: charger-ok-int {
rockchip,pins =
<1 RK_PA1 0 &pcfg_pull_up>;
<1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
camera {
cam_pwren_high: cam-pwren-high {
rockchip,pins =
<4 RK_PC5 0 &pcfg_output_high>;
<4 RK_PC5 RK_FUNC_GPIO &pcfg_output_high>;
};
};
fusb30x {
fusb0_int: fusb0-int {
rockchip,pins =
<1 RK_PA2 0 &pcfg_pull_up>;
<1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
headphone {
hp_det: hp-det {
rockchip,pins =
<0 RK_PB5 0 &pcfg_pull_up>;
<0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
lcd_rst {
lcd_rst_gpio: lcd-rst-gpio {
rockchip,pins =
<3 RK_PA4 0 &pcfg_pull_none>;
<3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
@ -1139,20 +1139,20 @@ npu_ref_clk: npu-ref-clk {
pmic {
pmic_int_l: pmic-int-l {
rockchip,pins =
<1 RK_PC2 0 &pcfg_pull_up>;
<1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_up>;
};
vsel1_gpio: vsel1-gpio {
rockchip,pins =
<1 RK_PC1 0 &pcfg_pull_down>;
<1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
};
vsel2_gpio: vsel2-gpio {
rockchip,pins =
<1 RK_PB6 0 &pcfg_pull_down>;
<1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
};
soc_slppin_gpio: soc-slppin-gpio {
rockchip,pins =
<1 RK_PA5 0 &pcfg_output_low>;
<1 RK_PA5 RK_FUNC_GPIO &pcfg_output_low>;
};
soc_slppin_slp: soc-slppin-slp {
@ -1169,51 +1169,51 @@ soc_slppin_rst: soc-slppin-rst {
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins =
<2 RK_PD3 0 &pcfg_pull_none>;
<2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
sdmmc {
sdmmc_bus1: sdmmc-bus1 {
rockchip,pins =
<4 8 RK_FUNC_1 &pcfg_pull_up_10ma>;
<4 RK_PB0 1 &pcfg_pull_up_10ma>;
};
sdmmc_bus4: sdmmc-bus4 {
rockchip,pins =
<4 8 RK_FUNC_1 &pcfg_pull_up_10ma>,
<4 9 RK_FUNC_1 &pcfg_pull_up_10ma>,
<4 10 RK_FUNC_1 &pcfg_pull_up_10ma>,
<4 11 RK_FUNC_1 &pcfg_pull_up_10ma>;
<4 RK_PB0 1 &pcfg_pull_up_10ma>,
<4 RK_PB1 1 &pcfg_pull_up_10ma>,
<4 RK_PB2 1 &pcfg_pull_up_10ma>,
<4 RK_PB3 1 &pcfg_pull_up_10ma>;
};
sdmmc_clk: sdmmc-clk {
rockchip,pins =
<4 12 RK_FUNC_1 &pcfg_pull_none_10ma>;
<4 RK_PB4 1 &pcfg_pull_none_10ma>;
};
sdmmc_cmd: sdmmc-cmd {
rockchip,pins =
<4 13 RK_FUNC_1 &pcfg_pull_up_10ma>;
<4 RK_PB5 1 &pcfg_pull_up_10ma>;
};
};
tp_irq {
tp_irq_gpio: tp-irq-gpio {
rockchip,pins =
<3 RK_PB0 0 &pcfg_pull_up>;
<3 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
wireless-bluetooth {
bt_irq_gpio: bt-irq-gpio {
rockchip,pins =
<0 RK_PA5 0 &pcfg_pull_down>;
<0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_down>;
};
uart0_gpios: uart0-gpios {
rockchip,pins =
<2 RK_PC3 0 &pcfg_pull_none>;
<2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

38
arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11.dts
View File

@ -935,28 +935,28 @@ &pinctrl {
bq2570 {
charger_ok_int: charger-ok-int {
rockchip,pins =
<1 RK_PA1 0 &pcfg_pull_up>;
<1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
fusb30x {
fusb0_int: fusb0-int {
rockchip,pins =
<1 RK_PA2 0 &pcfg_pull_up>;
<1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
headphone {
hp_det: hp-det {
rockchip,pins =
<0 RK_PB5 0 &pcfg_pull_up>;
<0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
lcd_rst {
lcd_rst_gpio: lcd-rst-gpio {
rockchip,pins =
<3 RK_PA4 0 &pcfg_pull_none>;
<3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
@ -970,20 +970,20 @@ npu_ref_clk: npu-ref-clk {
pmic {
pmic_int_l: pmic-int-l {
rockchip,pins =
<1 RK_PC2 0 &pcfg_pull_up>;
<1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_up>;
};
vsel1_gpio: vsel1-gpio {
rockchip,pins =
<1 RK_PC1 0 &pcfg_pull_down>;
<1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
};
vsel2_gpio: vsel2-gpio {
rockchip,pins =
<1 RK_PB6 0 &pcfg_pull_down>;
<1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
};
soc_slppin_gpio: soc-slppin-gpio {
rockchip,pins =
<1 RK_PA5 0 &pcfg_output_low>;
<1 RK_PA5 RK_FUNC_GPIO &pcfg_output_low>;
};
soc_slppin_slp: soc-slppin-slp {
@ -995,51 +995,51 @@ soc_slppin_slp: soc-slppin-slp {
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins =
<2 RK_PD3 0 &pcfg_pull_none>;
<2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
sdmmc {
sdmmc_bus1: sdmmc-bus1 {
rockchip,pins =
<4 8 RK_FUNC_1 &pcfg_pull_up_10ma>;
<4 RK_PB0 1 &pcfg_pull_up_10ma>;
};
sdmmc_bus4: sdmmc-bus4 {
rockchip,pins =
<4 8 RK_FUNC_1 &pcfg_pull_up_10ma>,
<4 9 RK_FUNC_1 &pcfg_pull_up_10ma>,
<4 10 RK_FUNC_1 &pcfg_pull_up_10ma>,
<4 11 RK_FUNC_1 &pcfg_pull_up_10ma>;
<4 RK_PB0 1 &pcfg_pull_up_10ma>,
<4 RK_PB1 1 &pcfg_pull_up_10ma>,
<4 RK_PB2 1 &pcfg_pull_up_10ma>,
<4 RK_PB3 1 &pcfg_pull_up_10ma>;
};
sdmmc_clk: sdmmc-clk {
rockchip,pins =
<4 12 RK_FUNC_1 &pcfg_pull_none_10ma>;
<4 RK_PB4 1 &pcfg_pull_none_10ma>;
};
sdmmc_cmd: sdmmc-cmd {
rockchip,pins =
<4 13 RK_FUNC_1 &pcfg_pull_up_10ma>;
<4 RK_PB5 1 &pcfg_pull_up_10ma>;
};
};
tp_irq {
tp_irq_gpio: tp-irq-gpio {
rockchip,pins =
<3 RK_PB0 0 &pcfg_pull_up>;
<3 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
wireless-bluetooth {
uart0_gpios: uart0-gpios {
rockchip,pins =
<2 RK_PC3 0 &pcfg_pull_none>;
<2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
};
bt_irq_gpio: bt-irq-gpio {
rockchip,pins =
<0 RK_PA5 0 &pcfg_pull_down>;
<0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
};

4
arch/arm64/boot/dts/rockchip/rk3399pro-npu-evb-v10.dts
View File

@ -130,11 +130,11 @@ &tsadc {
&pinctrl {
vsel_gpio: vsel-gpio {
rockchip,pins =
<0 RK_PC6 0 &pcfg_pull_down>;
<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_down>;
};
pwr_key: pwr-key {
rockchip,pins =
<0 RK_PB0 0 &pcfg_pull_none>;
<0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
};
};

2
arch/arm64/boot/dts/rockchip/rk3399pro-npu.dtsi
View File

@ -802,7 +802,7 @@ uart2m2_xfer: uart2m2-xfer {
tsadc {
tsadc_otp_gpio: tsadc-otp-gpio {
rockchip,pins =
<0 RK_PA6 0 &pcfg_pull_none>;
<0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
};
tsadc_otp_out: tsadc-otp-out {

4
arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w103.dts
View File

@ -911,12 +911,12 @@ soc_slppin_gpio: soc_slppin_gpio {
soc_slppin_slp: soc_slppin_slp {
rockchip,pins =
<0 RK_PA2 RK_FUNC_1 &pcfg_pull_none>;
<0 RK_PA2 1 &pcfg_pull_none>;
};
soc_slppin_rst: soc_slppin_rst {
rockchip,pins =
<0 RK_PA2 RK_FUNC_2 &pcfg_pull_none>;
<0 RK_PA2 2 &pcfg_pull_none>;
};
};

6
arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w6.dts
View File

@ -713,7 +713,7 @@ cam {
cam_clkout0: cam-clkout0 {
rockchip,pins =
/* cam_clkout0 */
<4 RK_PA7 RK_FUNC_1 &pcfg_pull_none>;
<4 RK_PA7 1 &pcfg_pull_none>;
};
camera_rst: camera-rst {
@ -762,12 +762,12 @@ soc_slppin_gpio: soc_slppin_gpio {
soc_slppin_slp: soc_slppin_slp {
rockchip,pins =
<0 RK_PA2 RK_FUNC_1 &pcfg_pull_none>;
<0 RK_PA2 1 &pcfg_pull_none>;
};
soc_slppin_rst: soc_slppin_rst {
rockchip,pins =
<0 RK_PA2 RK_FUNC_2 &pcfg_pull_none>;
<0 RK_PA2 2 &pcfg_pull_none>;
};
};

4
arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts
View File

@ -786,12 +786,12 @@ soc_slppin_gpio: soc_slppin_gpio {
soc_slppin_slp: soc_slppin_slp {
rockchip,pins =
<0 RK_PA2 RK_FUNC_1 &pcfg_pull_none>;
<0 RK_PA2 1 &pcfg_pull_none>;
};
soc_slppin_rst: soc_slppin_rst {
rockchip,pins =
<0 RK_PA2 RK_FUNC_2 &pcfg_pull_none>;
<0 RK_PA2 2 &pcfg_pull_none>;
};
};

6
arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-k108.dts
View File

@ -1006,7 +1006,7 @@ cam {
cam_clkout0: cam-clkout0 {
rockchip,pins =
/* cam_clkout0 */
<4 RK_PA7 RK_FUNC_1 &pcfg_pull_none>;
<4 RK_PA7 1 &pcfg_pull_none>;
};
cam_sleep: cam-sleep {
@ -1070,12 +1070,12 @@ soc_slppin_gpio: soc_slppin_gpio {
soc_slppin_slp: soc_slppin_slp {
rockchip,pins =
<0 RK_PA2 RK_FUNC_1 &pcfg_pull_none>;
<0 RK_PA2 1 &pcfg_pull_none>;
};
soc_slppin_rst: soc_slppin_rst {
rockchip,pins =
<0 RK_PA2 RK_FUNC_2 &pcfg_pull_none>;
<0 RK_PA2 2 &pcfg_pull_none>;
};
};

6
arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-rkg11.dts
View File

@ -912,7 +912,7 @@ cam {
cam_clkout0: cam-clkout0 {
rockchip,pins =
/* cam_clkout0 */
<4 RK_PA7 RK_FUNC_1 &pcfg_pull_none>;
<4 RK_PA7 1 &pcfg_pull_none>;
};
cam_sleep: cam-sleep {
@ -980,12 +980,12 @@ soc_slppin_gpio: soc_slppin_gpio {
soc_slppin_slp: soc_slppin_slp {
rockchip,pins =
<0 RK_PA2 RK_FUNC_1 &pcfg_pull_none>;
<0 RK_PA2 1 &pcfg_pull_none>;
};
soc_slppin_rst: soc_slppin_rst {
rockchip,pins =
<0 RK_PA2 RK_FUNC_2 &pcfg_pull_none>;
<0 RK_PA2 2 &pcfg_pull_none>;
};
};

6
arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-v10.dts
View File

@ -934,7 +934,7 @@ cam {
cam_clkout0: cam-clkout0 {
rockchip,pins =
/* cam_clkout0 */
<4 RK_PA7 RK_FUNC_1 &pcfg_pull_none>;
<4 RK_PA7 1 &pcfg_pull_none>;
};
cam_sleep: cam-sleep {
@ -998,12 +998,12 @@ soc_slppin_gpio: soc_slppin_gpio {
soc_slppin_slp: soc_slppin_slp {
rockchip,pins =
<0 RK_PA2 RK_FUNC_1 &pcfg_pull_none>;
<0 RK_PA2 1 &pcfg_pull_none>;
};
soc_slppin_rst: soc_slppin_rst {
rockchip,pins =
<0 RK_PA2 RK_FUNC_2 &pcfg_pull_none>;
<0 RK_PA2 2 &pcfg_pull_none>;
};
};

6
arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts
View File

@ -933,7 +933,7 @@ cam {
cam_clkout0: cam-clkout0 {
rockchip,pins =
/* cam_clkout0 */
<4 RK_PA7 RK_FUNC_1 &pcfg_pull_none>;
<4 RK_PA7 1 &pcfg_pull_none>;
};
cam_sleep: cam-sleep {
@ -994,12 +994,12 @@ soc_slppin_gpio: soc_slppin_gpio {
soc_slppin_slp: soc_slppin_slp {
rockchip,pins =
<0 RK_PA2 RK_FUNC_1 &pcfg_pull_none>;
<0 RK_PA2 1 &pcfg_pull_none>;
};
soc_slppin_rst: soc_slppin_rst {
rockchip,pins =
<0 RK_PA2 RK_FUNC_2 &pcfg_pull_none>;
<0 RK_PA2 2 &pcfg_pull_none>;
};
};

6
arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi
View File

@ -1433,7 +1433,7 @@ &pinctrl {
mxc6655xa {
mxc6655xa_irq_gpio: mxc6655xa_irq_gpio {
rockchip,pins = <RK_GPIO3 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <3 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
@ -1450,12 +1450,12 @@ soc_slppin_gpio: soc_slppin_gpio {
soc_slppin_slp: soc_slppin_slp {
rockchip,pins =
<0 RK_PA2 RK_FUNC_1 &pcfg_pull_none>;
<0 RK_PA2 1 &pcfg_pull_none>;
};
soc_slppin_rst: soc_slppin_rst {
rockchip,pins =
<0 RK_PA2 RK_FUNC_2 &pcfg_pull_none>;
<0 RK_PA2 2 &pcfg_pull_none>;
};
};

4
arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dtsi
View File

@ -268,13 +268,13 @@ hp_det: hp-det {
mxc6655xa {
mxc6655xa_irq_gpio: mxc6655xa_irq_gpio {
rockchip,pins = <RK_GPIO3 RK_PD7 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <3 RK_PD7 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
sii902x {
sii902x_hdmi_int: sii902x-hdmi-int {
rockchip,pins = <3 RK_PA0 0 &pcfg_pull_up>;
rockchip,pins = <3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up>;
};
};

2
arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dtsi
View File

@ -431,7 +431,7 @@ hp_det: hp-det {
sii902x {
sii902x_hdmi_int: sii902x-hdmi-int {
rockchip,pins = <4 RK_PD2 0 &pcfg_pull_up>;
rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_up>;
};
};

2
arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi
View File

@ -2783,7 +2783,7 @@ gpio {
/omit-if-no-ref/
tsadc_gpio: tsadc-gpio {
rockchip,pins =
<0 RK_PA1 0 &pcfg_pull_none>;
<0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};