Skip to content

L
linux
Commit 2bc65fef authored by Johan Jonker's avatar Johan Jonker Committed by Heiko Stuebner
Browse files
Options

arm64: dts: rockchip: rename label and nodename pinctrl subnodes that end with gpio 

A test with the command below gives for example this error:

arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dt.yaml:
tsadc: tsadc-otp-gpio:
{'phandle': [[90]], 'rockchip,pins': [[0, 6, 0, 123]]}
is not of type 'array'

'gpio' is a sort of reserved nodename and should not be used
for pinctrl in combination with 'rockchip,pins', so change
nodes that end with 'gpio' to end with 'pin' or 'pins'.

make ARCH=arm64 dtbs_check
DT_SCHEMA_FILES=~/.local/lib/python3.5/site-packages/
dtschema/schemas/gpio/gpio.yaml
Signed-off-by: default avatarJohan Jonker <jbx6244@gmail.com>
Link: https://lore.kernel.org/r/20200524160636.16547-2-jbx6244@gmail.comSigned-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent 8a445086
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 94 deletions
arch/arm64/boot/dts/rockchip/px30.dtsi
View file @ 2bc65fef
...@@ -733,9 +733,9 @@ tsadc: tsadc@ff280000 { ...@@ -733,9 +733,9 @@ tsadc: tsadc@ff280000 {
rockchip,grf = <&grf>; rockchip,grf = <&grf>;
rockchip,hw-tshut-temp = <120000>; rockchip,hw-tshut-temp = <120000>;
pinctrl-names = "init", "default", "sleep"; pinctrl-names = "init", "default", "sleep";
pinctrl-0 = <&tsadc_otp_gpio>; pinctrl-0 = <&tsadc_otp_pin>;
pinctrl-1 = <&tsadc_otp_out>; pinctrl-1 = <&tsadc_otp_out>;
pinctrl-2 = <&tsadc_otp_gpio>; pinctrl-2 = <&tsadc_otp_pin>;
#thermal-sensor-cells = <1>; #thermal-sensor-cells = <1>;
status = "disabled"; status = "disabled";
}; };
...@@ -1373,7 +1373,7 @@ i2c3_xfer: i2c3-xfer { ...@@ -1373,7 +1373,7 @@ i2c3_xfer: i2c3-xfer {
}; };
tsadc { tsadc {
tsadc_otp_gpio: tsadc-otp-gpio { tsadc_otp_pin: tsadc-otp-pin {
rockchip,pins = rockchip,pins =
<0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>; <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
......
arch/arm64/boot/dts/rockchip/rk3308.dtsi
View file @ 2bc65fef
...@@ -1629,7 +1629,7 @@ spi2_mosi: spi2-mosi { ...@@ -1629,7 +1629,7 @@ spi2_mosi: spi2-mosi {
}; };
tsadc { tsadc {
tsadc_otp_gpio: tsadc-otp-gpio { tsadc_otp_pin: tsadc-otp-pin {
rockchip,pins = rockchip,pins =
<0 RK_PB2 0 &pcfg_pull_none>; <0 RK_PB2 0 &pcfg_pull_none>;
}; };
...@@ -1657,7 +1657,7 @@ uart0_rts: uart0-rts { ...@@ -1657,7 +1657,7 @@ uart0_rts: uart0-rts {
<2 RK_PA3 1 &pcfg_pull_none>; <2 RK_PA3 1 &pcfg_pull_none>;
}; };
uart0_rts_gpio: uart0-rts-gpio { uart0_rts_pin: uart0-rts-pin {
rockchip,pins = rockchip,pins =
<2 RK_PA3 0 &pcfg_pull_none>; <2 RK_PA3 0 &pcfg_pull_none>;
}; };
...@@ -1730,7 +1730,7 @@ uart4_rts: uart4-rts { ...@@ -1730,7 +1730,7 @@ uart4_rts: uart4-rts {
<4 RK_PA7 1 &pcfg_pull_none>; <4 RK_PA7 1 &pcfg_pull_none>;
}; };
uart4_rts_gpio: uart4-rts-gpio { uart4_rts_pin: uart4-rts-pin {
rockchip,pins = rockchip,pins =
<4 RK_PA7 0 &pcfg_pull_none>; <4 RK_PA7 0 &pcfg_pull_none>;
}; };
......
arch/arm64/boot/dts/rockchip/rk3328-evb.dts
View file @ 2bc65fef
...@@ -41,7 +41,7 @@ vcc_sd: sdmmc-regulator { ...@@ -41,7 +41,7 @@ vcc_sd: sdmmc-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
gpio = <&gpio0 30 GPIO_ACTIVE_LOW>; gpio = <&gpio0 30 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&sdmmc0m1_gpio>; pinctrl-0 = <&sdmmc0m1_pin>;
regulator-name = "vcc_sd"; regulator-name = "vcc_sd";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
......
arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
View file @ 2bc65fef
...@@ -34,7 +34,7 @@ vcc_sd: sdmmc-regulator { ...@@ -34,7 +34,7 @@ vcc_sd: sdmmc-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
gpio = <&gpio0 RK_PD6 GPIO_ACTIVE_LOW>; gpio = <&gpio0 RK_PD6 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&sdmmc0m1_gpio>; pinctrl-0 = <&sdmmc0m1_pin>;
regulator-boot-on; regulator-boot-on;
regulator-name = "vcc_sd"; regulator-name = "vcc_sd";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
......
arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
View file @ 2bc65fef
...@@ -25,7 +25,7 @@ vcc_sd: sdmmc-regulator { ...@@ -25,7 +25,7 @@ vcc_sd: sdmmc-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
gpio = <&gpio0 RK_PD6 GPIO_ACTIVE_LOW>; gpio = <&gpio0 RK_PD6 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&sdmmc0m1_gpio>; pinctrl-0 = <&sdmmc0m1_pin>;
regulator-name = "vcc_sd"; regulator-name = "vcc_sd";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
......
arch/arm64/boot/dts/rockchip/rk3328.dtsi
View file @ 2bc65fef
...@@ -552,9 +552,9 @@ tsadc: tsadc@ff250000 { ...@@ -552,9 +552,9 @@ tsadc: tsadc@ff250000 {
clocks = <&cru SCLK_TSADC>, <&cru PCLK_TSADC>; clocks = <&cru SCLK_TSADC>, <&cru PCLK_TSADC>;
clock-names = "tsadc", "apb_pclk"; clock-names = "tsadc", "apb_pclk";
pinctrl-names = "init", "default", "sleep"; pinctrl-names = "init", "default", "sleep";
pinctrl-0 = <&otp_gpio>; pinctrl-0 = <&otp_pin>;
pinctrl-1 = <&otp_out>; pinctrl-1 = <&otp_out>;
pinctrl-2 = <&otp_gpio>; pinctrl-2 = <&otp_pin>;
resets = <&cru SRST_TSADC>; resets = <&cru SRST_TSADC>;
reset-names = "tsadc-apb"; reset-names = "tsadc-apb";
rockchip,grf = <&grf>; rockchip,grf = <&grf>;
...@@ -1154,7 +1154,7 @@ i2c3_xfer: i2c3-xfer { ...@@ -1154,7 +1154,7 @@ i2c3_xfer: i2c3-xfer {
rockchip,pins = <0 RK_PA5 2 &pcfg_pull_none>, rockchip,pins = <0 RK_PA5 2 &pcfg_pull_none>,
<0 RK_PA6 2 &pcfg_pull_none>; <0 RK_PA6 2 &pcfg_pull_none>;
}; };
i2c3_gpio: i2c3-gpio { i2c3_pins: i2c3-pins {
rockchip,pins = rockchip,pins =
<0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>, <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>,
<0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>; <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
...@@ -1225,7 +1225,7 @@ pdmm0_fsync_sleep: pdmm0-fsync-sleep { ...@@ -1225,7 +1225,7 @@ pdmm0_fsync_sleep: pdmm0-fsync-sleep {
}; };
tsadc { tsadc {
otp_gpio: otp-gpio { otp_pin: otp-pin {
rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
...@@ -1248,7 +1248,7 @@ uart0_rts: uart0-rts { ...@@ -1248,7 +1248,7 @@ uart0_rts: uart0-rts {
rockchip,pins = <1 RK_PB2 1 &pcfg_pull_none>; rockchip,pins = <1 RK_PB2 1 &pcfg_pull_none>;
}; };
uart0_rts_gpio: uart0-rts-gpio { uart0_rts_pin: uart0-rts-pin {
rockchip,pins = <1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
...@@ -1267,7 +1267,7 @@ uart1_rts: uart1-rts { ...@@ -1267,7 +1267,7 @@ uart1_rts: uart1-rts {
rockchip,pins = <3 RK_PA5 4 &pcfg_pull_none>; rockchip,pins = <3 RK_PA5 4 &pcfg_pull_none>;
}; };
uart1_rts_gpio: uart1-rts-gpio { uart1_rts_pin: uart1-rts-pin {
rockchip,pins = <3 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <3 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
...@@ -1493,7 +1493,7 @@ sdmmc0m0_pwren: sdmmc0m0-pwren { ...@@ -1493,7 +1493,7 @@ sdmmc0m0_pwren: sdmmc0m0-pwren {
rockchip,pins = <2 RK_PA7 1 &pcfg_pull_up_4ma>; rockchip,pins = <2 RK_PA7 1 &pcfg_pull_up_4ma>;
}; };
sdmmc0m0_gpio: sdmmc0m0-gpio { sdmmc0m0_pin: sdmmc0m0-pin {
rockchip,pins = <2 RK_PA7 RK_FUNC_GPIO &pcfg_pull_up_4ma>; rockchip,pins = <2 RK_PA7 RK_FUNC_GPIO &pcfg_pull_up_4ma>;
}; };
}; };
...@@ -1503,7 +1503,7 @@ sdmmc0m1_pwren: sdmmc0m1-pwren { ...@@ -1503,7 +1503,7 @@ sdmmc0m1_pwren: sdmmc0m1-pwren {
rockchip,pins = <0 RK_PD6 3 &pcfg_pull_up_4ma>; rockchip,pins = <0 RK_PD6 3 &pcfg_pull_up_4ma>;
}; };
sdmmc0m1_gpio: sdmmc0m1-gpio { sdmmc0m1_pin: sdmmc0m1-pin {
rockchip,pins = <0 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up_4ma>; rockchip,pins = <0 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up_4ma>;
}; };
}; };
...@@ -1536,7 +1536,7 @@ sdmmc0_bus4: sdmmc0-bus4 { ...@@ -1536,7 +1536,7 @@ sdmmc0_bus4: sdmmc0-bus4 {
<1 RK_PA3 1 &pcfg_pull_up_8ma>; <1 RK_PA3 1 &pcfg_pull_up_8ma>;
}; };
sdmmc0_gpio: sdmmc0-gpio { sdmmc0_pins: sdmmc0-pins {
rockchip,pins = rockchip,pins =
<1 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up_4ma>, <1 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
<1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up_4ma>, <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
...@@ -1578,7 +1578,7 @@ sdmmc0ext_bus4: sdmmc0ext-bus4 { ...@@ -1578,7 +1578,7 @@ sdmmc0ext_bus4: sdmmc0ext-bus4 {
<3 RK_PA7 3 &pcfg_pull_up_4ma>; <3 RK_PA7 3 &pcfg_pull_up_4ma>;
}; };
sdmmc0ext_gpio: sdmmc0ext-gpio { sdmmc0ext_pins: sdmmc0ext-pins {
rockchip,pins = rockchip,pins =
<3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up_4ma>, <3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
<3 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up_4ma>, <3 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
...@@ -1623,7 +1623,7 @@ sdmmc1_bus4: sdmmc1-bus4 { ...@@ -1623,7 +1623,7 @@ sdmmc1_bus4: sdmmc1-bus4 {
<1 RK_PC1 1 &pcfg_pull_up_8ma>; <1 RK_PC1 1 &pcfg_pull_up_8ma>;
}; };
sdmmc1_gpio: sdmmc1-gpio { sdmmc1_pins: sdmmc1-pins {
rockchip,pins = rockchip,pins =
<1 RK_PB4 RK_FUNC_GPIO &pcfg_pull_up_4ma>, <1 RK_PB4 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
<1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up_4ma>, <1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up_4ma>,
...@@ -1817,7 +1817,7 @@ tsadc_pin { ...@@ -1817,7 +1817,7 @@ tsadc_pin {
tsadc_int: tsadc-int { tsadc_int: tsadc-int {
rockchip,pins = <2 RK_PB5 2 &pcfg_pull_none>; rockchip,pins = <2 RK_PB5 2 &pcfg_pull_none>;
}; };
tsadc_gpio: tsadc-gpio { tsadc_pin: tsadc-pin {
rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
......
arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts
View file @ 2bc65fef
...@@ -125,7 +125,7 @@ led_sd_haikou: led-sd-gpio { ...@@ -125,7 +125,7 @@ led_sd_haikou: led-sd-gpio {
}; };
sdmmc { sdmmc {
sdmmc_cd_gpio: sdmmc-cd-gpio { sdmmc_cd_pin: sdmmc-cd-pin {
rockchip,pins = rockchip,pins =
<2 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>; <2 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
......
arch/arm64/boot/dts/rockchip/rk3368.dtsi
View file @ 2bc65fef
...@@ -483,9 +483,9 @@ tsadc: tsadc@ff280000 { ...@@ -483,9 +483,9 @@ tsadc: tsadc@ff280000 {
resets = <&cru SRST_TSADC>; resets = <&cru SRST_TSADC>;
reset-names = "tsadc-apb"; reset-names = "tsadc-apb";
pinctrl-names = "init", "default", "sleep"; pinctrl-names = "init", "default", "sleep";
pinctrl-0 = <&otp_gpio>; pinctrl-0 = <&otp_pin>;
pinctrl-1 = <&otp_out>; pinctrl-1 = <&otp_out>;
pinctrl-2 = <&otp_gpio>; pinctrl-2 = <&otp_pin>;
#thermal-sensor-cells = <1>; #thermal-sensor-cells = <1>;
rockchip,hw-tshut-temp = <95000>; rockchip,hw-tshut-temp = <95000>;
status = "disabled"; status = "disabled";
...@@ -1145,7 +1145,7 @@ spi2_tx: spi2-tx { ...@@ -1145,7 +1145,7 @@ spi2_tx: spi2-tx {
}; };
tsadc { tsadc {
otp_gpio: otp-gpio { otp_pin: otp-pin {
rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
......
arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
View file @ 2bc65fef
...@@ -589,11 +589,11 @@ pcie_3g_drv: pcie-3g-drv { ...@@ -589,11 +589,11 @@ pcie_3g_drv: pcie-3g-drv {
}; };
pmic { pmic {
vsel1_gpio: vsel1-gpio { vsel1_pin: vsel1-pin {
rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>; rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
vsel2_gpio: vsel2-gpio { vsel2_pin: vsel2-pin {
rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>; rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
}; };
......
arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi
View file @ 2bc65fef
...@@ -499,7 +499,7 @@ &i2s0_8ch_bus { ...@@ -499,7 +499,7 @@ &i2s0_8ch_bus {
}; };
/* there is no external pull up, so need to set this pin pull up */ /* there is no external pull up, so need to set this pin pull up */
&sdmmc_cd_gpio { &sdmmc_cd_pin {
rockchip,pins = <1 RK_PB3 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <1 RK_PB3 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
......
arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
View file @ 2bc65fef
...@@ -516,7 +516,7 @@ &sdmmc { ...@@ -516,7 +516,7 @@ &sdmmc {
* configured as SDMMC and not JTAG. * configured as SDMMC and not JTAG.
*/ */
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_cd_gpio pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_cd_pin
&sdmmc_bus4>; &sdmmc_bus4>;
bus-width = <4>; bus-width = <4>;
...@@ -767,7 +767,7 @@ sdmmc_cd: sdmmc-cd { ...@@ -767,7 +767,7 @@ sdmmc_cd: sdmmc-cd {
}; };
/* This is where we actually hook up CD; has external pull */ /* This is where we actually hook up CD; has external pull */
sdmmc_cd_gpio: sdmmc-cd-gpio { sdmmc_cd_pin: sdmmc-cd-pin {
rockchip,pins = <4 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <4 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
......
arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts
View file @ 2bc65fef
...@@ -205,7 +205,7 @@ vdd_cpu_b: syr827@40 { ...@@ -205,7 +205,7 @@ vdd_cpu_b: syr827@40 {
compatible = "silergy,syr827"; compatible = "silergy,syr827";
reg = <0x40>; reg = <0x40>;
regulator-compatible = "fan53555-reg"; regulator-compatible = "fan53555-reg";
pinctrl-0 = <&vsel1_gpio>; pinctrl-0 = <&vsel1_pin>;
regulator-name = "vdd_cpu_b"; regulator-name = "vdd_cpu_b";
regulator-min-microvolt = <712500>; regulator-min-microvolt = <712500>;
regulator-max-microvolt = <1500000>; regulator-max-microvolt = <1500000>;
...@@ -223,7 +223,7 @@ vdd_gpu: syr828@41 { ...@@ -223,7 +223,7 @@ vdd_gpu: syr828@41 {
compatible = "silergy,syr828"; compatible = "silergy,syr828";
reg = <0x41>; reg = <0x41>;
regulator-compatible = "fan53555-reg"; regulator-compatible = "fan53555-reg";
pinctrl-0 = <&vsel2_gpio>; pinctrl-0 = <&vsel2_pin>;
regulator-name = "vdd_gpu"; regulator-name = "vdd_gpu";
regulator-min-microvolt = <712500>; regulator-min-microvolt = <712500>;
regulator-max-microvolt = <1500000>; regulator-max-microvolt = <1500000>;
...@@ -521,12 +521,12 @@ pmic_int_l: pmic-int-l { ...@@ -521,12 +521,12 @@ pmic_int_l: pmic-int-l {
<1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>; <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
vsel1_gpio: vsel1-gpio { vsel1_pin: vsel1-pin {
rockchip,pins = rockchip,pins =
<1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>; <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
vsel2_gpio: vsel2-gpio { vsel2_pin: vsel2-pin {
rockchip,pins = rockchip,pins =
<1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>; <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
......
arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts
View file @ 2bc65fef
...@@ -341,7 +341,7 @@ vdd_cpu_b: regulator@40 { ...@@ -341,7 +341,7 @@ vdd_cpu_b: regulator@40 {
reg = <0x40>; reg = <0x40>;
fcs,suspend-voltage-selector = <1>; fcs,suspend-voltage-selector = <1>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&vsel1_gpio>; pinctrl-0 = <&vsel1_pin>;
regulator-name = "vdd_cpu_b"; regulator-name = "vdd_cpu_b";
regulator-min-microvolt = <712500>; regulator-min-microvolt = <712500>;
regulator-max-microvolt = <1500000>; regulator-max-microvolt = <1500000>;
...@@ -360,7 +360,7 @@ vdd_gpu: regulator@41 { ...@@ -360,7 +360,7 @@ vdd_gpu: regulator@41 {
reg = <0x41>; reg = <0x41>;
fcs,suspend-voltage-selector = <1>; fcs,suspend-voltage-selector = <1>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&vsel2_gpio>; pinctrl-0 = <&vsel2_pin>;
regulator-name = "vdd_gpu"; regulator-name = "vdd_gpu";
regulator-min-microvolt = <712500>; regulator-min-microvolt = <712500>;
regulator-max-microvolt = <1500000>; regulator-max-microvolt = <1500000>;
...@@ -447,11 +447,11 @@ pmic_int_l: pmic-int-l { ...@@ -447,11 +447,11 @@ pmic_int_l: pmic-int-l {
rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
vsel1_gpio: vsel1-gpio { vsel1_pin: vsel1-pin {
rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>; rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
vsel2_gpio: vsel2-gpio { vsel2_pin: vsel2-pin {
rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>; rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
}; };
......
arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
View file @ 2bc65fef
...@@ -40,7 +40,7 @@ edp_panel: edp-panel { ...@@ -40,7 +40,7 @@ edp_panel: edp-panel {
backlight = <&backlight>; backlight = <&backlight>;
enable-gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>; enable-gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&panel_en_gpio>; pinctrl-0 = <&panel_en_pin>;
power-supply = <&vcc3v3_panel>; power-supply = <&vcc3v3_panel>;
ports { ports {
...@@ -67,7 +67,7 @@ panel_in_edp: endpoint@0 { ...@@ -67,7 +67,7 @@ panel_in_edp: endpoint@0 {
gpio-key-lid { gpio-key-lid {
compatible = "gpio-keys"; compatible = "gpio-keys";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&lidbtn_gpio>; pinctrl-0 = <&lidbtn_pin>;
lid { lid {
debounce-interval = <20>; debounce-interval = <20>;
...@@ -83,7 +83,7 @@ lid { ...@@ -83,7 +83,7 @@ lid {
gpio-key-power { gpio-key-power {
compatible = "gpio-keys"; compatible = "gpio-keys";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pwrbtn_gpio>; pinctrl-0 = <&pwrbtn_pin>;
power { power {
debounce-interval = <20>; debounce-interval = <20>;
...@@ -124,7 +124,7 @@ sdio_pwrseq: sdio-pwrseq { ...@@ -124,7 +124,7 @@ sdio_pwrseq: sdio-pwrseq {
clocks = <&rk808 1>; clocks = <&rk808 1>;
clock-names = "ext_clock"; clock-names = "ext_clock";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&wifi_enable_h_gpio>; pinctrl-0 = <&wifi_enable_h_pin>;
post-power-on-delay-ms = <100>; post-power-on-delay-ms = <100>;
power-off-delay-us = <500000>; power-off-delay-us = <500000>;
...@@ -136,7 +136,7 @@ sdio_pwrseq: sdio-pwrseq { ...@@ -136,7 +136,7 @@ sdio_pwrseq: sdio-pwrseq {
es8316-sound { es8316-sound {
compatible = "simple-audio-card"; compatible = "simple-audio-card";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&hp_det_gpio>; pinctrl-0 = <&hp_det_pin>;
simple-audio-card,name = "rockchip,es8316-codec"; simple-audio-card,name = "rockchip,es8316-codec";
simple-audio-card,format = "i2s"; simple-audio-card,format = "i2s";
simple-audio-card,mclk-fs = <256>; simple-audio-card,mclk-fs = <256>;
...@@ -220,7 +220,7 @@ vcc5v0_usb: pa_5v: vcc5v0-usb-regulator { ...@@ -220,7 +220,7 @@ vcc5v0_usb: pa_5v: vcc5v0-usb-regulator {
enable-active-high; enable-active-high;
gpio = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>; gpio = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pwr_5v_gpio>; pinctrl-0 = <&pwr_5v_pin>;
regulator-name = "vcc5v0_usb"; regulator-name = "vcc5v0_usb";
regulator-always-on; regulator-always-on;
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
...@@ -277,7 +277,7 @@ vcc3v0_sd: vcc3v0-sd { ...@@ -277,7 +277,7 @@ vcc3v0_sd: vcc3v0-sd {
enable-active-high; enable-active-high;
gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>; gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&sdmmc0_pwr_h_gpio>; pinctrl-0 = <&sdmmc0_pwr_h_pin>;
regulator-name = "vcc3v0_sd"; regulator-name = "vcc3v0_sd";
regulator-always-on; regulator-always-on;
regulator-min-microvolt = <3000000>; regulator-min-microvolt = <3000000>;
...@@ -295,7 +295,7 @@ vcc3v3_panel: vcc3v3-panel { ...@@ -295,7 +295,7 @@ vcc3v3_panel: vcc3v3-panel {
enable-active-high; enable-active-high;
gpio = <&gpio1 RK_PC6 GPIO_ACTIVE_HIGH>; gpio = <&gpio1 RK_PC6 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&lcdvcc_en_gpio>; pinctrl-0 = <&lcdvcc_en_pin>;
regulator-name = "vcc3v3_panel"; regulator-name = "vcc3v3_panel";
regulator-always-on; regulator-always-on;
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
...@@ -324,7 +324,7 @@ vcc5v0_otg: vcc5v0-otg { ...@@ -324,7 +324,7 @@ vcc5v0_otg: vcc5v0-otg {
enable-active-high; enable-active-high;
gpio = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; gpio = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&vcc5v0_host_en_gpio>; pinctrl-0 = <&vcc5v0_host_en_pin>;
regulator-name = "vcc5v0_otg"; regulator-name = "vcc5v0_otg";
regulator-always-on; regulator-always-on;
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
...@@ -343,7 +343,7 @@ vbus_5vout: vbus_typec: vbus-5vout { ...@@ -343,7 +343,7 @@ vbus_5vout: vbus_typec: vbus-5vout {
enable-active-high; enable-active-high;
gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>; gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&vcc5v0_typec0_en_gpio>; pinctrl-0 = <&vcc5v0_typec0_en_pin>;
regulator-name = "vbus_5vout"; regulator-name = "vbus_5vout";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
...@@ -375,7 +375,7 @@ mains_charger: dc-charger { ...@@ -375,7 +375,7 @@ mains_charger: dc-charger {
/* Also triggered by USB charger */ /* Also triggered by USB charger */
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&dc_det_gpio>; pinctrl-0 = <&dc_det_pin>;
}; };
}; };
...@@ -454,7 +454,7 @@ rk808: pmic@1b { ...@@ -454,7 +454,7 @@ rk808: pmic@1b {
interrupt-parent = <&gpio3>; interrupt-parent = <&gpio3>;
interrupts = <10 IRQ_TYPE_LEVEL_LOW>; interrupts = <10 IRQ_TYPE_LEVEL_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pmic_int_l_gpio>; pinctrl-0 = <&pmic_int_l_pin>;
rockchip,system-power-controller; rockchip,system-power-controller;
wakeup-source; wakeup-source;
...@@ -634,7 +634,7 @@ vdd_cpu_b: regulator@40 { ...@@ -634,7 +634,7 @@ vdd_cpu_b: regulator@40 {
reg = <0x40>; reg = <0x40>;
fcs,suspend-voltage-selector = <1>; fcs,suspend-voltage-selector = <1>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&vsel1_gpio>; pinctrl-0 = <&vsel1_pin>;
regulator-name = "vdd_cpu_b"; regulator-name = "vdd_cpu_b";
regulator-always-on; regulator-always-on;
regulator-boot-on; regulator-boot-on;
...@@ -653,7 +653,7 @@ vdd_gpu: regulator@41 { ...@@ -653,7 +653,7 @@ vdd_gpu: regulator@41 {
reg = <0x41>; reg = <0x41>;
fcs,suspend-voltage-selector = <1>; fcs,suspend-voltage-selector = <1>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&vsel2_gpio>; pinctrl-0 = <&vsel2_pin>;
regulator-name = "vdd_gpu"; regulator-name = "vdd_gpu";
regulator-always-on; regulator-always-on;
regulator-boot-on; regulator-boot-on;
...@@ -700,7 +700,7 @@ fusb0: fusb30x@22 { ...@@ -700,7 +700,7 @@ fusb0: fusb30x@22 {
interrupt-parent = <&gpio1>; interrupt-parent = <&gpio1>;
interrupts = <RK_PA2 IRQ_TYPE_LEVEL_LOW>; interrupts = <RK_PA2 IRQ_TYPE_LEVEL_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&fusb0_int_gpio>; pinctrl-0 = <&fusb0_int_pin>;
vbus-supply = <&vbus_typec>; vbus-supply = <&vbus_typec>;
connector { connector {
...@@ -770,7 +770,7 @@ cw2015@62 { ...@@ -770,7 +770,7 @@ cw2015@62 {
&i2s1 { &i2s1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2s_8ch_mclk_gpio>, <&i2s1_2ch_bus>; pinctrl-0 = <&i2s_8ch_mclk_pin>, <&i2s1_2ch_bus>;
rockchip,capture-channels = <8>; rockchip,capture-channels = <8>;
rockchip,playback-channels = <8>; rockchip,playback-channels = <8>;
status = "okay"; status = "okay";
...@@ -802,49 +802,49 @@ &pcie0 { ...@@ -802,49 +802,49 @@ &pcie0 {
&pinctrl { &pinctrl {
buttons { buttons {
pwrbtn_gpio: pwrbtn-gpio { pwrbtn_pin: pwrbtn-pin {
rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
lidbtn_gpio: lidbtn-gpio { lidbtn_pin: lidbtn-pin {
rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
dc-charger { dc-charger {
dc_det_gpio: dc-det-gpio { dc_det_pin: dc-det-pin {
rockchip,pins = <4 RK_PD0 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <4 RK_PD0 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
es8316 { es8316 {
hp_det_gpio: hp-det-gpio { hp_det_pin: hp-det-pin {
rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
fusb302x { fusb302x {
fusb0_int_gpio: fusb0-int-gpio { fusb0_int_pin: fusb0-int-pin {
rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
i2s1 { i2s1 {
i2s_8ch_mclk_gpio: i2s-8ch-mclk-gpio { i2s_8ch_mclk_pin: i2s-8ch-mclk-pin {
rockchip,pins = <4 RK_PA0 1 &pcfg_pull_none>; rockchip,pins = <4 RK_PA0 1 &pcfg_pull_none>;
}; };
}; };
lcd-panel { lcd-panel {
lcdvcc_en_gpio: lcdvcc-en-gpio { lcdvcc_en_pin: lcdvcc-en-pin {
rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
panel_en_gpio: panel-en-gpio { panel_en_pin: panel-en-pin {
rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
lcd_panel_reset_gpio: lcd-panel-reset-gpio { lcd_panel_reset_pin: lcd-panel-reset-pin {
rockchip,pins = <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
...@@ -860,58 +860,58 @@ slp_led_pin: slp-led-pin { ...@@ -860,58 +860,58 @@ slp_led_pin: slp-led-pin {
}; };
pmic { pmic {
pmic_int_l_gpio: pmic-int-l-gpio { pmic_int_l_pin: pmic-int-l-pin {
rockchip,pins = <3 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <3 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
vsel1_gpio: vsel1-gpio { vsel1_pin: vsel1-pin {
rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>; rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
vsel2_gpio: vsel2-gpio { vsel2_pin: vsel2-pin {
rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>; rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
}; };
sdcard { sdcard {
sdmmc0_pwr_h_gpio: sdmmc0-pwr-h-gpio { sdmmc0_pwr_h_pin: sdmmc0-pwr-h-pin {
rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
sdio-pwrseq { sdio-pwrseq {
wifi_enable_h_gpio: wifi-enable-h-gpio { wifi_enable_h_pin: wifi-enable-h-pin {
rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
usb-typec { usb-typec {
vcc5v0_typec0_en_gpio: vcc5v0-typec0-en-gpio { vcc5v0_typec0_en_pin: vcc5v0-typec0-en-pin {
rockchip,pins = <1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
usb2 { usb2 {
pwr_5v_gpio: pwr-5v-gpio { pwr_5v_pin: pwr-5v-pin {
rockchip,pins = <1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
vcc5v0_host_en_gpio: vcc5v0-host-en-gpio { vcc5v0_host_en_pin: vcc5v0-host-en-pin {
rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
wireless-bluetooth { wireless-bluetooth {
bt_wake_gpio: bt-wake-gpio { bt_wake_pin: bt-wake-pin {
rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
bt_host_wake_gpio: bt-host-wake-gpio { bt_host_wake_pin: bt-host-wake-pin {
rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
bt_reset_gpio: bt-reset-gpio { bt_reset_pin: bt-reset-pin {
rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
...@@ -1059,7 +1059,7 @@ bluetooth { ...@@ -1059,7 +1059,7 @@ bluetooth {
host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>; host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>;
max-speed = <1500000>; max-speed = <1500000>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&bt_host_wake_gpio &bt_wake_gpio &bt_reset_gpio>; pinctrl-0 = <&bt_host_wake_pin &bt_wake_pin &bt_reset_pin>;
shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>;
vbat-supply = <&wifi_bat>; vbat-supply = <&wifi_bat>;
vddio-supply = <&vcc_wl>; vddio-supply = <&vcc_wl>;
......
arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
View file @ 2bc65fef
...@@ -456,7 +456,7 @@ vdd_cpu_b: regulator@40 { ...@@ -456,7 +456,7 @@ vdd_cpu_b: regulator@40 {
reg = <0x40>; reg = <0x40>;
fcs,suspend-voltage-selector = <1>; fcs,suspend-voltage-selector = <1>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&vsel1_gpio>; pinctrl-0 = <&vsel1_pin>;
regulator-name = "vdd_cpu_b"; regulator-name = "vdd_cpu_b";
regulator-min-microvolt = <712500>; regulator-min-microvolt = <712500>;
regulator-max-microvolt = <1500000>; regulator-max-microvolt = <1500000>;
...@@ -475,7 +475,7 @@ vdd_gpu: regulator@41 { ...@@ -475,7 +475,7 @@ vdd_gpu: regulator@41 {
reg = <0x41>; reg = <0x41>;
fcs,suspend-voltage-selector = <1>; fcs,suspend-voltage-selector = <1>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&vsel2_gpio>; pinctrl-0 = <&vsel2_pin>;
regulator-name = "vdd_gpu"; regulator-name = "vdd_gpu";
regulator-min-microvolt = <712500>; regulator-min-microvolt = <712500>;
regulator-max-microvolt = <1500000>; regulator-max-microvolt = <1500000>;
...@@ -609,11 +609,11 @@ yellow_led_gpio: yellow_led-gpio { ...@@ -609,11 +609,11 @@ yellow_led_gpio: yellow_led-gpio {
}; };
pmic { pmic {
vsel1_gpio: vsel1-gpio { vsel1_pin: vsel1-pin {
rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>; rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
vsel2_gpio: vsel2-gpio { vsel2_pin: vsel2-pin {
rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>; rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
}; };
......
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
View file @ 2bc65fef
...@@ -390,7 +390,7 @@ vdd_cpu_b: regulator@40 { ...@@ -390,7 +390,7 @@ vdd_cpu_b: regulator@40 {
reg = <0x40>; reg = <0x40>;
fcs,suspend-voltage-selector = <1>; fcs,suspend-voltage-selector = <1>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&vsel1_gpio>; pinctrl-0 = <&vsel1_pin>;
regulator-name = "vdd_cpu_b"; regulator-name = "vdd_cpu_b";
regulator-min-microvolt = <712500>; regulator-min-microvolt = <712500>;
regulator-max-microvolt = <1500000>; regulator-max-microvolt = <1500000>;
...@@ -409,7 +409,7 @@ vdd_gpu: regulator@41 { ...@@ -409,7 +409,7 @@ vdd_gpu: regulator@41 {
reg = <0x41>; reg = <0x41>;
fcs,suspend-voltage-selector = <1>; fcs,suspend-voltage-selector = <1>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&vsel2_gpio>; pinctrl-0 = <&vsel2_pin>;
regulator-name = "vdd_gpu"; regulator-name = "vdd_gpu";
regulator-min-microvolt = <712500>; regulator-min-microvolt = <712500>;
regulator-max-microvolt = <1500000>; regulator-max-microvolt = <1500000>;
...@@ -532,11 +532,11 @@ pmic_int_l: pmic-int-l { ...@@ -532,11 +532,11 @@ pmic_int_l: pmic-int-l {
rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
vsel1_gpio: vsel1-gpio { vsel1_pin: vsel1-pin {
rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>; rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
vsel2_gpio: vsel2-gpio { vsel2_pin: vsel2-pin {
rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>; rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
}; };
......
arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
View file @ 2bc65fef
...@@ -470,12 +470,12 @@ pmic_int_l: pmic-int-l { ...@@ -470,12 +470,12 @@ pmic_int_l: pmic-int-l {
<1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>; <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
vsel1_gpio: vsel1-gpio { vsel1_pin: vsel1-pin {
rockchip,pins = rockchip,pins =
<1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>; <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
vsel2_gpio: vsel2-gpio { vsel2_pin: vsel2-pin {
rockchip,pins = rockchip,pins =
<1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>; <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
......
arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
View file @ 2bc65fef
...@@ -445,7 +445,7 @@ vdd_cpu_b: regulator@40 { ...@@ -445,7 +445,7 @@ vdd_cpu_b: regulator@40 {
reg = <0x40>; reg = <0x40>;
fcs,suspend-voltage-selector = <1>; fcs,suspend-voltage-selector = <1>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&vsel1_gpio>; pinctrl-0 = <&vsel1_pin>;
regulator-name = "vdd_cpu_b"; regulator-name = "vdd_cpu_b";
regulator-min-microvolt = <712500>; regulator-min-microvolt = <712500>;
regulator-max-microvolt = <1500000>; regulator-max-microvolt = <1500000>;
...@@ -464,7 +464,7 @@ vdd_gpu: regulator@41 { ...@@ -464,7 +464,7 @@ vdd_gpu: regulator@41 {
reg = <0x41>; reg = <0x41>;
fcs,suspend-voltage-selector = <1>; fcs,suspend-voltage-selector = <1>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&vsel2_gpio>; pinctrl-0 = <&vsel2_pin>;
regulator-name = "vdd_gpu"; regulator-name = "vdd_gpu";
regulator-min-microvolt = <712500>; regulator-min-microvolt = <712500>;
regulator-max-microvolt = <1500000>; regulator-max-microvolt = <1500000>;
...@@ -612,11 +612,11 @@ pmic_int_l: pmic-int-l { ...@@ -612,11 +612,11 @@ pmic_int_l: pmic-int-l {
rockchip,pins = <3 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <3 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
vsel1_gpio: vsel1-gpio { vsel1_pin: vsel1-pin {
rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>; rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
vsel2_gpio: vsel2-gpio { vsel2_pin: vsel2-pin {
rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>; rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
}; };
......
arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
View file @ 2bc65fef
...@@ -481,11 +481,11 @@ pmic_int_l: pmic-int-l { ...@@ -481,11 +481,11 @@ pmic_int_l: pmic-int-l {
<1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>; <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
vsel1_gpio: vsel1-gpio { vsel1_pin: vsel1-pin {
rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>; rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
vsel2_gpio: vsel2-gpio { vsel2_pin: vsel2-pin {
rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>; rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
}; };
......
arch/arm64/boot/dts/rockchip/rk3399.dtsi
View file @ 2bc65fef
...@@ -845,9 +845,9 @@ tsadc: tsadc@ff260000 { ...@@ -845,9 +845,9 @@ tsadc: tsadc@ff260000 {
rockchip,grf = <&grf>; rockchip,grf = <&grf>;
rockchip,hw-tshut-temp = <95000>; rockchip,hw-tshut-temp = <95000>;
pinctrl-names = "init", "default", "sleep"; pinctrl-names = "init", "default", "sleep";
pinctrl-0 = <&otp_gpio>; pinctrl-0 = <&otp_pin>;
pinctrl-1 = <&otp_out>; pinctrl-1 = <&otp_out>;
pinctrl-2 = <&otp_gpio>; pinctrl-2 = <&otp_pin>;
#thermal-sensor-cells = <1>; #thermal-sensor-cells = <1>;
status = "disabled"; status = "disabled";
}; };
...@@ -2485,7 +2485,7 @@ test_clkout2: test-clkout2 { ...@@ -2485,7 +2485,7 @@ test_clkout2: test-clkout2 {
}; };
tsadc { tsadc {
otp_gpio: otp-gpio { otp_pin: otp-pin {
rockchip,pins = <1 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <1 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7