Skip to content

L
linux
Commit b726e211 authored by Olof Johansson's avatar Olof Johansson
Browse files
Options

Merge tag 'v5.2-rockchip-dts64-2' of... 

Merge tag 'v5.2-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt

Bulk conversion of remaining gpios to the helper constants, new peripherals
for the rk3328-roc-cc and some minor fixes for rk3399 and rockpro64.

* tag 'v5.2-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: fix IO domain voltage setting of APIO5 on rockpro64
  arm64: dts: rockchip: fix cts, rts pin assign of UART3 for rk3399
  arm64: dts: rockchip: bulk convert gpios to their constant counterparts
  arm64: dts: rockchip: enable display nodes on rk3328-roc-cc
  arm64: dts: rockchip: eMMC additions for rk3328-roc-cc
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents bcb84a10 798689e4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 495 additions and 474 deletions
arch/arm64/boot/dts/rockchip/px30-evb.dts
View file @ b726e211
...@@ -145,12 +145,12 @@ soc_slppin_gpio: soc_slppin_gpio { ...@@ -145,12 +145,12 @@ soc_slppin_gpio: soc_slppin_gpio {
soc_slppin_slp: soc_slppin_slp { soc_slppin_slp: soc_slppin_slp {
rockchip,pins = rockchip,pins =
<0 RK_PA4 RK_FUNC_1 &pcfg_pull_none>; <0 RK_PA4 1 &pcfg_pull_none>;
}; };
soc_slppin_rst: soc_slppin_rst { soc_slppin_rst: soc_slppin_rst {
rockchip,pins = rockchip,pins =
<0 RK_PA4 RK_FUNC_2 &pcfg_pull_none>; <0 RK_PA4 2 &pcfg_pull_none>;
}; };
}; };
......
arch/arm64/boot/dts/rockchip/rk3328-evb.dts
View file @ b726e211
...@@ -208,7 +208,7 @@ pmic_int_l: pmic-int-l { ...@@ -208,7 +208,7 @@ pmic_int_l: pmic-int-l {
sdio-pwrseq { sdio-pwrseq {
wifi_enable_h: wifi-enable-h { wifi_enable_h: wifi-enable-h {
rockchip,pins = rockchip,pins =
<1 18 RK_FUNC_GPIO &pcfg_pull_none>; <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
}; };
......
arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
View file @ b726e211
...@@ -122,9 +122,14 @@ &cpu3 { ...@@ -122,9 +122,14 @@ &cpu3 {
&emmc { &emmc {
bus-width = <8>; bus-width = <8>;
cap-mmc-highspeed; cap-mmc-highspeed;
max-frequency = <150000000>;
mmc-ddr-1_8v;
mmc-hs200-1_8v;
non-removable; non-removable;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>; pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;
vmmc-supply = <&vcc_io>;
vqmmc-supply = <&vcc18_emmc>;
status = "okay"; status = "okay";
}; };
...@@ -145,6 +150,14 @@ &gmac2io { ...@@ -145,6 +150,14 @@ &gmac2io {
status = "okay"; status = "okay";
}; };
&hdmi {
status = "okay";
};
&hdmiphy {
status = "okay";
};
&i2c1 { &i2c1 {
status = "okay"; status = "okay";
...@@ -328,3 +341,11 @@ &usb_host0_ehci { ...@@ -328,3 +341,11 @@ &usb_host0_ehci {
&usb_host0_ohci { &usb_host0_ohci {
status = "okay"; status = "okay";
}; };
&vop {
status = "okay";
};
&vop_mmu {
status = "okay";
};
arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi
View file @ b726e211
...@@ -154,60 +154,60 @@ pcfg_pull_up_drv_8ma: pcfg-pull-up-drv-8ma { ...@@ -154,60 +154,60 @@ pcfg_pull_up_drv_8ma: pcfg-pull-up-drv-8ma {
backlight { backlight {
bl_en: bl-en { bl_en: bl-en {
rockchip,pins = <0 20 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
emmc { emmc {
emmc_bus8: emmc-bus8 { emmc_bus8: emmc-bus8 {
rockchip,pins = <1 18 RK_FUNC_2 &pcfg_pull_up_drv_8ma>, rockchip,pins = <1 RK_PC2 2 &pcfg_pull_up_drv_8ma>,
<1 19 RK_FUNC_2 &pcfg_pull_up_drv_8ma>, <1 RK_PC3 2 &pcfg_pull_up_drv_8ma>,
<1 20 RK_FUNC_2 &pcfg_pull_up_drv_8ma>, <1 RK_PC4 2 &pcfg_pull_up_drv_8ma>,
<1 21 RK_FUNC_2 &pcfg_pull_up_drv_8ma>, <1 RK_PC5 2 &pcfg_pull_up_drv_8ma>,
<1 22 RK_FUNC_2 &pcfg_pull_up_drv_8ma>, <1 RK_PC6 2 &pcfg_pull_up_drv_8ma>,
<1 23 RK_FUNC_2 &pcfg_pull_up_drv_8ma>, <1 RK_PC7 2 &pcfg_pull_up_drv_8ma>,
<1 24 RK_FUNC_2 &pcfg_pull_up_drv_8ma>, <1 RK_PD0 2 &pcfg_pull_up_drv_8ma>,
<1 25 RK_FUNC_2 &pcfg_pull_up_drv_8ma>; <1 RK_PD1 2 &pcfg_pull_up_drv_8ma>;
}; };
emmc-clk { 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 { 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 { 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>;
}; };
}; };
keys { keys {
pwr_key: pwr-key { 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>;
}; };
}; };
pmic { pmic {
pmic_int: pmic-int { 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>;
}; };
}; };
sdio { sdio {
wifi_reg_on: wifi-reg-on { wifi_reg_on: wifi-reg-on {
rockchip,pins = <3 4 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
bt_rst: bt-rst { bt_rst: bt-rst {
rockchip,pins = <3 5 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <3 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
usb { usb {
host_vbus_drv: host-vbus-drv { 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>;
}; };
}; };
}; };
......
arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts
View file @ b726e211
...@@ -233,23 +233,23 @@ vcc_lan: SWITCH_REG2 { ...@@ -233,23 +233,23 @@ vcc_lan: SWITCH_REG2 {
&pinctrl { &pinctrl {
ir { ir {
ir_int: ir-int { ir_int: ir-int {
rockchip,pins = <3 30 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <3 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
keys { keys {
pwr_key: pwr-key { pwr_key: pwr-key {
rockchip,pins = <0 2 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
pmic { pmic {
pmic_sleep: pmic-sleep { 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 { pmic_int: pmic-int {
rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
}; };
......
arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts
View file @ b726e211
...@@ -113,34 +113,34 @@ hog { ...@@ -113,34 +113,34 @@ hog {
haikou_pin_hog: haikou-pin-hog { haikou_pin_hog: haikou-pin-hog {
rockchip,pins = rockchip,pins =
/* LID_BTN */ /* LID_BTN */
<RK_GPIO3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>, <3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>,
/* BATLOW# */ /* BATLOW# */
<RK_GPIO0 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up>, <0 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up>,
/* SLP_BTN# */ /* SLP_BTN# */
<RK_GPIO3 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>, <3 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>,
/* BIOS_DISABLE# */ /* BIOS_DISABLE# */
<RK_GPIO3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up>; <3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
leds { leds {
led_sd_haikou: led-sd-gpio { led_sd_haikou: led-sd-gpio {
rockchip,pins = rockchip,pins =
<RK_GPIO0 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; <0 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
sdmmc { sdmmc {
sdmmc_cd_gpio: sdmmc-cd-gpio { sdmmc_cd_gpio: sdmmc-cd-gpio {
rockchip,pins = rockchip,pins =
<RK_GPIO2 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>; <2 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
usb_otg { usb_otg {
otg_vbus_drv: otg-vbus-drv { otg_vbus_drv: otg-vbus-drv {
rockchip,pins = rockchip,pins =
<RK_GPIO0 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>; <0 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
}; };
arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi
View file @ b726e211
...@@ -272,17 +272,17 @@ &pinctrl { ...@@ -272,17 +272,17 @@ &pinctrl {
leds { leds {
led_pins_module: led-module-gpio { led_pins_module: led-module-gpio {
rockchip,pins = rockchip,pins =
<RK_GPIO2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>, <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,
<RK_GPIO3 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>; <3 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
pmic { pmic {
pmic_int_l: pmic-int-l { pmic_int_l: pmic-int-l {
rockchip,pins = <RK_GPIO0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
pmic_sleep: pmic-sleep { pmic_sleep: pmic-sleep {
rockchip,pins = <RK_GPIO0 RK_PA0 RK_FUNC_2 &pcfg_pull_none>; rockchip,pins = <0 RK_PA0 2 &pcfg_pull_none>;
}; };
}; };
}; };
......
arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts
View file @ b726e211
...@@ -226,73 +226,73 @@ pcfg_pull_up_drv_8ma: pcfg-pull-up-drv-8ma { ...@@ -226,73 +226,73 @@ pcfg_pull_up_drv_8ma: pcfg-pull-up-drv-8ma {
emmc { emmc {
emmc_bus8: emmc-bus8 { emmc_bus8: emmc-bus8 {
rockchip,pins = <1 18 RK_FUNC_2 &pcfg_pull_up_drv_8ma>, rockchip,pins = <1 RK_PC2 2 &pcfg_pull_up_drv_8ma>,
<1 19 RK_FUNC_2 &pcfg_pull_up_drv_8ma>, <1 RK_PC3 2 &pcfg_pull_up_drv_8ma>,
<1 20 RK_FUNC_2 &pcfg_pull_up_drv_8ma>, <1 RK_PC4 2 &pcfg_pull_up_drv_8ma>,
<1 21 RK_FUNC_2 &pcfg_pull_up_drv_8ma>, <1 RK_PC5 2 &pcfg_pull_up_drv_8ma>,
<1 22 RK_FUNC_2 &pcfg_pull_up_drv_8ma>, <1 RK_PC6 2 &pcfg_pull_up_drv_8ma>,
<1 23 RK_FUNC_2 &pcfg_pull_up_drv_8ma>, <1 RK_PC7 2 &pcfg_pull_up_drv_8ma>,
<1 24 RK_FUNC_2 &pcfg_pull_up_drv_8ma>, <1 RK_PD0 2 &pcfg_pull_up_drv_8ma>,
<1 25 RK_FUNC_2 &pcfg_pull_up_drv_8ma>; <1 RK_PD1 2 &pcfg_pull_up_drv_8ma>;
}; };
emmc-clk { 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 { 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 { 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>;
}; };
}; };
keys { keys {
pwr_key: pwr-key { pwr_key: pwr-key {
rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_down>; rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
}; };
leds { leds {
stby_pwren: stby-pwren { 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 { 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>;
}; };
}; };
sdmmc { sdmmc {
sdmmc_clk: sdmmc-clk { sdmmc_clk: sdmmc-clk {
rockchip,pins = <2 9 RK_FUNC_1 &pcfg_pull_none_drv_8ma>; rockchip,pins = <2 RK_PB1 1 &pcfg_pull_none_drv_8ma>;
}; };
sdmmc_cmd: sdmmc-cmd { sdmmc_cmd: sdmmc-cmd {
rockchip,pins = <2 10 RK_FUNC_1 &pcfg_pull_up_drv_8ma>; rockchip,pins = <2 RK_PB2 1 &pcfg_pull_up_drv_8ma>;
}; };
sdmmc_cd: sdmmc-cd { sdmmc_cd: sdmmc-cd {
rockchip,pins = <2 11 RK_FUNC_1 &pcfg_pull_up_drv_8ma>; rockchip,pins = <2 RK_PB3 1 &pcfg_pull_up_drv_8ma>;
}; };
sdmmc_bus1: sdmmc-bus1 { sdmmc_bus1: sdmmc-bus1 {
rockchip,pins = <2 5 RK_FUNC_1 &pcfg_pull_up_drv_8ma>; rockchip,pins = <2 RK_PA5 1 &pcfg_pull_up_drv_8ma>;
}; };
sdmmc_bus4: sdmmc-bus4 { sdmmc_bus4: sdmmc-bus4 {
rockchip,pins = <2 5 RK_FUNC_1 &pcfg_pull_up_drv_8ma>, rockchip,pins = <2 RK_PA5 1 &pcfg_pull_up_drv_8ma>,
<2 6 RK_FUNC_1 &pcfg_pull_up_drv_8ma>, <2 RK_PA6 1 &pcfg_pull_up_drv_8ma>,
<2 7 RK_FUNC_1 &pcfg_pull_up_drv_8ma>, <2 RK_PA7 1 &pcfg_pull_up_drv_8ma>,
<2 8 RK_FUNC_1 &pcfg_pull_up_drv_8ma>; <2 RK_PB0 1 &pcfg_pull_up_drv_8ma>;
}; };
}; };
usb { usb {
host_vbus_drv: host-vbus-drv { 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>;
}; };
}; };
}; };
......
arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts
View file @ b726e211
...@@ -218,17 +218,17 @@ gsl1680: touchscreen@40 { ...@@ -218,17 +218,17 @@ gsl1680: touchscreen@40 {
&pinctrl { &pinctrl {
keys { keys {
pwr_key: pwr-key { pwr_key: pwr-key {
rockchip,pins = <0 2 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
pmic { pmic {
pmic_sleep: pmic-sleep { 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 { pmic_int: pmic-int {
rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
}; };
......
arch/arm64/boot/dts/rockchip/rk3368-r88.dts
View file @ b726e211
...@@ -235,64 +235,64 @@ pcfg_pull_up_drv_8ma: pcfg-pull-up-drv-8ma { ...@@ -235,64 +235,64 @@ pcfg_pull_up_drv_8ma: pcfg-pull-up-drv-8ma {
emmc { emmc {
emmc_bus8: emmc-bus8 { emmc_bus8: emmc-bus8 {
rockchip,pins = <1 18 RK_FUNC_2 &pcfg_pull_up_drv_8ma>, rockchip,pins = <1 RK_PC2 2 &pcfg_pull_up_drv_8ma>,
<1 19 RK_FUNC_2 &pcfg_pull_up_drv_8ma>, <1 RK_PC3 2 &pcfg_pull_up_drv_8ma>,
<1 20 RK_FUNC_2 &pcfg_pull_up_drv_8ma>, <1 RK_PC4 2 &pcfg_pull_up_drv_8ma>,
<1 21 RK_FUNC_2 &pcfg_pull_up_drv_8ma>, <1 RK_PC5 2 &pcfg_pull_up_drv_8ma>,
<1 22 RK_FUNC_2 &pcfg_pull_up_drv_8ma>, <1 RK_PC6 2 &pcfg_pull_up_drv_8ma>,
<1 23 RK_FUNC_2 &pcfg_pull_up_drv_8ma>, <1 RK_PC7 2 &pcfg_pull_up_drv_8ma>,
<1 24 RK_FUNC_2 &pcfg_pull_up_drv_8ma>, <1 RK_PD0 2 &pcfg_pull_up_drv_8ma>,
<1 25 RK_FUNC_2 &pcfg_pull_up_drv_8ma>; <1 RK_PD1 2 &pcfg_pull_up_drv_8ma>;
}; };
emmc-clk { 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 { 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 { 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 {
ir_int: ir-int { 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 { keys {
pwr_key: pwr-key { 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 { leds {
stby_pwren: stby-pwren { 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 { 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 { sdio {
wifi_reg_on: wifi-reg-on { wifi_reg_on: wifi-reg-on {
rockchip,pins = <3 4 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
bt_rst: bt-rst { bt_rst: bt-rst {
rockchip,pins = <3 5 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <3 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
usb { usb {
host_vbus_drv: host-vbus-drv { 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>;
}; };
}; };
}; };
......
arch/arm64/boot/dts/rockchip/rk3368.dtsi
View file @ b726e211
This diff is collapsed.
arch/arm64/boot/dts/rockchip/rk3399-evb.dts
View file @ b726e211
...@@ -208,19 +208,19 @@ &pinctrl { ...@@ -208,19 +208,19 @@ &pinctrl {
pmic { pmic {
pmic_int_l: pmic-int-l { pmic_int_l: pmic-int-l {
rockchip,pins = rockchip,pins =
<1 21 RK_FUNC_GPIO &pcfg_pull_up>; <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
pmic_dvs2: pmic-dvs2 { pmic_dvs2: pmic-dvs2 {
rockchip,pins = rockchip,pins =
<1 18 RK_FUNC_GPIO &pcfg_pull_down>; <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
}; };
usb2 { usb2 {
vcc5v0_host_en: vcc5v0-host-en { vcc5v0_host_en: vcc5v0-host-en {
rockchip,pins = rockchip,pins =
<4 25 RK_FUNC_GPIO &pcfg_pull_none>; <4 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
}; };
arch/arm64/boot/dts/rockchip/rk3399-ficus.dts
View file @ b726e211
...@@ -95,53 +95,53 @@ &pinctrl { ...@@ -95,53 +95,53 @@ &pinctrl {
gmac { gmac {
rgmii_sleep_pins: rgmii-sleep-pins { rgmii_sleep_pins: rgmii-sleep-pins {
rockchip,pins = rockchip,pins =
<3 15 RK_FUNC_GPIO &pcfg_output_low>; <3 RK_PB7 RK_FUNC_GPIO &pcfg_output_low>;
}; };
}; };
pcie { pcie {
pcie_drv: pcie-drv { pcie_drv: pcie-drv {
rockchip,pins = rockchip,pins =
<1 24 RK_FUNC_GPIO &pcfg_pull_none>; <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
usb2 { usb2 {
host_vbus_drv: host-vbus-drv { host_vbus_drv: host-vbus-drv {
rockchip,pins = rockchip,pins =
<4 27 RK_FUNC_GPIO &pcfg_pull_none>; <4 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
leds { leds {
user_led1: user_led1 { user_led1: user_led1 {
rockchip,pins = rockchip,pins =
<4 25 RK_FUNC_GPIO &pcfg_pull_none>; <4 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
user_led2: user_led2 { user_led2: user_led2 {
rockchip,pins = rockchip,pins =
<4 26 RK_FUNC_GPIO &pcfg_pull_none>; <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
user_led3: user_led3 { user_led3: user_led3 {
rockchip,pins = rockchip,pins =
<4 30 RK_FUNC_GPIO &pcfg_pull_none>; <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
user_led4: user_led4 { user_led4: user_led4 {
rockchip,pins = rockchip,pins =
<1 0 RK_FUNC_GPIO &pcfg_pull_none>; <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
wlan_led: wlan_led { wlan_led: wlan_led {
rockchip,pins = rockchip,pins =
<1 1 RK_FUNC_GPIO &pcfg_pull_none>; <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
bt_led: bt_led { bt_led: bt_led {
rockchip,pins = rockchip,pins =
<1 4 RK_FUNC_GPIO &pcfg_pull_none>; <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
}; };
......
arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dts
View file @ b726e211
...@@ -73,7 +73,7 @@ &spi0 { ...@@ -73,7 +73,7 @@ &spi0 {
&pinctrl { &pinctrl {
tpm { tpm {
h1_int_od_l: h1-int-od-l { h1_int_od_l: h1-int-od-l {
rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
}; };
arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi
View file @ b726e211
...@@ -365,27 +365,27 @@ &usbdrd_dwc3_1 { ...@@ -365,27 +365,27 @@ &usbdrd_dwc3_1 {
&pinctrl { &pinctrl {
discrete-regulators { discrete-regulators {
pp1500_en: pp1500-en { pp1500_en: pp1500-en {
rockchip,pins = <RK_GPIO0 10 RK_FUNC_GPIO rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO
&pcfg_pull_none>; &pcfg_pull_none>;
}; };
pp1800_audio_en: pp1800-audio-en { pp1800_audio_en: pp1800-audio-en {
rockchip,pins = <RK_GPIO0 2 RK_FUNC_GPIO rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO
&pcfg_pull_down>; &pcfg_pull_down>;
}; };
pp3000_en: pp3000-en { pp3000_en: pp3000-en {
rockchip,pins = <RK_GPIO0 12 RK_FUNC_GPIO rockchip,pins = <0 RK_PB4 RK_FUNC_GPIO
&pcfg_pull_none>; &pcfg_pull_none>;
}; };
pp3300_disp_en: pp3300-disp-en { pp3300_disp_en: pp3300-disp-en {
rockchip,pins = <RK_GPIO4 27 RK_FUNC_GPIO rockchip,pins = <4 RK_PD3 RK_FUNC_GPIO
&pcfg_pull_none>; &pcfg_pull_none>;
}; };
wlan_module_pd_l: wlan-module-pd-l { wlan_module_pd_l: wlan-module-pd-l {
rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO
&pcfg_pull_down>; &pcfg_pull_down>;
}; };
}; };
...@@ -393,10 +393,10 @@ wlan_module_pd_l: wlan-module-pd-l { ...@@ -393,10 +393,10 @@ wlan_module_pd_l: wlan-module-pd-l {
&wifi { &wifi {
wifi_perst_l: wifi-perst-l { wifi_perst_l: wifi-perst-l {
rockchip,pins = <2 27 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
wlan_host_wake_l: wlan-host-wake-l { wlan_host_wake_l: wlan-host-wake-l {
rockchip,pins = <0 8 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts
View file @ b726e211
...@@ -290,24 +290,24 @@ &pinctrl { ...@@ -290,24 +290,24 @@ &pinctrl {
digitizer { digitizer {
/* Has external pullup */ /* Has external pullup */
cpu1_dig_irq_l: cpu1-dig-irq-l { cpu1_dig_irq_l: cpu1-dig-irq-l {
rockchip,pins = <2 4 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <2 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
/* Has external pullup */ /* Has external pullup */
cpu1_dig_pdct_l: cpu1-dig-pdct-l { cpu1_dig_pdct_l: cpu1-dig-pdct-l {
rockchip,pins = <2 5 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <2 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
discrete-regulators { discrete-regulators {
cpu3_pen_pwr_en: cpu3-pen-pwr-en { cpu3_pen_pwr_en: cpu3-pen-pwr-en {
rockchip,pins = <4 30 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
pen { pen {
cpu1_pen_eject: cpu1-pen-eject { cpu1_pen_eject: cpu1-pen-eject {
rockchip,pins = <0 13 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
}; };
arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi
View file @ b726e211
...@@ -455,58 +455,58 @@ qca_bt: bluetooth@1 { ...@@ -455,58 +455,58 @@ qca_bt: bluetooth@1 {
/* PINCTRL OVERRIDES */ /* PINCTRL OVERRIDES */
&ec_ap_int_l { &ec_ap_int_l {
rockchip,pins = <1 18 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
&ap_fw_wp { &ap_fw_wp {
rockchip,pins = <0 13 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
&bl_en { &bl_en {
rockchip,pins = <4 21 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <4 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
&bt_host_wake_l { &bt_host_wake_l {
rockchip,pins = <1 2 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
&ec_ap_int_l { &ec_ap_int_l {
rockchip,pins = <1 18 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
&headset_int_l { &headset_int_l {
rockchip,pins = <1 23 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <1 RK_PC7 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
&i2s0_8ch_bus { &i2s0_8ch_bus {
rockchip,pins = rockchip,pins =
<3 24 RK_FUNC_1 &pcfg_pull_none_6ma>, <3 RK_PD0 1 &pcfg_pull_none_6ma>,
<3 25 RK_FUNC_1 &pcfg_pull_none_6ma>, <3 RK_PD1 1 &pcfg_pull_none_6ma>,
<3 26 RK_FUNC_1 &pcfg_pull_none_6ma>, <3 RK_PD2 1 &pcfg_pull_none_6ma>,
<3 27 RK_FUNC_1 &pcfg_pull_none_6ma>, <3 RK_PD3 1 &pcfg_pull_none_6ma>,
<3 31 RK_FUNC_1 &pcfg_pull_none_6ma>, <3 RK_PD7 1 &pcfg_pull_none_6ma>,
<4 0 RK_FUNC_1 &pcfg_pull_none_6ma>; <4 RK_PA0 1 &pcfg_pull_none_6ma>;
}; };
/* 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_gpio {
rockchip,pins = <1 11 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <1 RK_PB3 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
&sd_pwr_1800_sel { &sd_pwr_1800_sel {
rockchip,pins = <2 28 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <2 RK_PD4 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
&sdmode_en { &sdmode_en {
rockchip,pins = <0 2 RK_FUNC_GPIO &pcfg_pull_down>; rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
&touch_reset_l { &touch_reset_l {
rockchip,pins = <0 10 RK_FUNC_GPIO &pcfg_pull_down>; rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
&touch_int_l { &touch_int_l {
rockchip,pins = <1 4 RK_FUNC_GPIO &pcfg_pull_down>; rockchip,pins = <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
&pinctrl { &pinctrl {
...@@ -523,84 +523,84 @@ pcfg_pull_none_6ma: pcfg-pull-none-6ma { ...@@ -523,84 +523,84 @@ pcfg_pull_none_6ma: pcfg-pull-none-6ma {
camera { camera {
pp1250_cam_en: pp1250-dvdd { pp1250_cam_en: pp1250-dvdd {
rockchip,pins = <2 4 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <2 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
pp2800_cam_en: pp2800-avdd { pp2800_cam_en: pp2800-avdd {
rockchip,pins = <2 24 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <2 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
ucam_rst: ucam_rst { ucam_rst: ucam_rst {
rockchip,pins = <2 3 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <2 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
wcam_rst: wcam_rst { wcam_rst: wcam_rst {
rockchip,pins = <2 5 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <2 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
digitizer { digitizer {
pen_int_odl: pen-int-odl { pen_int_odl: pen-int-odl {
rockchip,pins = <1 0 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
pen_reset_l: pen-reset-l { pen_reset_l: pen-reset-l {
rockchip,pins = <0 12 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
discrete-regulators { discrete-regulators {
display_rst_l: display-rst-l { display_rst_l: display-rst-l {
rockchip,pins = <4 25 RK_FUNC_GPIO &pcfg_pull_down>; rockchip,pins = <4 RK_PD1 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
ppvarp_lcd_en: ppvarp-lcd-en { ppvarp_lcd_en: ppvarp-lcd-en {
rockchip,pins = <4 27 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <4 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
ppvarn_lcd_en: ppvarn-lcd-en { ppvarn_lcd_en: ppvarn-lcd-en {
rockchip,pins = <4 28 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <4 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
dmic { dmic {
dmic_en: dmic-en { dmic_en: dmic-en {
rockchip,pins = <4 3 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
pen { pen {
pen_eject_odl: pen-eject-odl { pen_eject_odl: pen-eject-odl {
rockchip,pins = <1 1 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
tpm { tpm {
h1_int_od_l: h1-int-od-l { h1_int_od_l: h1-int-od-l {
rockchip,pins = <1 17 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
}; };
&wifi { &wifi {
bt_en_1v8_l: bt-en-1v8-l { bt_en_1v8_l: bt-en-1v8-l {
rockchip,pins = <0 8 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
wlan_pd_1v8_l: wlan-pd-1v8-l { wlan_pd_1v8_l: wlan-pd-1v8-l {
rockchip,pins = <0 4 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
/* Default pull-up, but just to be clear */ /* Default pull-up, but just to be clear */
wlan_rf_kill_1v8_l: wlan-rf-kill-1v8-l { wlan_rf_kill_1v8_l: wlan-rf-kill-1v8-l {
rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
wifi_perst_l: wifi-perst-l { wifi_perst_l: wifi-perst-l {
rockchip,pins = <0 3 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
wlan_host_wake_l: wlan-host-wake-l { wlan_host_wake_l: wlan-host-wake-l {
rockchip,pins = <1 3 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
View file @ b726e211
...@@ -676,29 +676,29 @@ pcfg_pull_none_8ma: pcfg-pull-none-8ma { ...@@ -676,29 +676,29 @@ pcfg_pull_none_8ma: pcfg-pull-none-8ma {
backlight-enable { backlight-enable {
bl_en: bl-en { bl_en: bl-en {
rockchip,pins = <1 17 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
cros-ec { cros-ec {
ec_ap_int_l: ec-ap-int-l { ec_ap_int_l: ec-ap-int-l {
rockchip,pins = <RK_GPIO0 1 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
discrete-regulators { discrete-regulators {
sd_io_pwr_en: sd-io-pwr-en { sd_io_pwr_en: sd-io-pwr-en {
rockchip,pins = <RK_GPIO2 2 RK_FUNC_GPIO rockchip,pins = <2 RK_PA2 RK_FUNC_GPIO
&pcfg_pull_none>; &pcfg_pull_none>;
}; };
sd_pwr_1800_sel: sd-pwr-1800-sel { sd_pwr_1800_sel: sd-pwr-1800-sel {
rockchip,pins = <RK_GPIO2 28 RK_FUNC_GPIO rockchip,pins = <2 RK_PD4 RK_FUNC_GPIO
&pcfg_pull_none>; &pcfg_pull_none>;
}; };
sd_slot_pwr_en: sd-slot-pwr-en { sd_slot_pwr_en: sd-slot-pwr-en {
rockchip,pins = <RK_GPIO4 29 RK_FUNC_GPIO rockchip,pins = <4 RK_PD5 RK_FUNC_GPIO
&pcfg_pull_none>; &pcfg_pull_none>;
}; };
}; };
...@@ -706,17 +706,17 @@ sd_slot_pwr_en: sd-slot-pwr-en { ...@@ -706,17 +706,17 @@ sd_slot_pwr_en: sd-slot-pwr-en {
codec { codec {
/* Has external pullup */ /* Has external pullup */
headset_int_l: headset-int-l { headset_int_l: headset-int-l {
rockchip,pins = <1 23 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <1 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
mic_int: mic-int { mic_int: mic-int {
rockchip,pins = <1 13 RK_FUNC_GPIO &pcfg_pull_down>; rockchip,pins = <1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
}; };
max98357a { max98357a {
sdmode_en: sdmode-en { sdmode_en: sdmode-en {
rockchip,pins = <1 2 RK_FUNC_GPIO &pcfg_pull_down>; rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
}; };
...@@ -727,7 +727,7 @@ pcie_clkreqn_cpm: pci-clkreqn-cpm { ...@@ -727,7 +727,7 @@ pcie_clkreqn_cpm: pci-clkreqn-cpm {
* to hack this as gpio, so the EP could be able to * to hack this as gpio, so the EP could be able to
* de-assert it along and make ClockPM(CPM) work. * de-assert it along and make ClockPM(CPM) work.
*/ */
rockchip,pins = <2 26 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
...@@ -738,20 +738,20 @@ sdmmc { ...@@ -738,20 +738,20 @@ sdmmc {
*/ */
sdmmc_bus4: sdmmc-bus4 { sdmmc_bus4: sdmmc-bus4 {
rockchip,pins = rockchip,pins =
<4 8 RK_FUNC_1 &pcfg_pull_none_8ma>, <4 RK_PB0 1 &pcfg_pull_none_8ma>,
<4 9 RK_FUNC_1 &pcfg_pull_none_8ma>, <4 RK_PB1 1 &pcfg_pull_none_8ma>,
<4 10 RK_FUNC_1 &pcfg_pull_none_8ma>, <4 RK_PB2 1 &pcfg_pull_none_8ma>,
<4 11 RK_FUNC_1 &pcfg_pull_none_8ma>; <4 RK_PB3 1 &pcfg_pull_none_8ma>;
}; };
sdmmc_clk: sdmmc-clk { sdmmc_clk: sdmmc-clk {
rockchip,pins = rockchip,pins =
<4 12 RK_FUNC_1 &pcfg_pull_none_8ma>; <4 RK_PB4 1 &pcfg_pull_none_8ma>;
}; };
sdmmc_cmd: sdmmc-cmd { sdmmc_cmd: sdmmc-cmd {
rockchip,pins = rockchip,pins =
<4 13 RK_FUNC_1 &pcfg_pull_none_8ma>; <4 RK_PB5 1 &pcfg_pull_none_8ma>;
}; };
/* /*
...@@ -765,12 +765,12 @@ sdmmc_cmd: sdmmc-cmd { ...@@ -765,12 +765,12 @@ sdmmc_cmd: sdmmc-cmd {
*/ */
sdmmc_cd: sdmmc-cd { sdmmc_cd: sdmmc-cd {
rockchip,pins = rockchip,pins =
<0 7 RK_FUNC_1 &pcfg_pull_none>; <0 RK_PA7 1 &pcfg_pull_none>;
}; };
/* 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_gpio: sdmmc-cd-gpio {
rockchip,pins = <4 24 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <4 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
...@@ -780,47 +780,47 @@ spi1_sleep: spi1-sleep { ...@@ -780,47 +780,47 @@ spi1_sleep: spi1-sleep {
* Pull down SPI1 CLK/CS/RX/TX during suspend, to * Pull down SPI1 CLK/CS/RX/TX during suspend, to
* prevent leakage. * prevent leakage.
*/ */
rockchip,pins = <1 9 RK_FUNC_GPIO &pcfg_pull_down>, rockchip,pins = <1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_down>,
<1 10 RK_FUNC_GPIO &pcfg_pull_down>, <1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_down>,
<1 7 RK_FUNC_GPIO &pcfg_pull_down>, <1 RK_PA7 RK_FUNC_GPIO &pcfg_pull_down>,
<1 8 RK_FUNC_GPIO &pcfg_pull_down>; <1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
}; };
touchscreen { touchscreen {
touch_int_l: touch-int-l { touch_int_l: touch-int-l {
rockchip,pins = <3 13 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <3 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
touch_reset_l: touch-reset-l { touch_reset_l: touch-reset-l {
rockchip,pins = <4 26 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
trackpad { trackpad {
ap_i2c_tp_pu_en: ap-i2c-tp-pu-en { ap_i2c_tp_pu_en: ap-i2c-tp-pu-en {
rockchip,pins = <3 12 RK_FUNC_GPIO &pcfg_output_high>; rockchip,pins = <3 RK_PB4 RK_FUNC_GPIO &pcfg_output_high>;
}; };
trackpad_int_l: trackpad-int-l { trackpad_int_l: trackpad-int-l {
rockchip,pins = <1 4 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
wifi: wifi { wifi: wifi {
wlan_module_reset_l: wlan-module-reset-l { wlan_module_reset_l: wlan-module-reset-l {
rockchip,pins = <1 11 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <1 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
bt_host_wake_l: bt-host-wake-l { bt_host_wake_l: bt-host-wake-l {
/* Kevin has an external pull up, but Gru does not */ /* Kevin has an external pull up, but Gru does not */
rockchip,pins = <0 3 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
write-protect { write-protect {
ap_fw_wp: ap-fw-wp { ap_fw_wp: ap-fw-wp {
rockchip,pins = <1 18 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
}; };
arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts
View file @ b726e211
...@@ -125,7 +125,7 @@ &pinctrl { ...@@ -125,7 +125,7 @@ &pinctrl {
ir { ir {
ir_rx: ir-rx { ir_rx: ir-rx {
/* external pullup to VCC3V3_SYS, despite being 1.8V :/ */ /* external pullup to VCC3V3_SYS, despite being 1.8V :/ */
rockchip,pins = <0 RK_PA6 RK_FUNC_1 &pcfg_pull_none>; rockchip,pins = <0 RK_PA6 1 &pcfg_pull_none>;
}; };
}; };
}; };
......
arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts
View file @ b726e211
...@@ -547,7 +547,7 @@ pmic_int_l: pmic-int-l { ...@@ -547,7 +547,7 @@ pmic_int_l: pmic-int-l {
sd { sd {
sdmmc0_pwr_h: sdmmc0-pwr-h { sdmmc0_pwr_h: sdmmc0-pwr-h {
rockchip,pins = rockchip,pins =
<RK_GPIO0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>; <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
......
arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts
View file @ b726e211
...@@ -168,27 +168,27 @@ hog { ...@@ -168,27 +168,27 @@ hog {
haikou_pin_hog: haikou-pin-hog { haikou_pin_hog: haikou-pin-hog {
rockchip,pins = rockchip,pins =
/* LID_BTN */ /* LID_BTN */
<RK_GPIO0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>, <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>,
/* BATLOW# */ /* BATLOW# */
<RK_GPIO0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>, <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>,
/* SLP_BTN# */ /* SLP_BTN# */
<RK_GPIO0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_up>, <0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_up>,
/* BIOS_DISABLE# */ /* BIOS_DISABLE# */
<RK_GPIO0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_up>; <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
leds { leds {
led_sd_haikou: led-sd-gpio { led_sd_haikou: led-sd-gpio {
rockchip,pins = rockchip,pins =
<RK_GPIO1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>; <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
usb2 { usb2 {
otg_vbus_drv: otg-vbus-drv { otg_vbus_drv: otg-vbus-drv {
rockchip,pins = rockchip,pins =
<RK_GPIO0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>; <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
}; };
......
arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
View file @ b726e211
...@@ -412,10 +412,10 @@ &i2s0 { ...@@ -412,10 +412,10 @@ &i2s0 {
*/ */
&i2s0_2ch_bus { &i2s0_2ch_bus {
rockchip,pins = rockchip,pins =
<RK_GPIO3 RK_PD0 RK_FUNC_1 &pcfg_pull_none>, <3 RK_PD0 1 &pcfg_pull_none>,
<RK_GPIO3 RK_PD2 RK_FUNC_1 &pcfg_pull_none>, <3 RK_PD2 1 &pcfg_pull_none>,
<RK_GPIO3 RK_PD3 RK_FUNC_1 &pcfg_pull_none>, <3 RK_PD3 1 &pcfg_pull_none>,
<RK_GPIO3 RK_PD7 RK_FUNC_1 &pcfg_pull_none>; <3 RK_PD7 1 &pcfg_pull_none>;
}; };
&io_domains { &io_domains {
...@@ -439,29 +439,29 @@ &pinctrl { ...@@ -439,29 +439,29 @@ &pinctrl {
i2c8 { i2c8 {
i2c8_xfer_a: i2c8-xfer { i2c8_xfer_a: i2c8-xfer {
rockchip,pins = rockchip,pins =
<RK_GPIO1 RK_PC4 RK_FUNC_1 &pcfg_pull_up>, <1 RK_PC4 1 &pcfg_pull_up>,
<RK_GPIO1 RK_PC5 RK_FUNC_1 &pcfg_pull_up>; <1 RK_PC5 1 &pcfg_pull_up>;
}; };
}; };
leds { leds {
led_pin_module: led-module-gpio { led_pin_module: led-module-gpio {
rockchip,pins = rockchip,pins =
<RK_GPIO2 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>; <2 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
pmic { pmic {
pmic_int_l: pmic-int-l { pmic_int_l: pmic-int-l {
rockchip,pins = rockchip,pins =
<RK_GPIO1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>; <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
usb2 { usb2 {
vcc5v0_host_en: vcc5v0-host-en { vcc5v0_host_en: vcc5v0-host-en {
rockchip,pins = rockchip,pins =
<RK_GPIO4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>; <4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
}; };
......
arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
View file @ b726e211
...@@ -411,62 +411,62 @@ bt_wake_l: bt-wake-l { ...@@ -411,62 +411,62 @@ bt_wake_l: bt-wake-l {
sdmmc { sdmmc {
sdmmc_bus1: sdmmc-bus1 { sdmmc_bus1: sdmmc-bus1 {
rockchip,pins = rockchip,pins =
<4 8 RK_FUNC_1 &pcfg_pull_up_8ma>; <4 RK_PB0 1 &pcfg_pull_up_8ma>;
}; };
sdmmc_bus4: sdmmc-bus4 { sdmmc_bus4: sdmmc-bus4 {
rockchip,pins = rockchip,pins =
<4 8 RK_FUNC_1 &pcfg_pull_up_8ma>, <4 RK_PB0 1 &pcfg_pull_up_8ma>,
<4 9 RK_FUNC_1 &pcfg_pull_up_8ma>, <4 RK_PB1 1 &pcfg_pull_up_8ma>,
<4 10 RK_FUNC_1 &pcfg_pull_up_8ma>, <4 RK_PB2 1 &pcfg_pull_up_8ma>,
<4 11 RK_FUNC_1 &pcfg_pull_up_8ma>; <4 RK_PB3 1 &pcfg_pull_up_8ma>;
}; };
sdmmc_clk: sdmmc-clk { sdmmc_clk: sdmmc-clk {
rockchip,pins = rockchip,pins =
<4 12 RK_FUNC_1 &pcfg_pull_none_18ma>; <4 RK_PB4 1 &pcfg_pull_none_18ma>;
}; };
sdmmc_cmd: sdmmc-cmd { sdmmc_cmd: sdmmc-cmd {
rockchip,pins = rockchip,pins =
<4 13 RK_FUNC_1 &pcfg_pull_up_8ma>; <4 RK_PB5 1 &pcfg_pull_up_8ma>;
}; };
}; };
sdio0 { sdio0 {
sdio0_bus4: sdio0-bus4 { sdio0_bus4: sdio0-bus4 {
rockchip,pins = rockchip,pins =
<2 20 RK_FUNC_1 &pcfg_pull_up_20ma>, <2 RK_PC4 1 &pcfg_pull_up_20ma>,
<2 21 RK_FUNC_1 &pcfg_pull_up_20ma>, <2 RK_PC5 1 &pcfg_pull_up_20ma>,
<2 22 RK_FUNC_1 &pcfg_pull_up_20ma>, <2 RK_PC6 1 &pcfg_pull_up_20ma>,
<2 23 RK_FUNC_1 &pcfg_pull_up_20ma>; <2 RK_PC7 1 &pcfg_pull_up_20ma>;
}; };
sdio0_cmd: sdio0-cmd { sdio0_cmd: sdio0-cmd {
rockchip,pins = rockchip,pins =
<2 24 RK_FUNC_1 &pcfg_pull_up_20ma>; <2 RK_PD0 1 &pcfg_pull_up_20ma>;
}; };
sdio0_clk: sdio0-clk { sdio0_clk: sdio0-clk {
rockchip,pins = rockchip,pins =
<2 25 RK_FUNC_1 &pcfg_pull_none_20ma>; <2 RK_PD1 1 &pcfg_pull_none_20ma>;
}; };
}; };
pmic { pmic {
pmic_int_l: pmic-int-l { pmic_int_l: pmic-int-l {
rockchip,pins = rockchip,pins =
<1 21 RK_FUNC_GPIO &pcfg_pull_up>; <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
vsel1_gpio: vsel1-gpio { vsel1_gpio: vsel1-gpio {
rockchip,pins = rockchip,pins =
<1 17 RK_FUNC_GPIO &pcfg_pull_down>; <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
vsel2_gpio: vsel2-gpio { vsel2_gpio: vsel2-gpio {
rockchip,pins = rockchip,pins =
<1 14 RK_FUNC_GPIO &pcfg_pull_down>; <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
}; };
......
arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
View file @ b726e211
...@@ -508,7 +508,7 @@ &io_domains { ...@@ -508,7 +508,7 @@ &io_domains {
status = "okay"; status = "okay";
bt656-supply = <&vcc1v8_dvp>; bt656-supply = <&vcc1v8_dvp>;
audio-supply = <&vcca1v8_codec>; audio-supply = <&vcc_3v0>;
sdmmc-supply = <&vcc_sdio>; sdmmc-supply = <&vcc_sdio>;
gpio1830-supply = <&vcc_3v0>; gpio1830-supply = <&vcc_3v0>;
}; };
......
arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
View file @ b726e211
...@@ -471,7 +471,7 @@ pwr_btn: pwr-btn { ...@@ -471,7 +471,7 @@ pwr_btn: pwr-btn {
fan { fan {
motor_pwr: motor-pwr { motor_pwr: motor-pwr {
rockchip,pins = rockchip,pins =
<RK_GPIO1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>; <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
...@@ -493,7 +493,7 @@ vsel2_gpio: vsel2-gpio { ...@@ -493,7 +493,7 @@ vsel2_gpio: vsel2-gpio {
sd { sd {
sdmmc0_pwr_h: sdmmc0-pwr-h { sdmmc0_pwr_h: sdmmc0-pwr-h {
rockchip,pins = rockchip,pins =
<RK_GPIO0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>; <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
......
arch/arm64/boot/dts/rockchip/rk3399.dtsi
View file @ b726e211
This diff is collapsed.
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