Skip to content

L
linux
Commit 07f08d9c authored by Heiko Stuebner's avatar Heiko Stuebner
Browse files
Options

ARM: dts: rockchip: bulk convert gpios to their constant counterparts 

Rockchip SoCs use 2 different numbering schemes. Where the gpio-
controllers just count 0-31 for their 32 gpios, the underlying
iomux controller splits these into 4 separate entities A-D.

Device-schematics always use these iomux-values to identify pins,
so to make mapping schematics to devicetree easier Andy Yan introduced
named constants for the pins but so far we only used them on new
additions.

Using a sed-script created by Emil Renner Berthing bulk-convert
the remaining raw gpio numbers into their descriptive counterparts
and also gets rid of the unhelpful RK_FUNC_x -> x and RK_GPIOx -> x
mappings:

/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
Suggested-by: default avatarEmil Renner Berthing <esmil@mailme.dk>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent 280fa349
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 827 additions and 827 deletions
arch/arm/boot/dts/rk3036-kylin.dts
View file @ 07f08d9c
...@@ -368,31 +368,31 @@ &vop_mmu { ...@@ -368,31 +368,31 @@ &vop_mmu {
&pinctrl { &pinctrl {
leds { leds {
led_ctl: led-ctl { led_ctl: led-ctl {
rockchip,pins = <2 30 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <2 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
pmic { pmic {
pmic_int: pmic-int { pmic_int: pmic-int {
rockchip,pins = <2 2 RK_FUNC_GPIO &pcfg_pull_default>; rockchip,pins = <2 RK_PA2 RK_FUNC_GPIO &pcfg_pull_default>;
}; };
}; };
sdio { sdio {
bt_wake_h: bt-wake-h { bt_wake_h: bt-wake-h {
rockchip,pins = <2 8 RK_FUNC_GPIO &pcfg_pull_default>; rockchip,pins = <2 RK_PB0 RK_FUNC_GPIO &pcfg_pull_default>;
}; };
}; };
sdmmc { sdmmc {
sdmmc_pwr: sdmmc-pwr { sdmmc_pwr: sdmmc-pwr {
rockchip,pins = <2 28 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <2 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
sleep { sleep {
global_pwroff: global-pwroff { global_pwroff: global-pwroff {
rockchip,pins = <2 7 RK_FUNC_1 &pcfg_pull_none>; rockchip,pins = <2 RK_PA7 1 &pcfg_pull_none>;
}; };
}; };
}; };
arch/arm/boot/dts/rk3036.dtsi
View file @ 07f08d9c
...@@ -551,71 +551,71 @@ pcfg_pull_none: pcfg-pull-none { ...@@ -551,71 +551,71 @@ pcfg_pull_none: pcfg-pull-none {
pwm0 { pwm0 {
pwm0_pin: pwm0-pin { pwm0_pin: pwm0-pin {
rockchip,pins = <0 0 RK_FUNC_2 &pcfg_pull_none>; rockchip,pins = <0 RK_PA0 2 &pcfg_pull_none>;
}; };
}; };
pwm1 { pwm1 {
pwm1_pin: pwm1-pin { pwm1_pin: pwm1-pin {
rockchip,pins = <0 1 RK_FUNC_2 &pcfg_pull_none>; rockchip,pins = <0 RK_PA1 2 &pcfg_pull_none>;
}; };
}; };
pwm2 { pwm2 {
pwm2_pin: pwm2-pin { pwm2_pin: pwm2-pin {
rockchip,pins = <0 1 2 &pcfg_pull_none>; rockchip,pins = <0 RK_PA1 2 &pcfg_pull_none>;
}; };
}; };
pwm3 { pwm3 {
pwm3_pin: pwm3-pin { pwm3_pin: pwm3-pin {
rockchip,pins = <0 27 1 &pcfg_pull_none>; rockchip,pins = <0 RK_PD3 1 &pcfg_pull_none>;
}; };
}; };
sdmmc { sdmmc {
sdmmc_clk: sdmmc-clk { sdmmc_clk: sdmmc-clk {
rockchip,pins = <1 16 RK_FUNC_1 &pcfg_pull_none>; rockchip,pins = <1 RK_PC0 1 &pcfg_pull_none>;
}; };
sdmmc_cmd: sdmmc-cmd { sdmmc_cmd: sdmmc-cmd {
rockchip,pins = <1 15 RK_FUNC_1 &pcfg_pull_default>; rockchip,pins = <1 RK_PB7 1 &pcfg_pull_default>;
}; };
sdmmc_cd: sdmmc-cd { sdmmc_cd: sdmmc-cd {
rockchip,pins = <1 17 RK_FUNC_1 &pcfg_pull_default>; rockchip,pins = <1 RK_PC1 1 &pcfg_pull_default>;
}; };
sdmmc_bus1: sdmmc-bus1 { sdmmc_bus1: sdmmc-bus1 {
rockchip,pins = <1 18 RK_FUNC_1 &pcfg_pull_default>; rockchip,pins = <1 RK_PC2 1 &pcfg_pull_default>;
}; };
sdmmc_bus4: sdmmc-bus4 { sdmmc_bus4: sdmmc-bus4 {
rockchip,pins = <1 18 RK_FUNC_1 &pcfg_pull_default>, rockchip,pins = <1 RK_PC2 1 &pcfg_pull_default>,
<1 19 RK_FUNC_1 &pcfg_pull_default>, <1 RK_PC3 1 &pcfg_pull_default>,
<1 20 RK_FUNC_1 &pcfg_pull_default>, <1 RK_PC4 1 &pcfg_pull_default>,
<1 21 RK_FUNC_1 &pcfg_pull_default>; <1 RK_PC5 1 &pcfg_pull_default>;
}; };
}; };
sdio { sdio {
sdio_bus1: sdio-bus1 { sdio_bus1: sdio-bus1 {
rockchip,pins = <0 11 RK_FUNC_1 &pcfg_pull_default>; rockchip,pins = <0 RK_PB3 1 &pcfg_pull_default>;
}; };
sdio_bus4: sdio-bus4 { sdio_bus4: sdio-bus4 {
rockchip,pins = <0 11 RK_FUNC_1 &pcfg_pull_default>, rockchip,pins = <0 RK_PB3 1 &pcfg_pull_default>,
<0 12 RK_FUNC_1 &pcfg_pull_default>, <0 RK_PB4 1 &pcfg_pull_default>,
<0 13 RK_FUNC_1 &pcfg_pull_default>, <0 RK_PB5 1 &pcfg_pull_default>,
<0 14 RK_FUNC_1 &pcfg_pull_default>; <0 RK_PB6 1 &pcfg_pull_default>;
}; };
sdio_cmd: sdio-cmd { sdio_cmd: sdio-cmd {
rockchip,pins = <0 8 RK_FUNC_1 &pcfg_pull_default>; rockchip,pins = <0 RK_PB0 1 &pcfg_pull_default>;
}; };
sdio_clk: sdio-clk { sdio_clk: sdio-clk {
rockchip,pins = <0 9 RK_FUNC_1 &pcfg_pull_none>; rockchip,pins = <0 RK_PB1 1 &pcfg_pull_none>;
}; };
}; };
...@@ -625,135 +625,135 @@ emmc { ...@@ -625,135 +625,135 @@ emmc {
* We also have external pulls, so disable the internal ones. * We also have external pulls, so disable the internal ones.
*/ */
emmc_clk: emmc-clk { emmc_clk: emmc-clk {
rockchip,pins = <2 4 RK_FUNC_2 &pcfg_pull_none>; rockchip,pins = <2 RK_PA4 2 &pcfg_pull_none>;
}; };
emmc_cmd: emmc-cmd { emmc_cmd: emmc-cmd {
rockchip,pins = <2 1 RK_FUNC_2 &pcfg_pull_default>; rockchip,pins = <2 RK_PA1 2 &pcfg_pull_default>;
}; };
emmc_bus8: emmc-bus8 { emmc_bus8: emmc-bus8 {
rockchip,pins = <1 24 RK_FUNC_2 &pcfg_pull_default>, rockchip,pins = <1 RK_PD0 2 &pcfg_pull_default>,
<1 25 RK_FUNC_2 &pcfg_pull_default>, <1 RK_PD1 2 &pcfg_pull_default>,
<1 26 RK_FUNC_2 &pcfg_pull_default>, <1 RK_PD2 2 &pcfg_pull_default>,
<1 27 RK_FUNC_2 &pcfg_pull_default>, <1 RK_PD3 2 &pcfg_pull_default>,
<1 28 RK_FUNC_2 &pcfg_pull_default>, <1 RK_PD4 2 &pcfg_pull_default>,
<1 29 RK_FUNC_2 &pcfg_pull_default>, <1 RK_PD5 2 &pcfg_pull_default>,
<1 30 RK_FUNC_2 &pcfg_pull_default>, <1 RK_PD6 2 &pcfg_pull_default>,
<1 31 RK_FUNC_2 &pcfg_pull_default>; <1 RK_PD7 2 &pcfg_pull_default>;
}; };
}; };
emac { emac {
emac_xfer: emac-xfer { emac_xfer: emac-xfer {
rockchip,pins = <2 10 RK_FUNC_1 &pcfg_pull_default>, /* crs_dvalid */ rockchip,pins = <2 RK_PB2 1 &pcfg_pull_default>, /* crs_dvalid */
<2 13 RK_FUNC_1 &pcfg_pull_default>, /* tx_en */ <2 RK_PB5 1 &pcfg_pull_default>, /* tx_en */
<2 14 RK_FUNC_1 &pcfg_pull_default>, /* mac_clk */ <2 RK_PB6 1 &pcfg_pull_default>, /* mac_clk */
<2 15 RK_FUNC_1 &pcfg_pull_default>, /* rx_err */ <2 RK_PB7 1 &pcfg_pull_default>, /* rx_err */
<2 16 RK_FUNC_1 &pcfg_pull_default>, /* rxd1 */ <2 RK_PC0 1 &pcfg_pull_default>, /* rxd1 */
<2 17 RK_FUNC_1 &pcfg_pull_default>, /* rxd0 */ <2 RK_PC1 1 &pcfg_pull_default>, /* rxd0 */
<2 18 RK_FUNC_1 &pcfg_pull_default>, /* txd1 */ <2 RK_PC2 1 &pcfg_pull_default>, /* txd1 */
<2 19 RK_FUNC_1 &pcfg_pull_default>; /* txd0 */ <2 RK_PC3 1 &pcfg_pull_default>; /* txd0 */
}; };
emac_mdio: emac-mdio { emac_mdio: emac-mdio {
rockchip,pins = <2 12 RK_FUNC_1 &pcfg_pull_default>, /* mac_md */ rockchip,pins = <2 RK_PB4 1 &pcfg_pull_default>, /* mac_md */
<2 25 RK_FUNC_1 &pcfg_pull_default>; /* mac_mdclk */ <2 RK_PD1 1 &pcfg_pull_default>; /* mac_mdclk */
}; };
}; };
i2c0 { i2c0 {
i2c0_xfer: i2c0-xfer { i2c0_xfer: i2c0-xfer {
rockchip,pins = <0 0 RK_FUNC_1 &pcfg_pull_none>, rockchip,pins = <0 RK_PA0 1 &pcfg_pull_none>,
<0 1 RK_FUNC_1 &pcfg_pull_none>; <0 RK_PA1 1 &pcfg_pull_none>;
}; };
}; };
i2c1 { i2c1 {
i2c1_xfer: i2c1-xfer { i2c1_xfer: i2c1-xfer {
rockchip,pins = <0 2 RK_FUNC_1 &pcfg_pull_none>, rockchip,pins = <0 RK_PA2 1 &pcfg_pull_none>,
<0 3 RK_FUNC_1 &pcfg_pull_none>; <0 RK_PA3 1 &pcfg_pull_none>;
}; };
}; };
i2c2 { i2c2 {
i2c2_xfer: i2c2-xfer { i2c2_xfer: i2c2-xfer {
rockchip,pins = <2 20 RK_FUNC_1 &pcfg_pull_none>, rockchip,pins = <2 RK_PC4 1 &pcfg_pull_none>,
<2 21 RK_FUNC_1 &pcfg_pull_none>; <2 RK_PC5 1 &pcfg_pull_none>;
}; };
}; };
i2s { i2s {
i2s_bus: i2s-bus { i2s_bus: i2s-bus {
rockchip,pins = <1 0 RK_FUNC_1 &pcfg_pull_default>, rockchip,pins = <1 RK_PA0 1 &pcfg_pull_default>,
<1 1 RK_FUNC_1 &pcfg_pull_default>, <1 RK_PA1 1 &pcfg_pull_default>,
<1 2 RK_FUNC_1 &pcfg_pull_default>, <1 RK_PA2 1 &pcfg_pull_default>,
<1 3 RK_FUNC_1 &pcfg_pull_default>, <1 RK_PA3 1 &pcfg_pull_default>,
<1 4 RK_FUNC_1 &pcfg_pull_default>, <1 RK_PA4 1 &pcfg_pull_default>,
<1 5 RK_FUNC_1 &pcfg_pull_default>; <1 RK_PA5 1 &pcfg_pull_default>;
}; };
}; };
hdmi { hdmi {
hdmi_ctl: hdmi-ctl { hdmi_ctl: hdmi-ctl {
rockchip,pins = <1 8 RK_FUNC_1 &pcfg_pull_none>, rockchip,pins = <1 RK_PB0 1 &pcfg_pull_none>,
<1 9 RK_FUNC_1 &pcfg_pull_none>, <1 RK_PB1 1 &pcfg_pull_none>,
<1 10 RK_FUNC_1 &pcfg_pull_none>, <1 RK_PB2 1 &pcfg_pull_none>,
<1 11 RK_FUNC_1 &pcfg_pull_none>; <1 RK_PB3 1 &pcfg_pull_none>;
}; };
}; };
uart0 { uart0 {
uart0_xfer: uart0-xfer { uart0_xfer: uart0-xfer {
rockchip,pins = <0 16 RK_FUNC_1 &pcfg_pull_default>, rockchip,pins = <0 RK_PC0 1 &pcfg_pull_default>,
<0 17 RK_FUNC_1 &pcfg_pull_none>; <0 RK_PC1 1 &pcfg_pull_none>;
}; };
uart0_cts: uart0-cts { uart0_cts: uart0-cts {
rockchip,pins = <0 18 RK_FUNC_1 &pcfg_pull_default>; rockchip,pins = <0 RK_PC2 1 &pcfg_pull_default>;
}; };
uart0_rts: uart0-rts { uart0_rts: uart0-rts {
rockchip,pins = <0 19 RK_FUNC_1 &pcfg_pull_none>; rockchip,pins = <0 RK_PC3 1 &pcfg_pull_none>;
}; };
}; };
uart1 { uart1 {
uart1_xfer: uart1-xfer { uart1_xfer: uart1-xfer {
rockchip,pins = <2 22 RK_FUNC_1 &pcfg_pull_default>, rockchip,pins = <2 RK_PC6 1 &pcfg_pull_default>,
<2 23 RK_FUNC_1 &pcfg_pull_none>; <2 RK_PC7 1 &pcfg_pull_none>;
}; };
/* no rts / cts for uart1 */ /* no rts / cts for uart1 */
}; };
uart2 { uart2 {
uart2_xfer: uart2-xfer { uart2_xfer: uart2-xfer {
rockchip,pins = <1 18 RK_FUNC_2 &pcfg_pull_default>, rockchip,pins = <1 RK_PC2 2 &pcfg_pull_default>,
<1 19 RK_FUNC_2 &pcfg_pull_none>; <1 RK_PC3 2 &pcfg_pull_none>;
}; };
/* no rts / cts for uart2 */ /* no rts / cts for uart2 */
}; };
spi-pins { spi-pins {
spi_txd:spi-txd { spi_txd:spi-txd {
rockchip,pins = <1 29 RK_FUNC_3 &pcfg_pull_default>; rockchip,pins = <1 RK_PD5 3 &pcfg_pull_default>;
}; };
spi_rxd:spi-rxd { spi_rxd:spi-rxd {
rockchip,pins = <1 28 RK_FUNC_3 &pcfg_pull_default>; rockchip,pins = <1 RK_PD4 3 &pcfg_pull_default>;
}; };
spi_clk:spi-clk { spi_clk:spi-clk {
rockchip,pins = <2 0 RK_FUNC_2 &pcfg_pull_default>; rockchip,pins = <2 RK_PA0 2 &pcfg_pull_default>;
}; };
spi_cs0:spi-cs0 { spi_cs0:spi-cs0 {
rockchip,pins = <1 30 RK_FUNC_3 &pcfg_pull_default>; rockchip,pins = <1 RK_PD6 3 &pcfg_pull_default>;
}; };
spi_cs1:spi-cs1 { spi_cs1:spi-cs1 {
rockchip,pins = <1 31 RK_FUNC_3 &pcfg_pull_default>; rockchip,pins = <1 RK_PD7 3 &pcfg_pull_default>;
}; };
}; };
......
arch/arm/boot/dts/rk3066a-marsboard.dts
View file @ 07f08d9c
...@@ -168,7 +168,7 @@ &mmc0 { ...@@ -168,7 +168,7 @@ &mmc0 {
&pinctrl { &pinctrl {
lan8720a { lan8720a {
phy_int: phy-int { phy_int: phy-int {
rockchip,pins = <RK_GPIO1 26 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
}; };
......
arch/arm/boot/dts/rk3066a-mk808.dts
View file @ 07f08d9c
...@@ -136,25 +136,25 @@ &mmc1 { ...@@ -136,25 +136,25 @@ &mmc1 {
&pinctrl { &pinctrl {
usb-host { usb-host {
host_drv: host-drv { host_drv: host-drv {
rockchip,pins = <RK_GPIO0 6 RK_FUNC_GPIO &pcfg_pull_default>; rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_default>;
}; };
}; };
usb-otg { usb-otg {
otg_drv: otg-drv { otg_drv: otg-drv {
rockchip,pins = <RK_GPIO0 5 RK_FUNC_GPIO &pcfg_pull_default>; rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_default>;
}; };
}; };
sdmmc { sdmmc {
sdmmc_pwr: sdmmc-pwr { sdmmc_pwr: sdmmc-pwr {
rockchip,pins = <RK_GPIO3 7 RK_FUNC_GPIO &pcfg_pull_default>; rockchip,pins = <3 RK_PA7 RK_FUNC_GPIO &pcfg_pull_default>;
}; };
}; };
sdio { sdio {
wifi_pwr: wifi-pwr { wifi_pwr: wifi-pwr {
rockchip,pins = <RK_GPIO3 24 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <3 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
}; };
......
arch/arm/boot/dts/rk3066a-rayeager.dts
View file @ 07f08d9c
...@@ -322,71 +322,71 @@ pcfg_output_high: pcfg-output-high { ...@@ -322,71 +322,71 @@ pcfg_output_high: pcfg-output-high {
ak8963 { ak8963 {
comp_int: comp-int { comp_int: comp-int {
rockchip,pins = <4 17 RK_FUNC_GPIO &pcfg_pull_default>; rockchip,pins = <4 RK_PC1 RK_FUNC_GPIO &pcfg_pull_default>;
}; };
}; };
emac { emac {
rmii_rst: rmii-rst { rmii_rst: rmii-rst {
rockchip,pins = <1 30 RK_FUNC_GPIO &pcfg_output_high>; rockchip,pins = <1 RK_PD6 RK_FUNC_GPIO &pcfg_output_high>;
}; };
}; };
ir { ir {
ir_int: ir-int { ir_int: ir-int {
rockchip,pins = <6 1 RK_FUNC_GPIO &pcfg_pull_default>; rockchip,pins = <6 RK_PA1 RK_FUNC_GPIO &pcfg_pull_default>;
}; };
}; };
keys { keys {
pwr_key: pwr-key { pwr_key: pwr-key {
rockchip,pins = <6 2 RK_FUNC_GPIO &pcfg_pull_default>; rockchip,pins = <6 RK_PA2 RK_FUNC_GPIO &pcfg_pull_default>;
}; };
}; };
mma8452 { mma8452 {
gsensor_int: gsensor-int { gsensor_int: gsensor-int {
rockchip,pins = <4 16 RK_FUNC_GPIO &pcfg_pull_default>; rockchip,pins = <4 RK_PC0 RK_FUNC_GPIO &pcfg_pull_default>;
}; };
}; };
mmc { mmc {
sdmmc_pwr: sdmmc-pwr { sdmmc_pwr: sdmmc-pwr {
rockchip,pins = <3 7 RK_FUNC_GPIO &pcfg_pull_default>; rockchip,pins = <3 RK_PA7 RK_FUNC_GPIO &pcfg_pull_default>;
}; };
}; };
usb_host { usb_host {
host_drv: host-drv { host_drv: host-drv {
rockchip,pins = <0 6 RK_FUNC_GPIO &pcfg_pull_default>; rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_default>;
}; };
hub_rst: hub-rst { hub_rst: hub-rst {
rockchip,pins = <1 31 RK_FUNC_GPIO &pcfg_output_high>; rockchip,pins = <1 RK_PD7 RK_FUNC_GPIO &pcfg_output_high>;
}; };
sata_pwr: sata-pwr { sata_pwr: sata-pwr {
rockchip,pins = <4 22 RK_FUNC_GPIO &pcfg_pull_default>; rockchip,pins = <4 RK_PC6 RK_FUNC_GPIO &pcfg_pull_default>;
}; };
sata_reset: sata-reset { sata_reset: sata-reset {
rockchip,pins = <0 13 RK_FUNC_GPIO &pcfg_output_high>; rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_output_high>;
}; };
}; };
usb_otg { usb_otg {
otg_drv: otg-drv { otg_drv: otg-drv {
rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_default>; rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_default>;
}; };
}; };
tps { tps {
pmic_int: pmic-int { pmic_int: pmic-int {
rockchip,pins = <6 4 RK_FUNC_GPIO &pcfg_pull_default>; rockchip,pins = <6 RK_PA4 RK_FUNC_GPIO &pcfg_pull_default>;
}; };
pwr_hold: pwr-hold { pwr_hold: pwr-hold {
rockchip,pins = <6 8 RK_FUNC_GPIO &pcfg_output_high>; rockchip,pins = <6 RK_PB0 RK_FUNC_GPIO &pcfg_output_high>;
}; };
}; };
}; };
......
arch/arm/boot/dts/rk3066a.dtsi
View file @ 07f08d9c
This diff is collapsed.
arch/arm/boot/dts/rk3188-px3-evb.dts
View file @ 07f08d9c
...@@ -247,10 +247,10 @@ pcfg_output_low: pcfg-output-low { ...@@ -247,10 +247,10 @@ pcfg_output_low: pcfg-output-low {
usb { usb {
host_vbus_drv: host-vbus-drv { host_vbus_drv: host-vbus-drv {
rockchip,pins = <0 3 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
otg_vbus_drv: otg-vbus-drv { otg_vbus_drv: otg-vbus-drv {
rockchip,pins = <2 31 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <2 RK_PD7 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
}; };
......
arch/arm/boot/dts/rk3188-radxarock.dts
View file @ 07f08d9c
...@@ -307,40 +307,40 @@ pcfg_output_low: pcfg-output-low { ...@@ -307,40 +307,40 @@ pcfg_output_low: pcfg-output-low {
act8846 { act8846 {
act8846_dvs0_ctl: act8846-dvs0-ctl { act8846_dvs0_ctl: act8846-dvs0-ctl {
rockchip,pins = <RK_GPIO3 27 RK_FUNC_GPIO &pcfg_output_low>; rockchip,pins = <3 RK_PD3 RK_FUNC_GPIO &pcfg_output_low>;
}; };
}; };
hym8563 { hym8563 {
rtc_int: rtc-int { rtc_int: rtc-int {
rockchip,pins = <RK_GPIO0 0 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
lan8720a { lan8720a {
phy_int: phy-int { phy_int: phy-int {
rockchip,pins = <RK_GPIO3 26 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <3 RK_PD2 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
ir-receiver { ir-receiver {
ir_recv_pin: ir-recv-pin { ir_recv_pin: ir-recv-pin {
rockchip,pins = <RK_GPIO0 10 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
sd0 { sd0 {
sdmmc_pwr: sdmmc-pwr { sdmmc_pwr: sdmmc-pwr {
rockchip,pins = <RK_GPIO3 1 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <3 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
usb { usb {
host_vbus_drv: host-vbus-drv { host_vbus_drv: host-vbus-drv {
rockchip,pins = <0 3 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
otg_vbus_drv: otg-vbus-drv { otg_vbus_drv: otg-vbus-drv {
rockchip,pins = <2 31 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <2 RK_PD7 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
}; };
......
arch/arm/boot/dts/rk3188.dtsi
View file @ 07f08d9c
This diff is collapsed.
arch/arm/boot/dts/rk322x.dtsi
View file @ 07f08d9c
...@@ -865,228 +865,228 @@ sdio_bus4: sdio-bus4 { ...@@ -865,228 +865,228 @@ sdio_bus4: sdio-bus4 {
emmc { emmc {
emmc_clk: emmc-clk { emmc_clk: emmc-clk {
rockchip,pins = <2 7 RK_FUNC_2 &pcfg_pull_none>; rockchip,pins = <2 RK_PA7 2 &pcfg_pull_none>;
}; };
emmc_cmd: emmc-cmd { emmc_cmd: emmc-cmd {
rockchip,pins = <1 22 RK_FUNC_2 &pcfg_pull_none>; rockchip,pins = <1 RK_PC6 2 &pcfg_pull_none>;
}; };
emmc_bus8: emmc-bus8 { emmc_bus8: emmc-bus8 {
rockchip,pins = <1 24 RK_FUNC_2 &pcfg_pull_none>, rockchip,pins = <1 RK_PD0 2 &pcfg_pull_none>,
<1 25 RK_FUNC_2 &pcfg_pull_none>, <1 RK_PD1 2 &pcfg_pull_none>,
<1 26 RK_FUNC_2 &pcfg_pull_none>, <1 RK_PD2 2 &pcfg_pull_none>,
<1 27 RK_FUNC_2 &pcfg_pull_none>, <1 RK_PD3 2 &pcfg_pull_none>,
<1 28 RK_FUNC_2 &pcfg_pull_none>, <1 RK_PD4 2 &pcfg_pull_none>,
<1 29 RK_FUNC_2 &pcfg_pull_none>, <1 RK_PD5 2 &pcfg_pull_none>,
<1 30 RK_FUNC_2 &pcfg_pull_none>, <1 RK_PD6 2 &pcfg_pull_none>,
<1 31 RK_FUNC_2 &pcfg_pull_none>; <1 RK_PD7 2 &pcfg_pull_none>;
}; };
}; };
gmac { gmac {
rgmii_pins: rgmii-pins { rgmii_pins: rgmii-pins {
rockchip,pins = <2 14 RK_FUNC_1 &pcfg_pull_none>, rockchip,pins = <2 RK_PB6 1 &pcfg_pull_none>,
<2 12 RK_FUNC_1 &pcfg_pull_none>, <2 RK_PB4 1 &pcfg_pull_none>,
<2 25 RK_FUNC_1 &pcfg_pull_none>, <2 RK_PD1 1 &pcfg_pull_none>,
<2 19 RK_FUNC_1 &pcfg_pull_none_drv_12ma>, <2 RK_PC3 1 &pcfg_pull_none_drv_12ma>,
<2 18 RK_FUNC_1 &pcfg_pull_none_drv_12ma>, <2 RK_PC2 1 &pcfg_pull_none_drv_12ma>,
<2 22 RK_FUNC_1 &pcfg_pull_none_drv_12ma>, <2 RK_PC6 1 &pcfg_pull_none_drv_12ma>,
<2 23 RK_FUNC_1 &pcfg_pull_none_drv_12ma>, <2 RK_PC7 1 &pcfg_pull_none_drv_12ma>,
<2 9 RK_FUNC_1 &pcfg_pull_none_drv_12ma>, <2 RK_PB1 1 &pcfg_pull_none_drv_12ma>,
<2 13 RK_FUNC_1 &pcfg_pull_none_drv_12ma>, <2 RK_PB5 1 &pcfg_pull_none_drv_12ma>,
<2 17 RK_FUNC_1 &pcfg_pull_none>, <2 RK_PC1 1 &pcfg_pull_none>,
<2 16 RK_FUNC_1 &pcfg_pull_none>, <2 RK_PC0 1 &pcfg_pull_none>,
<2 21 RK_FUNC_2 &pcfg_pull_none>, <2 RK_PC5 2 &pcfg_pull_none>,
<2 20 RK_FUNC_2 &pcfg_pull_none>, <2 RK_PC4 2 &pcfg_pull_none>,
<2 11 RK_FUNC_1 &pcfg_pull_none>, <2 RK_PB3 1 &pcfg_pull_none>,
<2 8 RK_FUNC_1 &pcfg_pull_none>; <2 RK_PB0 1 &pcfg_pull_none>;
}; };
rmii_pins: rmii-pins { rmii_pins: rmii-pins {
rockchip,pins = <2 14 RK_FUNC_1 &pcfg_pull_none>, rockchip,pins = <2 RK_PB6 1 &pcfg_pull_none>,
<2 12 RK_FUNC_1 &pcfg_pull_none>, <2 RK_PB4 1 &pcfg_pull_none>,
<2 25 RK_FUNC_1 &pcfg_pull_none>, <2 RK_PD1 1 &pcfg_pull_none>,
<2 19 RK_FUNC_1 &pcfg_pull_none_drv_12ma>, <2 RK_PC3 1 &pcfg_pull_none_drv_12ma>,
<2 18 RK_FUNC_1 &pcfg_pull_none_drv_12ma>, <2 RK_PC2 1 &pcfg_pull_none_drv_12ma>,
<2 13 RK_FUNC_1 &pcfg_pull_none_drv_12ma>, <2 RK_PB5 1 &pcfg_pull_none_drv_12ma>,
<2 17 RK_FUNC_1 &pcfg_pull_none>, <2 RK_PC1 1 &pcfg_pull_none>,
<2 16 RK_FUNC_1 &pcfg_pull_none>, <2 RK_PC0 1 &pcfg_pull_none>,
<2 8 RK_FUNC_1 &pcfg_pull_none>, <2 RK_PB0 1 &pcfg_pull_none>,
<2 15 RK_FUNC_1 &pcfg_pull_none>; <2 RK_PB7 1 &pcfg_pull_none>;
}; };
phy_pins: phy-pins { phy_pins: phy-pins {
rockchip,pins = <2 14 RK_FUNC_2 &pcfg_pull_none>, rockchip,pins = <2 RK_PB6 2 &pcfg_pull_none>,
<2 8 RK_FUNC_2 &pcfg_pull_none>; <2 RK_PB0 2 &pcfg_pull_none>;
}; };
}; };
i2c0 { i2c0 {
i2c0_xfer: i2c0-xfer { i2c0_xfer: i2c0-xfer {
rockchip,pins = <0 0 RK_FUNC_1 &pcfg_pull_none>, rockchip,pins = <0 RK_PA0 1 &pcfg_pull_none>,
<0 1 RK_FUNC_1 &pcfg_pull_none>; <0 RK_PA1 1 &pcfg_pull_none>;
}; };
}; };
i2c1 { i2c1 {
i2c1_xfer: i2c1-xfer { i2c1_xfer: i2c1-xfer {
rockchip,pins = <0 2 RK_FUNC_1 &pcfg_pull_none>, rockchip,pins = <0 RK_PA2 1 &pcfg_pull_none>,
<0 3 RK_FUNC_1 &pcfg_pull_none>; <0 RK_PA3 1 &pcfg_pull_none>;
}; };
}; };
i2c2 { i2c2 {
i2c2_xfer: i2c2-xfer { i2c2_xfer: i2c2-xfer {
rockchip,pins = <2 20 RK_FUNC_1 &pcfg_pull_none>, rockchip,pins = <2 RK_PC4 1 &pcfg_pull_none>,
<2 21 RK_FUNC_1 &pcfg_pull_none>; <2 RK_PC5 1 &pcfg_pull_none>;
}; };
}; };
i2c3 { i2c3 {
i2c3_xfer: i2c3-xfer { i2c3_xfer: i2c3-xfer {
rockchip,pins = <0 6 RK_FUNC_1 &pcfg_pull_none>, rockchip,pins = <0 RK_PA6 1 &pcfg_pull_none>,
<0 7 RK_FUNC_1 &pcfg_pull_none>; <0 RK_PA7 1 &pcfg_pull_none>;
}; };
}; };
spi-0 { spi-0 {
spi0_clk: spi0-clk { spi0_clk: spi0-clk {
rockchip,pins = <0 9 RK_FUNC_2 &pcfg_pull_up>; rockchip,pins = <0 RK_PB1 2 &pcfg_pull_up>;
}; };
spi0_cs0: spi0-cs0 { spi0_cs0: spi0-cs0 {
rockchip,pins = <0 14 RK_FUNC_2 &pcfg_pull_up>; rockchip,pins = <0 RK_PB6 2 &pcfg_pull_up>;
}; };
spi0_tx: spi0-tx { spi0_tx: spi0-tx {
rockchip,pins = <0 11 RK_FUNC_2 &pcfg_pull_up>; rockchip,pins = <0 RK_PB3 2 &pcfg_pull_up>;
}; };
spi0_rx: spi0-rx { spi0_rx: spi0-rx {
rockchip,pins = <0 13 RK_FUNC_2 &pcfg_pull_up>; rockchip,pins = <0 RK_PB5 2 &pcfg_pull_up>;
}; };
spi0_cs1: spi0-cs1 { spi0_cs1: spi0-cs1 {
rockchip,pins = <1 12 RK_FUNC_1 &pcfg_pull_up>; rockchip,pins = <1 RK_PB4 1 &pcfg_pull_up>;
}; };
}; };
spi-1 { spi-1 {
spi1_clk: spi1-clk { spi1_clk: spi1-clk {
rockchip,pins = <0 23 RK_FUNC_2 &pcfg_pull_up>; rockchip,pins = <0 RK_PC7 2 &pcfg_pull_up>;
}; };
spi1_cs0: spi1-cs0 { spi1_cs0: spi1-cs0 {
rockchip,pins = <2 2 RK_FUNC_2 &pcfg_pull_up>; rockchip,pins = <2 RK_PA2 2 &pcfg_pull_up>;
}; };
spi1_rx: spi1-rx { spi1_rx: spi1-rx {
rockchip,pins = <2 0 RK_FUNC_2 &pcfg_pull_up>; rockchip,pins = <2 RK_PA0 2 &pcfg_pull_up>;
}; };
spi1_tx: spi1-tx { spi1_tx: spi1-tx {
rockchip,pins = <2 1 RK_FUNC_2 &pcfg_pull_up>; rockchip,pins = <2 RK_PA1 2 &pcfg_pull_up>;
}; };
spi1_cs1: spi1-cs1 { spi1_cs1: spi1-cs1 {
rockchip,pins = <2 3 RK_FUNC_2 &pcfg_pull_up>; rockchip,pins = <2 RK_PA3 2 &pcfg_pull_up>;
}; };
}; };
i2s1 { i2s1 {
i2s1_bus: i2s1-bus { i2s1_bus: i2s1-bus {
rockchip,pins = <0 8 RK_FUNC_1 &pcfg_pull_none>, rockchip,pins = <0 RK_PB0 1 &pcfg_pull_none>,
<0 9 RK_FUNC_1 &pcfg_pull_none>, <0 RK_PB1 1 &pcfg_pull_none>,
<0 11 RK_FUNC_1 &pcfg_pull_none>, <0 RK_PB3 1 &pcfg_pull_none>,
<0 12 RK_FUNC_1 &pcfg_pull_none>, <0 RK_PB4 1 &pcfg_pull_none>,
<0 13 RK_FUNC_1 &pcfg_pull_none>, <0 RK_PB5 1 &pcfg_pull_none>,
<0 14 RK_FUNC_1 &pcfg_pull_none>, <0 RK_PB6 1 &pcfg_pull_none>,
<1 2 RK_FUNC_2 &pcfg_pull_none>, <1 RK_PA2 2 &pcfg_pull_none>,
<1 4 RK_FUNC_2 &pcfg_pull_none>, <1 RK_PA4 2 &pcfg_pull_none>,
<1 5 RK_FUNC_2 &pcfg_pull_none>; <1 RK_PA5 2 &pcfg_pull_none>;
}; };
}; };
pwm0 { pwm0 {
pwm0_pin: pwm0-pin { pwm0_pin: pwm0-pin {
rockchip,pins = <3 21 RK_FUNC_1 &pcfg_pull_none>; rockchip,pins = <3 RK_PC5 1 &pcfg_pull_none>;
}; };
}; };
pwm1 { pwm1 {
pwm1_pin: pwm1-pin { pwm1_pin: pwm1-pin {
rockchip,pins = <0 30 RK_FUNC_2 &pcfg_pull_none>; rockchip,pins = <0 RK_PD6 2 &pcfg_pull_none>;
}; };
}; };
pwm2 { pwm2 {
pwm2_pin: pwm2-pin { pwm2_pin: pwm2-pin {
rockchip,pins = <1 12 RK_FUNC_2 &pcfg_pull_none>; rockchip,pins = <1 RK_PB4 2 &pcfg_pull_none>;
}; };
}; };
pwm3 { pwm3 {
pwm3_pin: pwm3-pin { pwm3_pin: pwm3-pin {
rockchip,pins = <1 11 RK_FUNC_2 &pcfg_pull_none>; rockchip,pins = <1 RK_PB3 2 &pcfg_pull_none>;
}; };
}; };
spdif { spdif {
spdif_tx: spdif-tx { spdif_tx: spdif-tx {
rockchip,pins = <3 31 RK_FUNC_2 &pcfg_pull_none>; rockchip,pins = <3 RK_PD7 2 &pcfg_pull_none>;
}; };
}; };
tsadc { tsadc {
otp_gpio: otp-gpio { otp_gpio: otp-gpio {
rockchip,pins = <0 24 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
otp_out: otp-out { otp_out: otp-out {
rockchip,pins = <0 24 RK_FUNC_2 &pcfg_pull_none>; rockchip,pins = <0 RK_PD0 2 &pcfg_pull_none>;
}; };
}; };
uart0 { uart0 {
uart0_xfer: uart0-xfer { uart0_xfer: uart0-xfer {
rockchip,pins = <2 26 RK_FUNC_1 &pcfg_pull_none>, rockchip,pins = <2 RK_PD2 1 &pcfg_pull_none>,
<2 27 RK_FUNC_1 &pcfg_pull_none>; <2 RK_PD3 1 &pcfg_pull_none>;
}; };
uart0_cts: uart0-cts { uart0_cts: uart0-cts {
rockchip,pins = <2 29 RK_FUNC_1 &pcfg_pull_none>; rockchip,pins = <2 RK_PD5 1 &pcfg_pull_none>;
}; };
uart0_rts: uart0-rts { uart0_rts: uart0-rts {
rockchip,pins = <0 17 RK_FUNC_1 &pcfg_pull_none>; rockchip,pins = <0 RK_PC1 1 &pcfg_pull_none>;
}; };
}; };
uart1 { uart1 {
uart1_xfer: uart1-xfer { uart1_xfer: uart1-xfer {
rockchip,pins = <1 9 RK_FUNC_1 &pcfg_pull_none>, rockchip,pins = <1 RK_PB1 1 &pcfg_pull_none>,
<1 10 RK_FUNC_1 &pcfg_pull_none>; <1 RK_PB2 1 &pcfg_pull_none>;
}; };
uart1_cts: uart1-cts { uart1_cts: uart1-cts {
rockchip,pins = <1 8 RK_FUNC_1 &pcfg_pull_none>; rockchip,pins = <1 RK_PB0 1 &pcfg_pull_none>;
}; };
uart1_rts: uart1-rts { uart1_rts: uart1-rts {
rockchip,pins = <1 11 RK_FUNC_1 &pcfg_pull_none>; rockchip,pins = <1 RK_PB3 1 &pcfg_pull_none>;
}; };
}; };
uart2 { uart2 {
uart2_xfer: uart2-xfer { uart2_xfer: uart2-xfer {
rockchip,pins = <1 18 RK_FUNC_2 &pcfg_pull_up>, rockchip,pins = <1 RK_PC2 2 &pcfg_pull_up>,
<1 19 RK_FUNC_2 &pcfg_pull_none>; <1 RK_PC3 2 &pcfg_pull_none>;
}; };
uart21_xfer: uart21-xfer { uart21_xfer: uart21-xfer {
rockchip,pins = <1 10 RK_FUNC_2 &pcfg_pull_up>, rockchip,pins = <1 RK_PB2 2 &pcfg_pull_up>,
<1 9 RK_FUNC_2 &pcfg_pull_none>; <1 RK_PB1 2 &pcfg_pull_none>;
}; };
uart2_cts: uart2-cts { uart2_cts: uart2-cts {
rockchip,pins = <0 25 RK_FUNC_1 &pcfg_pull_none>; rockchip,pins = <0 RK_PD1 1 &pcfg_pull_none>;
}; };
uart2_rts: uart2-rts { uart2_rts: uart2-rts {
rockchip,pins = <0 24 RK_FUNC_1 &pcfg_pull_none>; rockchip,pins = <0 RK_PD0 1 &pcfg_pull_none>;
}; };
}; };
}; };
......
arch/arm/boot/dts/rk3288-evb-act8846.dts
View file @ 07f08d9c
...@@ -175,13 +175,13 @@ &panel { ...@@ -175,13 +175,13 @@ &panel {
&pinctrl { &pinctrl {
lcd { lcd {
lcd_en: lcd-en { lcd_en: lcd-en {
rockchip,pins = <7 3 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <7 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
wifi { wifi {
wifi_pwr: wifi-pwr { wifi_pwr: wifi-pwr {
rockchip,pins = <7 9 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <7 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
}; };
arch/arm/boot/dts/rk3288-evb.dtsi
View file @ 07f08d9c
...@@ -314,25 +314,25 @@ pcfg_pull_up_drv_8ma: pcfg-pull-up-drv-8ma { ...@@ -314,25 +314,25 @@ pcfg_pull_up_drv_8ma: pcfg-pull-up-drv-8ma {
backlight { backlight {
bl_en: bl-en { bl_en: bl-en {
rockchip,pins = <7 2 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <7 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
buttons { buttons {
pwrbtn: pwrbtn { pwrbtn: pwrbtn {
rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
lcd { lcd {
lcd_cs: lcd-cs { lcd_cs: lcd-cs {
rockchip,pins = <7 4 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <7 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
pmic { pmic {
pmic_int: pmic-int { pmic_int: pmic-int {
rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
...@@ -342,34 +342,34 @@ sdmmc { ...@@ -342,34 +342,34 @@ sdmmc {
* high-speed mode on EVB board so bump up to 8ma. * high-speed mode on EVB board so bump up to 8ma.
*/ */
sdmmc_bus4: sdmmc-bus4 { sdmmc_bus4: sdmmc-bus4 {
rockchip,pins = <6 16 RK_FUNC_1 &pcfg_pull_up_drv_8ma>, rockchip,pins = <6 RK_PC0 1 &pcfg_pull_up_drv_8ma>,
<6 17 RK_FUNC_1 &pcfg_pull_up_drv_8ma>, <6 RK_PC1 1 &pcfg_pull_up_drv_8ma>,
<6 18 RK_FUNC_1 &pcfg_pull_up_drv_8ma>, <6 RK_PC2 1 &pcfg_pull_up_drv_8ma>,
<6 19 RK_FUNC_1 &pcfg_pull_up_drv_8ma>; <6 RK_PC3 1 &pcfg_pull_up_drv_8ma>;
}; };
sdmmc_clk: sdmmc-clk { sdmmc_clk: sdmmc-clk {
rockchip,pins = <6 20 RK_FUNC_1 &pcfg_pull_none_drv_8ma>; rockchip,pins = <6 RK_PC4 1 &pcfg_pull_none_drv_8ma>;
}; };
sdmmc_cmd: sdmmc-cmd { sdmmc_cmd: sdmmc-cmd {
rockchip,pins = <6 21 RK_FUNC_1 &pcfg_pull_up_drv_8ma>; rockchip,pins = <6 RK_PC5 1 &pcfg_pull_up_drv_8ma>;
}; };
sdmmc_pwr: sdmmc-pwr { sdmmc_pwr: sdmmc-pwr {
rockchip,pins = <7 11 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <7 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
usb { usb {
host_vbus_drv: host-vbus-drv { host_vbus_drv: host-vbus-drv {
rockchip,pins = <0 14 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
eth_phy { eth_phy {
eth_phy_pwr: eth-phy-pwr { eth_phy_pwr: eth-phy-pwr {
rockchip,pins = <0 6 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
}; };
......
arch/arm/boot/dts/rk3288-fennec.dts
View file @ 07f08d9c
...@@ -278,27 +278,27 @@ pcfg_pull_up_drv_8ma: pcfg-pull-up-drv-8ma { ...@@ -278,27 +278,27 @@ pcfg_pull_up_drv_8ma: pcfg-pull-up-drv-8ma {
gmac { gmac {
phy_int: phy-int { phy_int: phy-int {
rockchip,pins = <0 9 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
phy_pmeb: phy-pmeb { phy_pmeb: phy-pmeb {
rockchip,pins = <0 8 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
phy_rst: phy-rst { phy_rst: phy-rst {
rockchip,pins = <4 8 RK_FUNC_GPIO &pcfg_output_high>; rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_output_high>;
}; };
}; };
pmic { pmic {
pmic_int: pmic-int { pmic_int: pmic-int {
rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
usbphy { usbphy {
host_drv: host-drv { host_drv: host-drv {
rockchip,pins = <0 14 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
}; };
......
arch/arm/boot/dts/rk3288-firefly-beta.dts
View file @ 07f08d9c
...@@ -18,13 +18,13 @@ &ir { ...@@ -18,13 +18,13 @@ &ir {
&pinctrl { &pinctrl {
act8846 { act8846 {
pmic_vsel: pmic-vsel { pmic_vsel: pmic-vsel {
rockchip,pins = <7 1 RK_FUNC_GPIO &pcfg_output_low>; rockchip,pins = <7 RK_PA1 RK_FUNC_GPIO &pcfg_output_low>;
}; };
}; };
ir { ir {
ir_int: ir-int { ir_int: ir-int {
rockchip,pins = <7 5 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <7 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
}; };
......
arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi
View file @ 07f08d9c
...@@ -224,25 +224,25 @@ pcfg_pull_up_drv_12ma: pcfg-pull-up-drv-12ma { ...@@ -224,25 +224,25 @@ pcfg_pull_up_drv_12ma: pcfg-pull-up-drv-12ma {
act8846 { act8846 {
pwr_hold: pwr-hold { pwr_hold: pwr-hold {
rockchip,pins = <0 1 RK_FUNC_GPIO &pcfg_output_high>; rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_output_high>;
}; };
pmic_vsel: pmic-vsel { pmic_vsel: pmic-vsel {
rockchip,pins = <7 14 RK_FUNC_GPIO &pcfg_output_low>; rockchip,pins = <7 RK_PB6 RK_FUNC_GPIO &pcfg_output_low>;
}; };
}; };
gmac { gmac {
phy_int: phy-int { phy_int: phy-int {
rockchip,pins = <0 9 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
phy_pmeb: phy-pmeb { phy_pmeb: phy-pmeb {
rockchip,pins = <0 8 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
phy_rst: phy-rst { phy_rst: phy-rst {
rockchip,pins = <4 8 RK_FUNC_GPIO &pcfg_output_high>; rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_output_high>;
}; };
}; };
}; };
......
arch/arm/boot/dts/rk3288-firefly-reload.dts
View file @ 07f08d9c
...@@ -306,39 +306,39 @@ &usb_otg { ...@@ -306,39 +306,39 @@ &usb_otg {
&pinctrl { &pinctrl {
ir { ir {
ir_int: ir-int { ir_int: ir-int {
rockchip,pins = <7 0 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <7 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
dvp { dvp {
dvp_pwr: dvp-pwr { dvp_pwr: dvp-pwr {
rockchip,pins = <0 11 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
cif_pwr: cif-pwr { cif_pwr: cif-pwr {
rockchip,pins = <7 12 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <7 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
hym8563 { hym8563 {
rtc_int: rtc-int { rtc_int: rtc-int {
rockchip,pins = <7 4 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <7 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
keys { keys {
pwr_key: pwr-key { pwr_key: pwr-key {
rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
leds { leds {
power_led: power-led { power_led: power-led {
rockchip,pins = <8 2 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <8 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
work_led: work-led { work_led: work-led {
rockchip,pins = <8 1 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <8 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
...@@ -348,44 +348,44 @@ sdmmc { ...@@ -348,44 +348,44 @@ sdmmc {
* high-speed mode on firefly board so bump up to 12ma. * high-speed mode on firefly board so bump up to 12ma.
*/ */
sdmmc_bus4: sdmmc-bus4 { sdmmc_bus4: sdmmc-bus4 {
rockchip,pins = <6 16 RK_FUNC_1 &pcfg_pull_up_drv_12ma>, rockchip,pins = <6 RK_PC0 1 &pcfg_pull_up_drv_12ma>,
<6 17 RK_FUNC_1 &pcfg_pull_up_drv_12ma>, <6 RK_PC1 1 &pcfg_pull_up_drv_12ma>,
<6 18 RK_FUNC_1 &pcfg_pull_up_drv_12ma>, <6 RK_PC2 1 &pcfg_pull_up_drv_12ma>,
<6 19 RK_FUNC_1 &pcfg_pull_up_drv_12ma>; <6 RK_PC3 1 &pcfg_pull_up_drv_12ma>;
}; };
sdmmc_clk: sdmmc-clk { sdmmc_clk: sdmmc-clk {
rockchip,pins = <6 20 RK_FUNC_1 &pcfg_pull_none_12ma>; rockchip,pins = <6 RK_PC4 1 &pcfg_pull_none_12ma>;
}; };
sdmmc_cmd: sdmmc-cmd { sdmmc_cmd: sdmmc-cmd {
rockchip,pins = <6 21 RK_FUNC_1 &pcfg_pull_up_drv_12ma>; rockchip,pins = <6 RK_PC5 1 &pcfg_pull_up_drv_12ma>;
}; };
sdmmc_pwr: sdmmc-pwr { sdmmc_pwr: sdmmc-pwr {
rockchip,pins = <7 11 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <7 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
sdio { sdio {
wifi_enable: wifi-enable { wifi_enable: wifi-enable {
rockchip,pins = <4 28 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <4 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
usb_host { usb_host {
host_vbus_drv: host-vbus-drv { host_vbus_drv: host-vbus-drv {
rockchip,pins = <0 14 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
usbhub_rst: usbhub-rst { usbhub_rst: usbhub-rst {
rockchip,pins = <8 3 RK_FUNC_GPIO &pcfg_output_high>; rockchip,pins = <8 RK_PA3 RK_FUNC_GPIO &pcfg_output_high>;
}; };
}; };
usb_otg { usb_otg {
otg_vbus_drv: otg-vbus-drv { otg_vbus_drv: otg-vbus-drv {
rockchip,pins = <0 12 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
}; };
arch/arm/boot/dts/rk3288-firefly.dts
View file @ 07f08d9c
...@@ -18,13 +18,13 @@ &ir { ...@@ -18,13 +18,13 @@ &ir {
&pinctrl { &pinctrl {
act8846 { act8846 {
pmic_vsel: pmic-vsel { pmic_vsel: pmic-vsel {
rockchip,pins = <7 14 RK_FUNC_GPIO &pcfg_output_low>; rockchip,pins = <7 RK_PB6 RK_FUNC_GPIO &pcfg_output_low>;
}; };
}; };
ir { ir {
ir_int: ir-int { ir_int: ir-int {
rockchip,pins = <7 0 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <7 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
}; };
......
arch/arm/boot/dts/rk3288-firefly.dtsi
View file @ 07f08d9c
...@@ -392,49 +392,49 @@ pcfg_pull_up_drv_12ma: pcfg-pull-up-drv-12ma { ...@@ -392,49 +392,49 @@ pcfg_pull_up_drv_12ma: pcfg-pull-up-drv-12ma {
act8846 { act8846 {
pwr_hold: pwr-hold { pwr_hold: pwr-hold {
rockchip,pins = <0 1 RK_FUNC_GPIO &pcfg_output_high>; rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_output_high>;
}; };
}; };
dvp { dvp {
dvp_pwr: dvp-pwr { dvp_pwr: dvp-pwr {
rockchip,pins = <0 11 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
gmac { gmac {
phy_int: phy-int { phy_int: phy-int {
rockchip,pins = <0 9 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
phy_pmeb: phy-pmeb { phy_pmeb: phy-pmeb {
rockchip,pins = <0 8 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
phy_rst: phy-rst { phy_rst: phy-rst {
rockchip,pins = <4 8 RK_FUNC_GPIO &pcfg_output_high>; rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_output_high>;
}; };
}; };
hym8563 { hym8563 {
rtc_int: rtc-int { rtc_int: rtc-int {
rockchip,pins = <7 4 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <7 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
keys { keys {
pwr_key: pwr-key { pwr_key: pwr-key {
rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
leds { leds {
power_led: power-led { power_led: power-led {
rockchip,pins = <8 2 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <8 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
work_led: work-led { work_led: work-led {
rockchip,pins = <8 1 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <8 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
...@@ -444,38 +444,38 @@ sdmmc { ...@@ -444,38 +444,38 @@ sdmmc {
* high-speed mode on firefly board so bump up to 12ma. * high-speed mode on firefly board so bump up to 12ma.
*/ */
sdmmc_bus4: sdmmc-bus4 { sdmmc_bus4: sdmmc-bus4 {
rockchip,pins = <6 16 RK_FUNC_1 &pcfg_pull_up_drv_12ma>, rockchip,pins = <6 RK_PC0 1 &pcfg_pull_up_drv_12ma>,
<6 17 RK_FUNC_1 &pcfg_pull_up_drv_12ma>, <6 RK_PC1 1 &pcfg_pull_up_drv_12ma>,
<6 18 RK_FUNC_1 &pcfg_pull_up_drv_12ma>, <6 RK_PC2 1 &pcfg_pull_up_drv_12ma>,
<6 19 RK_FUNC_1 &pcfg_pull_up_drv_12ma>; <6 RK_PC3 1 &pcfg_pull_up_drv_12ma>;
}; };
sdmmc_clk: sdmmc-clk { sdmmc_clk: sdmmc-clk {
rockchip,pins = <6 20 RK_FUNC_1 &pcfg_pull_none_12ma>; rockchip,pins = <6 RK_PC4 1 &pcfg_pull_none_12ma>;
}; };
sdmmc_cmd: sdmmc-cmd { sdmmc_cmd: sdmmc-cmd {
rockchip,pins = <6 21 RK_FUNC_1 &pcfg_pull_up_drv_12ma>; rockchip,pins = <6 RK_PC5 1 &pcfg_pull_up_drv_12ma>;
}; };
sdmmc_pwr: sdmmc-pwr { sdmmc_pwr: sdmmc-pwr {
rockchip,pins = <7 11 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <7 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
usb_host { usb_host {
host_vbus_drv: host-vbus-drv { host_vbus_drv: host-vbus-drv {
rockchip,pins = <0 14 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
usbhub_rst: usbhub-rst { usbhub_rst: usbhub-rst {
rockchip,pins = <8 3 RK_FUNC_GPIO &pcfg_output_high>; rockchip,pins = <8 RK_PA3 RK_FUNC_GPIO &pcfg_output_high>;
}; };
}; };
usb_otg { usb_otg {
otg_vbus_drv: otg-vbus-drv { otg_vbus_drv: otg-vbus-drv {
rockchip,pins = <0 12 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
}; };
......
arch/arm/boot/dts/rk3288-miqi.dts
View file @ 07f08d9c
...@@ -296,29 +296,29 @@ pcfg_pull_up_drv_12ma: pcfg-pull-up-drv-12ma { ...@@ -296,29 +296,29 @@ pcfg_pull_up_drv_12ma: pcfg-pull-up-drv-12ma {
act8846 { act8846 {
pmic_int: pmic-int { pmic_int: pmic-int {
rockchip,pins = <0 4 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
pmic_sleep: pmic-sleep { pmic_sleep: pmic-sleep {
rockchip,pins = <0 0 RK_FUNC_GPIO &pcfg_output_low>; rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_output_low>;
}; };
pmic_vsel: pmic-vsel { pmic_vsel: pmic-vsel {
rockchip,pins = <7 1 RK_FUNC_GPIO &pcfg_output_low>; rockchip,pins = <7 RK_PA1 RK_FUNC_GPIO &pcfg_output_low>;
}; };
}; };
gmac { gmac {
phy_int: phy-int { phy_int: phy-int {
rockchip,pins = <0 9 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
phy_pmeb: phy-pmeb { phy_pmeb: phy-pmeb {
rockchip,pins = <0 8 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
phy_rst: phy-rst { phy_rst: phy-rst {
rockchip,pins = <4 8 RK_FUNC_GPIO &pcfg_output_high>; rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_output_high>;
}; };
}; };
...@@ -328,28 +328,28 @@ sdmmc { ...@@ -328,28 +328,28 @@ sdmmc {
* high-speed mode on firefly board so bump up to 12ma. * high-speed mode on firefly board so bump up to 12ma.
*/ */
sdmmc_bus4: sdmmc-bus4 { sdmmc_bus4: sdmmc-bus4 {
rockchip,pins = <6 16 RK_FUNC_1 &pcfg_pull_up_drv_12ma>, rockchip,pins = <6 RK_PC0 1 &pcfg_pull_up_drv_12ma>,
<6 17 RK_FUNC_1 &pcfg_pull_up_drv_12ma>, <6 RK_PC1 1 &pcfg_pull_up_drv_12ma>,
<6 18 RK_FUNC_1 &pcfg_pull_up_drv_12ma>, <6 RK_PC2 1 &pcfg_pull_up_drv_12ma>,
<6 19 RK_FUNC_1 &pcfg_pull_up_drv_12ma>; <6 RK_PC3 1 &pcfg_pull_up_drv_12ma>;
}; };
sdmmc_clk: sdmmc-clk { sdmmc_clk: sdmmc-clk {
rockchip,pins = <6 20 RK_FUNC_1 &pcfg_pull_none_12ma>; rockchip,pins = <6 RK_PC4 1 &pcfg_pull_none_12ma>;
}; };
sdmmc_cmd: sdmmc-cmd { sdmmc_cmd: sdmmc-cmd {
rockchip,pins = <6 21 RK_FUNC_1 &pcfg_pull_up_drv_12ma>; rockchip,pins = <6 RK_PC5 1 &pcfg_pull_up_drv_12ma>;
}; };
sdmmc_pwr: sdmmc-pwr { sdmmc_pwr: sdmmc-pwr {
rockchip,pins = <7 11 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <7 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
usb_host { usb_host {
host_vbus_drv: host-vbus-drv { host_vbus_drv: host-vbus-drv {
rockchip,pins = <0 14 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
}; };
......
arch/arm/boot/dts/rk3288-phycore-rdk.dts
View file @ 07f08d9c
...@@ -160,15 +160,15 @@ pcfg_pull_up_drv_12ma: pcfg-pull-up-drv-12ma { ...@@ -160,15 +160,15 @@ pcfg_pull_up_drv_12ma: pcfg-pull-up-drv-12ma {
buttons { buttons {
user_button_pins: user-button-pins { user_button_pins: user-button-pins {
/* button 1 */ /* button 1 */
rockchip,pins = <8 3 RK_FUNC_GPIO &pcfg_pull_up>, rockchip,pins = <8 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>,
/* button 2 */ /* button 2 */
<8 0 RK_FUNC_GPIO &pcfg_pull_up>; <8 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
rv4162 { rv4162 {
i2c_rtc_int: i2c-rtc-int { i2c_rtc_int: i2c-rtc-int {
rockchip,pins = <5 10 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <5 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
...@@ -178,44 +178,44 @@ sdmmc { ...@@ -178,44 +178,44 @@ sdmmc {
* high-speed mode on pcm-947 board so bump up to 12 mA. * high-speed mode on pcm-947 board so bump up to 12 mA.
*/ */
sdmmc_bus4: sdmmc-bus4 { sdmmc_bus4: sdmmc-bus4 {
rockchip,pins = <6 16 RK_FUNC_1 &pcfg_pull_up_drv_12ma>, rockchip,pins = <6 RK_PC0 1 &pcfg_pull_up_drv_12ma>,
<6 17 RK_FUNC_1 &pcfg_pull_up_drv_12ma>, <6 RK_PC1 1 &pcfg_pull_up_drv_12ma>,
<6 18 RK_FUNC_1 &pcfg_pull_up_drv_12ma>, <6 RK_PC2 1 &pcfg_pull_up_drv_12ma>,
<6 19 RK_FUNC_1 &pcfg_pull_up_drv_12ma>; <6 RK_PC3 1 &pcfg_pull_up_drv_12ma>;
}; };
sdmmc_clk: sdmmc-clk { sdmmc_clk: sdmmc-clk {
rockchip,pins = <6 20 RK_FUNC_1 &pcfg_pull_none_12ma>; rockchip,pins = <6 RK_PC4 1 &pcfg_pull_none_12ma>;
}; };
sdmmc_cmd: sdmmc-cmd { sdmmc_cmd: sdmmc-cmd {
rockchip,pins = <6 21 RK_FUNC_1 &pcfg_pull_up_drv_12ma>; rockchip,pins = <6 RK_PC5 1 &pcfg_pull_up_drv_12ma>;
}; };
sdmmc_pwr: sdmmc-pwr { sdmmc_pwr: sdmmc-pwr {
rockchip,pins = <7 11 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <7 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
touchscreen { touchscreen {
ts_irq_pin: ts-irq-pin { ts_irq_pin: ts-irq-pin {
rockchip,pins = <5 15 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <5 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
usb_host { usb_host {
host0_vbus_drv: host0-vbus-drv { host0_vbus_drv: host0-vbus-drv {
rockchip,pins = <2 13 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
host1_vbus_drv: host1-vbus-drv { host1_vbus_drv: host1-vbus-drv {
rockchip,pins = <2 0 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <2 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
usb_otg { usb_otg {
otg_vbus_drv: otg-vbus-drv { otg_vbus_drv: otg-vbus-drv {
rockchip,pins = <2 12 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
}; };
......
arch/arm/boot/dts/rk3288-phycore-som.dtsi
View file @ 07f08d9c
...@@ -342,49 +342,49 @@ emmc { ...@@ -342,49 +342,49 @@ emmc {
* We also have external pulls, so disable the internal ones. * We also have external pulls, so disable the internal ones.
*/ */
emmc_clk: emmc-clk { emmc_clk: emmc-clk {
rockchip,pins = <3 18 RK_FUNC_2 &pcfg_pull_none_12ma>; rockchip,pins = <3 RK_PC2 2 &pcfg_pull_none_12ma>;
}; };
emmc_cmd: emmc-cmd { emmc_cmd: emmc-cmd {
rockchip,pins = <3 16 RK_FUNC_2 &pcfg_pull_none_12ma>; rockchip,pins = <3 RK_PC0 2 &pcfg_pull_none_12ma>;
}; };
emmc_bus8: emmc-bus8 { emmc_bus8: emmc-bus8 {
rockchip,pins = <3 0 RK_FUNC_2 &pcfg_pull_none_12ma>, rockchip,pins = <3 RK_PA0 2 &pcfg_pull_none_12ma>,
<3 1 RK_FUNC_2 &pcfg_pull_none_12ma>, <3 RK_PA1 2 &pcfg_pull_none_12ma>,
<3 2 RK_FUNC_2 &pcfg_pull_none_12ma>, <3 RK_PA2 2 &pcfg_pull_none_12ma>,
<3 3 RK_FUNC_2 &pcfg_pull_none_12ma>, <3 RK_PA3 2 &pcfg_pull_none_12ma>,
<3 4 RK_FUNC_2 &pcfg_pull_none_12ma>, <3 RK_PA4 2 &pcfg_pull_none_12ma>,
<3 5 RK_FUNC_2 &pcfg_pull_none_12ma>, <3 RK_PA5 2 &pcfg_pull_none_12ma>,
<3 6 RK_FUNC_2 &pcfg_pull_none_12ma>, <3 RK_PA6 2 &pcfg_pull_none_12ma>,
<3 7 RK_FUNC_2 &pcfg_pull_none_12ma>; <3 RK_PA7 2 &pcfg_pull_none_12ma>;
}; };
}; };
gmac { gmac {
phy_int: phy-int { phy_int: phy-int {
rockchip,pins = <4 2 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <4 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
phy_rst: phy-rst { phy_rst: phy-rst {
rockchip,pins = <4 8 RK_FUNC_GPIO &pcfg_output_high>; rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_output_high>;
}; };
}; };
leds { leds {
user_led: user-led { user_led: user-led {
rockchip,pins = <7 2 RK_FUNC_GPIO &pcfg_output_high>; rockchip,pins = <7 RK_PA2 RK_FUNC_GPIO &pcfg_output_high>;
}; };
}; };
pmic { pmic {
pmic_int: pmic-int { pmic_int: pmic-int {
rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
/* Pin for switching state between sleep and non-sleep state */ /* Pin for switching state between sleep and non-sleep state */
pmic_sleep: pmic-sleep { pmic_sleep: pmic-sleep {
rockchip,pins = <RK_GPIO0 0 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
}; };
......
arch/arm/boot/dts/rk3288-r89.dts
View file @ 07f08d9c
...@@ -265,39 +265,39 @@ pcfg_output_low: pcfg-output-low { ...@@ -265,39 +265,39 @@ pcfg_output_low: pcfg-output-low {
act8846 { act8846 {
pmic_vsel: pmic-vsel { pmic_vsel: pmic-vsel {
rockchip,pins = <7 1 RK_FUNC_GPIO &pcfg_output_low>; rockchip,pins = <7 RK_PA1 RK_FUNC_GPIO &pcfg_output_low>;
}; };
pwr_hold: pwr-hold { pwr_hold: pwr-hold {
rockchip,pins = <0 6 RK_FUNC_GPIO &pcfg_output_high>; rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_output_high>;
}; };
}; };
buttons { buttons {
pwrbtn: pwrbtn { pwrbtn: pwrbtn {
rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
ir { ir {
ir_int: ir-int { ir_int: ir-int {
rockchip,pins = <7 0 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <7 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
pmic { pmic {
pmic_int: pmic-int { pmic_int: pmic-int {
rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
usb { usb {
host_vbus_drv: host-vbus-drv { host_vbus_drv: host-vbus-drv {
rockchip,pins = <0 14 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
otg_vbus_drv: otg-vbus-drv { otg_vbus_drv: otg-vbus-drv {
rockchip,pins = <0 12 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
}; };
......
arch/arm/boot/dts/rk3288-rock2-som.dtsi
View file @ 07f08d9c
...@@ -231,13 +231,13 @@ pcfg_output_high: pcfg-output-high { ...@@ -231,13 +231,13 @@ pcfg_output_high: pcfg-output-high {
emmc { emmc {
emmc_reset: emmc-reset { emmc_reset: emmc-reset {
rockchip,pins = <3 9 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <3 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
gmac { gmac {
phy_rst: phy-rst { phy_rst: phy-rst {
rockchip,pins = <4 8 RK_FUNC_GPIO &pcfg_output_high>; rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_output_high>;
}; };
}; };
}; };
......
arch/arm/boot/dts/rk3288-rock2-square.dts
View file @ 07f08d9c
...@@ -204,53 +204,53 @@ &i2s { ...@@ -204,53 +204,53 @@ &i2s {
&pinctrl { &pinctrl {
ir { ir {
ir_int: ir-int { ir_int: ir-int {
rockchip,pins = <8 1 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <8 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
keys { keys {
pwr_key: pwr-key { pwr_key: pwr-key {
rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
pmic { pmic {
pmic_int: pmic-int { pmic_int: pmic-int {
rockchip,pins = <0 4 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
headphone { headphone {
hp_det: hp-det { hp_det: hp-det {
rockchip,pins = <7 7 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <7 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
phone_ctl: phone-ctl { phone_ctl: phone-ctl {
rockchip,pins = <8 0 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <8 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
usb { usb {
host_vbus_drv: host-vbus-drv { host_vbus_drv: host-vbus-drv {
rockchip,pins = <0 14 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
sata { sata {
sata_pwr_en: sata-pwr-en { sata_pwr_en: sata-pwr-en {
rockchip,pins = <0 13 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
sdmmc { sdmmc {
sdmmc_pwr: sdmmc-pwr { sdmmc_pwr: sdmmc-pwr {
rockchip,pins = <7 11 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <7 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
sdio { sdio {
wifi_enable: wifi-enable { wifi_enable: wifi-enable {
rockchip,pins = <4 28 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <4 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
}; };
......
arch/arm/boot/dts/rk3288-tinker.dtsi
View file @ 07f08d9c
...@@ -363,68 +363,68 @@ pcfg_pull_up_drv_8ma: pcfg-pull-up-drv-8ma { ...@@ -363,68 +363,68 @@ pcfg_pull_up_drv_8ma: pcfg-pull-up-drv-8ma {
backlight { backlight {
bl_en: bl-en { bl_en: bl-en {
rockchip,pins = <7 2 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <7 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
buttons { buttons {
pwrbtn: pwrbtn { pwrbtn: pwrbtn {
rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
eth_phy { eth_phy {
eth_phy_pwr: eth-phy-pwr { eth_phy_pwr: eth-phy-pwr {
rockchip,pins = <0 6 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
pmic { pmic {
pmic_int: pmic-int { pmic_int: pmic-int {
rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO \ rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO \
&pcfg_pull_up>; &pcfg_pull_up>;
}; };
dvs_1: dvs-1 { dvs_1: dvs-1 {
rockchip,pins = <RK_GPIO0 11 RK_FUNC_GPIO \ rockchip,pins = <0 RK_PB3 RK_FUNC_GPIO \
&pcfg_pull_down>; &pcfg_pull_down>;
}; };
dvs_2: dvs-2 { dvs_2: dvs-2 {
rockchip,pins = <RK_GPIO0 12 RK_FUNC_GPIO \ rockchip,pins = <0 RK_PB4 RK_FUNC_GPIO \
&pcfg_pull_down>; &pcfg_pull_down>;
}; };
}; };
sdmmc { sdmmc {
sdmmc_bus4: sdmmc-bus4 { sdmmc_bus4: sdmmc-bus4 {
rockchip,pins = <6 16 RK_FUNC_1 &pcfg_pull_up_drv_8ma>, rockchip,pins = <6 RK_PC0 1 &pcfg_pull_up_drv_8ma>,
<6 17 RK_FUNC_1 &pcfg_pull_up_drv_8ma>, <6 RK_PC1 1 &pcfg_pull_up_drv_8ma>,
<6 18 RK_FUNC_1 &pcfg_pull_up_drv_8ma>, <6 RK_PC2 1 &pcfg_pull_up_drv_8ma>,
<6 19 RK_FUNC_1 &pcfg_pull_up_drv_8ma>; <6 RK_PC3 1 &pcfg_pull_up_drv_8ma>;
}; };
sdmmc_clk: sdmmc-clk { sdmmc_clk: sdmmc-clk {
rockchip,pins = <6 20 RK_FUNC_1 \ rockchip,pins = <6 RK_PC4 1 \
&pcfg_pull_none_drv_8ma>; &pcfg_pull_none_drv_8ma>;
}; };
sdmmc_cmd: sdmmc-cmd { sdmmc_cmd: sdmmc-cmd {
rockchip,pins = <6 21 RK_FUNC_1 &pcfg_pull_up_drv_8ma>; rockchip,pins = <6 RK_PC5 1 &pcfg_pull_up_drv_8ma>;
}; };
sdmmc_pwr: sdmmc-pwr { sdmmc_pwr: sdmmc-pwr {
rockchip,pins = <7 11 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <7 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
usb { usb {
host_vbus_drv: host-vbus-drv { host_vbus_drv: host-vbus-drv {
rockchip,pins = <0 14 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
pwr_3g: pwr-3g { pwr_3g: pwr-3g {
rockchip,pins = <7 8 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <7 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
......
arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi
View file @ 07f08d9c
...@@ -73,7 +73,7 @@ regulator-state-mem { ...@@ -73,7 +73,7 @@ regulator-state-mem {
&pinctrl { &pinctrl {
codec { codec {
hp_det: hp-det { hp_det: hp-det {
rockchip,pins = <6 5 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <6 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
/* /*
...@@ -82,17 +82,17 @@ hp_det: hp-det { ...@@ -82,17 +82,17 @@ hp_det: hp-det {
* we've got a ts3a227e chip but the driver requires it. * we've got a ts3a227e chip but the driver requires it.
*/ */
int_codec: int-codec { int_codec: int-codec {
rockchip,pins = <6 7 RK_FUNC_GPIO &pcfg_pull_down>; rockchip,pins = <6 RK_PA7 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
mic_det: mic-det { mic_det: mic-det {
rockchip,pins = <6 11 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <6 RK_PB3 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
headset { headset {
ts3a227e_int_l: ts3a227e-int-l { ts3a227e_int_l: ts3a227e-int-l {
rockchip,pins = <0 3 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
}; };
arch/arm/boot/dts/rk3288-veyron-brain.dts
View file @ 07f08d9c
...@@ -42,23 +42,23 @@ vcc5_host2: vcc5-host2-regulator { ...@@ -42,23 +42,23 @@ vcc5_host2: vcc5-host2-regulator {
&pinctrl { &pinctrl {
hdmi { hdmi {
vcc50_hdmi_en: vcc50-hdmi-en { vcc50_hdmi_en: vcc50-hdmi-en {
rockchip,pins = <7 2 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <7 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
pmic { pmic {
dvs_1: dvs-1 { dvs_1: dvs-1 {
rockchip,pins = <7 11 RK_FUNC_GPIO &pcfg_pull_down>; rockchip,pins = <7 RK_PB3 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
dvs_2: dvs-2 { dvs_2: dvs-2 {
rockchip,pins = <7 15 RK_FUNC_GPIO &pcfg_pull_down>; rockchip,pins = <7 RK_PB7 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
}; };
usb-host { usb-host {
usb2_pwr_en: usb2-pwr-en { usb2_pwr_en: usb2-pwr-en {
rockchip,pins = <0 12 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
}; };
......
arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi
View file @ 07f08d9c
...@@ -244,51 +244,51 @@ &suspend_l_sleep ...@@ -244,51 +244,51 @@ &suspend_l_sleep
backlight { backlight {
bl_en: bl-en { bl_en: bl-en {
rockchip,pins = <7 2 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <7 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
buttons { buttons {
ap_lid_int_l: ap-lid-int-l { ap_lid_int_l: ap-lid-int-l {
rockchip,pins = <0 6 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
charger { charger {
ac_present_ap: ac-present-ap { ac_present_ap: ac-present-ap {
rockchip,pins = <0 8 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
cros-ec { cros-ec {
ec_int: ec-int { ec_int: ec-int {
rockchip,pins = <7 7 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <7 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
suspend { suspend {
suspend_l_wake: suspend-l-wake { suspend_l_wake: suspend-l-wake {
rockchip,pins = <0 17 RK_FUNC_GPIO &pcfg_output_low>; rockchip,pins = <0 RK_PC1 RK_FUNC_GPIO &pcfg_output_low>;
}; };
suspend_l_sleep: suspend-l-sleep { suspend_l_sleep: suspend-l-sleep {
rockchip,pins = <0 17 RK_FUNC_GPIO &pcfg_output_high>; rockchip,pins = <0 RK_PC1 RK_FUNC_GPIO &pcfg_output_high>;
}; };
}; };
trackpad { trackpad {
trackpad_int: trackpad-int { trackpad_int: trackpad-int {
rockchip,pins = <7 3 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <7 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
usb-host { usb-host {
host1_pwr_en: host1-pwr-en { host1_pwr_en: host1-pwr-en {
rockchip,pins = <0 11 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
usbotg_pwren_h: usbotg-pwren-h { usbotg_pwren_h: usbotg-pwren-h {
rockchip,pins = <0 12 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
}; };
......
arch/arm/boot/dts/rk3288-veyron-jaq.dts
View file @ 07f08d9c
...@@ -138,39 +138,39 @@ &vcc50_hdmi { ...@@ -138,39 +138,39 @@ &vcc50_hdmi {
&pinctrl { &pinctrl {
backlight { backlight {
bl_pwr_en: bl_pwr_en { bl_pwr_en: bl_pwr_en {
rockchip,pins = <2 12 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
buck-5v { buck-5v {
drv_5v: drv-5v { drv_5v: drv-5v {
rockchip,pins = <7 21 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <7 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
hdmi { hdmi {
vcc50_hdmi_en: vcc50-hdmi-en { vcc50_hdmi_en: vcc50-hdmi-en {
rockchip,pins = <5 19 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <5 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
lcd { lcd {
lcd_enable_h: lcd-en { lcd_enable_h: lcd-en {
rockchip,pins = <7 14 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <7 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
avdd_1v8_disp_en: avdd-1v8-disp-en { avdd_1v8_disp_en: avdd-1v8-disp-en {
rockchip,pins = <2 13 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
pmic { pmic {
dvs_1: dvs-1 { dvs_1: dvs-1 {
rockchip,pins = <7 12 RK_FUNC_GPIO &pcfg_pull_down>; rockchip,pins = <7 RK_PB4 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
dvs_2: dvs-2 { dvs_2: dvs-2 {
rockchip,pins = <7 15 RK_FUNC_GPIO &pcfg_pull_down>; rockchip,pins = <7 RK_PB7 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
}; };
}; };
arch/arm/boot/dts/rk3288-veyron-jerry.dts
View file @ 07f08d9c
...@@ -106,39 +106,39 @@ &vcc50_hdmi { ...@@ -106,39 +106,39 @@ &vcc50_hdmi {
&pinctrl { &pinctrl {
backlight { backlight {
bl_pwr_en: bl_pwr_en { bl_pwr_en: bl_pwr_en {
rockchip,pins = <2 12 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
buck-5v { buck-5v {
drv_5v: drv-5v { drv_5v: drv-5v {
rockchip,pins = <7 21 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <7 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
hdmi { hdmi {
vcc50_hdmi_en: vcc50-hdmi-en { vcc50_hdmi_en: vcc50-hdmi-en {
rockchip,pins = <5 19 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <5 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
lcd { lcd {
lcd_enable_h: lcd-en { lcd_enable_h: lcd-en {
rockchip,pins = <7 14 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <7 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
avdd_1v8_disp_en: avdd-1v8-disp-en { avdd_1v8_disp_en: avdd-1v8-disp-en {
rockchip,pins = <2 13 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
pmic { pmic {
dvs_1: dvs-1 { dvs_1: dvs-1 {
rockchip,pins = <7 12 RK_FUNC_GPIO &pcfg_pull_down>; rockchip,pins = <7 RK_PB4 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
dvs_2: dvs-2 { dvs_2: dvs-2 {
rockchip,pins = <7 15 RK_FUNC_GPIO &pcfg_pull_down>; rockchip,pins = <7 RK_PB7 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
}; };
}; };
......
arch/arm/boot/dts/rk3288-veyron-mickey.dts
View file @ 07f08d9c
...@@ -186,17 +186,17 @@ vcc18_lcd: LDO_REG8 { ...@@ -186,17 +186,17 @@ vcc18_lcd: LDO_REG8 {
&pinctrl { &pinctrl {
hdmi { hdmi {
power_hdmi_on: power-hdmi-on { power_hdmi_on: power-hdmi-on {
rockchip,pins = <7 11 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <7 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
pmic { pmic {
dvs_1: dvs-1 { dvs_1: dvs-1 {
rockchip,pins = <7 12 RK_FUNC_GPIO &pcfg_pull_down>; rockchip,pins = <7 RK_PB4 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
dvs_2: dvs-2 { dvs_2: dvs-2 {
rockchip,pins = <7 15 RK_FUNC_GPIO &pcfg_pull_down>; rockchip,pins = <7 RK_PB7 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
}; };
}; };
......
arch/arm/boot/dts/rk3288-veyron-mighty.dts
View file @ 07f08d9c
...@@ -28,7 +28,7 @@ &sdmmc { ...@@ -28,7 +28,7 @@ &sdmmc {
&pinctrl { &pinctrl {
sdmmc { sdmmc {
sdmmc_wp_gpio: sdmmc-wp-gpio { sdmmc_wp_gpio: sdmmc-wp-gpio {
rockchip,pins = <7 10 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <7 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
}; };
arch/arm/boot/dts/rk3288-veyron-minnie.dts
View file @ 07f08d9c
...@@ -191,65 +191,65 @@ &vcc50_hdmi { ...@@ -191,65 +191,65 @@ &vcc50_hdmi {
&pinctrl { &pinctrl {
backlight { backlight {
bl_pwr_en: bl_pwr_en { bl_pwr_en: bl_pwr_en {
rockchip,pins = <2 12 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
buck-5v { buck-5v {
drv_5v: drv-5v { drv_5v: drv-5v {
rockchip,pins = <7 21 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <7 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
buttons { buttons {
volum_down_l: volum-down-l { volum_down_l: volum-down-l {
rockchip,pins = <5 11 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <5 RK_PB3 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
volum_up_l: volum-up-l { volum_up_l: volum-up-l {
rockchip,pins = <5 10 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <5 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
hdmi { hdmi {
vcc50_hdmi_en: vcc50-hdmi-en { vcc50_hdmi_en: vcc50-hdmi-en {
rockchip,pins = <5 19 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <5 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
lcd { lcd {
lcd_enable_h: lcd-en { lcd_enable_h: lcd-en {
rockchip,pins = <7 14 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <7 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
avdd_1v8_disp_en: avdd-1v8-disp-en { avdd_1v8_disp_en: avdd-1v8-disp-en {
rockchip,pins = <2 13 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
pmic { pmic {
dvs_1: dvs-1 { dvs_1: dvs-1 {
rockchip,pins = <7 12 RK_FUNC_GPIO &pcfg_pull_down>; rockchip,pins = <7 RK_PB4 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
dvs_2: dvs-2 { dvs_2: dvs-2 {
rockchip,pins = <7 15 RK_FUNC_GPIO &pcfg_pull_down>; rockchip,pins = <7 RK_PB7 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
}; };
prochot { prochot {
gpio_prochot: gpio-prochot { gpio_prochot: gpio-prochot {
rockchip,pins = <2 8 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <2 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
touchscreen { touchscreen {
touch_int: touch-int { touch_int: touch-int {
rockchip,pins = <2 14 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <2 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
touch_rst: touch-rst { touch_rst: touch-rst {
rockchip,pins = <2 15 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <2 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
}; };
arch/arm/boot/dts/rk3288-veyron-pinky.dts
View file @ 07f08d9c
...@@ -55,19 +55,19 @@ &i2c3 { ...@@ -55,19 +55,19 @@ &i2c3 {
&pinctrl { &pinctrl {
buttons { buttons {
pwr_key_h: pwr-key-h { pwr_key_h: pwr-key-h {
rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
emmc { emmc {
emmc_reset: emmc-reset { emmc_reset: emmc-reset {
rockchip,pins = <7 12 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <7 RK_PB4 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
sdmmc { sdmmc {
sdmmc_wp_gpio: sdmmc-wp-gpio { sdmmc_wp_gpio: sdmmc-wp-gpio {
rockchip,pins = <7 10 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <7 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
}; };
......
arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi
View file @ 07f08d9c
...@@ -16,18 +16,18 @@ sdmmc { ...@@ -16,18 +16,18 @@ sdmmc {
* We also have external pulls, so disable the internal ones. * We also have external pulls, so disable the internal ones.
*/ */
sdmmc_bus4: sdmmc-bus4 { sdmmc_bus4: sdmmc-bus4 {
rockchip,pins = <6 16 RK_FUNC_1 &pcfg_pull_none_drv_8ma>, rockchip,pins = <6 RK_PC0 1 &pcfg_pull_none_drv_8ma>,
<6 17 RK_FUNC_1 &pcfg_pull_none_drv_8ma>, <6 RK_PC1 1 &pcfg_pull_none_drv_8ma>,
<6 18 RK_FUNC_1 &pcfg_pull_none_drv_8ma>, <6 RK_PC2 1 &pcfg_pull_none_drv_8ma>,
<6 19 RK_FUNC_1 &pcfg_pull_none_drv_8ma>; <6 RK_PC3 1 &pcfg_pull_none_drv_8ma>;
}; };
sdmmc_clk: sdmmc-clk { sdmmc_clk: sdmmc-clk {
rockchip,pins = <6 20 RK_FUNC_1 &pcfg_pull_none_drv_8ma>; rockchip,pins = <6 RK_PC4 1 &pcfg_pull_none_drv_8ma>;
}; };
sdmmc_cmd: sdmmc-cmd { sdmmc_cmd: sdmmc-cmd {
rockchip,pins = <6 21 RK_FUNC_1 &pcfg_pull_none_drv_8ma>; rockchip,pins = <6 RK_PC5 1 &pcfg_pull_none_drv_8ma>;
}; };
/* /*
...@@ -37,12 +37,12 @@ sdmmc_cmd: sdmmc-cmd { ...@@ -37,12 +37,12 @@ sdmmc_cmd: sdmmc-cmd {
* think there's a card inserted * think there's a card inserted
*/ */
sdmmc_cd_disabled: sdmmc-cd-disabled { sdmmc_cd_disabled: sdmmc-cd-disabled {
rockchip,pins = <6 22 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <6 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
/* This is where we actually hook up CD */ /* This is where we actually hook up CD */
sdmmc_cd_gpio: sdmmc-cd-gpio { sdmmc_cd_gpio: sdmmc-cd-gpio {
rockchip,pins = <7 5 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <7 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
}; };
......
arch/arm/boot/dts/rk3288-veyron-speedy.dts
View file @ 07f08d9c
...@@ -104,39 +104,39 @@ &vcc50_hdmi { ...@@ -104,39 +104,39 @@ &vcc50_hdmi {
&pinctrl { &pinctrl {
backlight { backlight {
bl_pwr_en: bl_pwr_en { bl_pwr_en: bl_pwr_en {
rockchip,pins = <2 12 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
buck-5v { buck-5v {
drv_5v: drv-5v { drv_5v: drv-5v {
rockchip,pins = <7 21 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <7 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
hdmi { hdmi {
vcc50_hdmi_en: vcc50-hdmi-en { vcc50_hdmi_en: vcc50-hdmi-en {
rockchip,pins = <5 19 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <5 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
lcd { lcd {
lcd_enable_h: lcd-en { lcd_enable_h: lcd-en {
rockchip,pins = <7 14 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <7 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
avdd_1v8_disp_en: avdd-1v8-disp-en { avdd_1v8_disp_en: avdd-1v8-disp-en {
rockchip,pins = <2 13 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
pmic { pmic {
dvs_1: dvs-1 { dvs_1: dvs-1 {
rockchip,pins = <7 12 RK_FUNC_GPIO &pcfg_pull_down>; rockchip,pins = <7 RK_PB4 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
dvs_2: dvs-2 { dvs_2: dvs-2 {
rockchip,pins = <7 15 RK_FUNC_GPIO &pcfg_pull_down>; rockchip,pins = <7 RK_PB7 RK_FUNC_GPIO &pcfg_pull_down>;
}; };
}; };
}; };
arch/arm/boot/dts/rk3288-veyron.dtsi
View file @ 07f08d9c
...@@ -480,13 +480,13 @@ pcfg_output_low: pcfg-output-low { ...@@ -480,13 +480,13 @@ pcfg_output_low: pcfg-output-low {
buttons { buttons {
pwr_key_l: pwr-key-l { pwr_key_l: pwr-key-l {
rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
emmc { emmc {
emmc_reset: emmc-reset { emmc_reset: emmc-reset {
rockchip,pins = <2 9 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <2 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
/* /*
...@@ -494,51 +494,51 @@ emmc_reset: emmc-reset { ...@@ -494,51 +494,51 @@ emmc_reset: emmc-reset {
* We also have external pulls, so disable the internal ones. * We also have external pulls, so disable the internal ones.
*/ */
emmc_clk: emmc-clk { emmc_clk: emmc-clk {
rockchip,pins = <3 18 RK_FUNC_2 &pcfg_pull_none_drv_8ma>; rockchip,pins = <3 RK_PC2 2 &pcfg_pull_none_drv_8ma>;
}; };
emmc_cmd: emmc-cmd { emmc_cmd: emmc-cmd {
rockchip,pins = <3 16 RK_FUNC_2 &pcfg_pull_none_drv_8ma>; rockchip,pins = <3 RK_PC0 2 &pcfg_pull_none_drv_8ma>;
}; };
emmc_bus8: emmc-bus8 { emmc_bus8: emmc-bus8 {
rockchip,pins = <3 0 RK_FUNC_2 &pcfg_pull_none_drv_8ma>, rockchip,pins = <3 RK_PA0 2 &pcfg_pull_none_drv_8ma>,
<3 1 RK_FUNC_2 &pcfg_pull_none_drv_8ma>, <3 RK_PA1 2 &pcfg_pull_none_drv_8ma>,
<3 2 RK_FUNC_2 &pcfg_pull_none_drv_8ma>, <3 RK_PA2 2 &pcfg_pull_none_drv_8ma>,
<3 3 RK_FUNC_2 &pcfg_pull_none_drv_8ma>, <3 RK_PA3 2 &pcfg_pull_none_drv_8ma>,
<3 4 RK_FUNC_2 &pcfg_pull_none_drv_8ma>, <3 RK_PA4 2 &pcfg_pull_none_drv_8ma>,
<3 5 RK_FUNC_2 &pcfg_pull_none_drv_8ma>, <3 RK_PA5 2 &pcfg_pull_none_drv_8ma>,
<3 6 RK_FUNC_2 &pcfg_pull_none_drv_8ma>, <3 RK_PA6 2 &pcfg_pull_none_drv_8ma>,
<3 7 RK_FUNC_2 &pcfg_pull_none_drv_8ma>; <3 RK_PA7 2 &pcfg_pull_none_drv_8ma>;
}; };
}; };
pmic { pmic {
pmic_int_l: pmic-int-l { pmic_int_l: pmic-int-l {
rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
reboot { reboot {
ap_warm_reset_h: ap-warm-reset-h { ap_warm_reset_h: ap-warm-reset-h {
rockchip,pins = <RK_GPIO0 13 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
recovery-switch { recovery-switch {
rec_mode_l: rec-mode-l { rec_mode_l: rec-mode-l {
rockchip,pins = <0 9 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
sdio0 { sdio0 {
wifi_enable_h: wifienable-h { wifi_enable_h: wifienable-h {
rockchip,pins = <4 28 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <4 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
/* NOTE: mislabelled on schematic; should be bt_enable_h */ /* NOTE: mislabelled on schematic; should be bt_enable_h */
bt_enable_l: bt-enable-l { bt_enable_l: bt-enable-l {
rockchip,pins = <4 29 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <4 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
/* /*
...@@ -546,30 +546,30 @@ bt_enable_l: bt-enable-l { ...@@ -546,30 +546,30 @@ bt_enable_l: bt-enable-l {
* We also have external pulls, so disable the internal ones. * We also have external pulls, so disable the internal ones.
*/ */
sdio0_bus4: sdio0-bus4 { sdio0_bus4: sdio0-bus4 {
rockchip,pins = <4 20 RK_FUNC_1 &pcfg_pull_none_drv_8ma>, rockchip,pins = <4 RK_PC4 1 &pcfg_pull_none_drv_8ma>,
<4 21 RK_FUNC_1 &pcfg_pull_none_drv_8ma>, <4 RK_PC5 1 &pcfg_pull_none_drv_8ma>,
<4 22 RK_FUNC_1 &pcfg_pull_none_drv_8ma>, <4 RK_PC6 1 &pcfg_pull_none_drv_8ma>,
<4 23 RK_FUNC_1 &pcfg_pull_none_drv_8ma>; <4 RK_PC7 1 &pcfg_pull_none_drv_8ma>;
}; };
sdio0_cmd: sdio0-cmd { sdio0_cmd: sdio0-cmd {
rockchip,pins = <4 24 RK_FUNC_1 &pcfg_pull_none_drv_8ma>; rockchip,pins = <4 RK_PD0 1 &pcfg_pull_none_drv_8ma>;
}; };
sdio0_clk: sdio0-clk { sdio0_clk: sdio0-clk {
rockchip,pins = <4 25 RK_FUNC_1 &pcfg_pull_none_drv_8ma>; rockchip,pins = <4 RK_PD1 1 &pcfg_pull_none_drv_8ma>;
}; };
}; };
tpm { tpm {
tpm_int_h: tpm-int-h { tpm_int_h: tpm-int-h {
rockchip,pins = <7 4 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <7 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
write-protect { write-protect {
fw_wp_ap: fw-wp-ap { fw_wp_ap: fw-wp-ap {
rockchip,pins = <7 6 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <7 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
}; };
arch/arm/boot/dts/rk3288-vyasa.dts
View file @ 07f08d9c
...@@ -448,13 +448,13 @@ phy_rst: phy-rst { ...@@ -448,13 +448,13 @@ phy_rst: phy-rst {
pmic { pmic {
pmic_int: pmic-int { pmic_int: pmic-int {
rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>; rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;
}; };
}; };
usb_host { usb_host {
phy_pwr_en: phy-pwr-en { phy_pwr_en: phy-pwr-en {
rockchip,pins = <RK_GPIO2 RK_PB1 RK_FUNC_GPIO &pcfg_output_high>; rockchip,pins = <2 RK_PB1 RK_FUNC_GPIO &pcfg_output_high>;
}; };
usb2_pwr_en: usb2-pwr-en { usb2_pwr_en: usb2-pwr-en {
...@@ -464,7 +464,7 @@ usb2_pwr_en: usb2-pwr-en { ...@@ -464,7 +464,7 @@ usb2_pwr_en: usb2-pwr-en {
usb_otg { usb_otg {
otg_vbus_drv: otg-vbus-drv { otg_vbus_drv: otg-vbus-drv {
rockchip,pins = <RK_GPIO0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
......
arch/arm/boot/dts/rk3288.dtsi
View file @ 07f08d9c
This diff is collapsed.
arch/arm/boot/dts/rv1108.dtsi
View file @ 07f08d9c
...@@ -682,58 +682,58 @@ pcfg_input_high: pcfg-input-high { ...@@ -682,58 +682,58 @@ pcfg_input_high: pcfg-input-high {
emmc { emmc {
emmc_bus8: emmc-bus8 { emmc_bus8: emmc-bus8 {
rockchip,pins = <2 RK_PA0 RK_FUNC_2 &pcfg_pull_up_drv_8ma>, rockchip,pins = <2 RK_PA0 2 &pcfg_pull_up_drv_8ma>,
<2 RK_PA1 RK_FUNC_2 &pcfg_pull_up_drv_8ma>, <2 RK_PA1 2 &pcfg_pull_up_drv_8ma>,
<2 RK_PA2 RK_FUNC_2 &pcfg_pull_up_drv_8ma>, <2 RK_PA2 2 &pcfg_pull_up_drv_8ma>,
<2 RK_PA3 RK_FUNC_2 &pcfg_pull_up_drv_8ma>, <2 RK_PA3 2 &pcfg_pull_up_drv_8ma>,
<2 RK_PA4 RK_FUNC_2 &pcfg_pull_up_drv_8ma>, <2 RK_PA4 2 &pcfg_pull_up_drv_8ma>,
<2 RK_PA5 RK_FUNC_2 &pcfg_pull_up_drv_8ma>, <2 RK_PA5 2 &pcfg_pull_up_drv_8ma>,
<2 RK_PA6 RK_FUNC_2 &pcfg_pull_up_drv_8ma>, <2 RK_PA6 2 &pcfg_pull_up_drv_8ma>,
<2 RK_PA7 RK_FUNC_2 &pcfg_pull_up_drv_8ma>; <2 RK_PA7 2 &pcfg_pull_up_drv_8ma>;
}; };
emmc_clk: emmc-clk { emmc_clk: emmc-clk {
rockchip,pins = <2 RK_PB6 RK_FUNC_1 &pcfg_pull_none_drv_8ma>; rockchip,pins = <2 RK_PB6 1 &pcfg_pull_none_drv_8ma>;
}; };
emmc_cmd: emmc-cmd { emmc_cmd: emmc-cmd {
rockchip,pins = <2 RK_PB4 RK_FUNC_2 &pcfg_pull_up_drv_8ma>; rockchip,pins = <2 RK_PB4 2 &pcfg_pull_up_drv_8ma>;
}; };
}; };
gmac { gmac {
rmii_pins: rmii-pins { rmii_pins: rmii-pins {
rockchip,pins = <1 RK_PC5 RK_FUNC_2 &pcfg_pull_none>, rockchip,pins = <1 RK_PC5 2 &pcfg_pull_none>,
<1 RK_PC3 RK_FUNC_2 &pcfg_pull_none>, <1 RK_PC3 2 &pcfg_pull_none>,
<1 RK_PC4 RK_FUNC_2 &pcfg_pull_none>, <1 RK_PC4 2 &pcfg_pull_none>,
<1 RK_PB2 RK_FUNC_3 &pcfg_pull_none_drv_12ma>, <1 RK_PB2 3 &pcfg_pull_none_drv_12ma>,
<1 RK_PB3 RK_FUNC_3 &pcfg_pull_none_drv_12ma>, <1 RK_PB3 3 &pcfg_pull_none_drv_12ma>,
<1 RK_PB4 RK_FUNC_3 &pcfg_pull_none_drv_12ma>, <1 RK_PB4 3 &pcfg_pull_none_drv_12ma>,
<1 RK_PB5 RK_FUNC_3 &pcfg_pull_none>, <1 RK_PB5 3 &pcfg_pull_none>,
<1 RK_PB6 RK_FUNC_3 &pcfg_pull_none>, <1 RK_PB6 3 &pcfg_pull_none>,
<1 RK_PB7 RK_FUNC_3 &pcfg_pull_none>, <1 RK_PB7 3 &pcfg_pull_none>,
<1 RK_PC2 RK_FUNC_3 &pcfg_pull_none>; <1 RK_PC2 3 &pcfg_pull_none>;
}; };
}; };
i2c0 { i2c0 {
i2c0_xfer: i2c0-xfer { i2c0_xfer: i2c0-xfer {
rockchip,pins = <0 RK_PB1 RK_FUNC_1 &pcfg_pull_none_smt>, rockchip,pins = <0 RK_PB1 1 &pcfg_pull_none_smt>,
<0 RK_PB2 RK_FUNC_1 &pcfg_pull_none_smt>; <0 RK_PB2 1 &pcfg_pull_none_smt>;
}; };
}; };
i2c1 { i2c1 {
i2c1_xfer: i2c1-xfer { i2c1_xfer: i2c1-xfer {
rockchip,pins = <2 RK_PD3 RK_FUNC_1 &pcfg_pull_up>, rockchip,pins = <2 RK_PD3 1 &pcfg_pull_up>,
<2 RK_PD4 RK_FUNC_1 &pcfg_pull_up>; <2 RK_PD4 1 &pcfg_pull_up>;
}; };
}; };
i2c2m1 { i2c2m1 {
i2c2m1_xfer: i2c2m1-xfer { i2c2m1_xfer: i2c2m1-xfer {
rockchip,pins = <0 RK_PC2 RK_FUNC_2 &pcfg_pull_none>, rockchip,pins = <0 RK_PC2 2 &pcfg_pull_none>,
<0 RK_PC6 RK_FUNC_3 &pcfg_pull_none>; <0 RK_PC6 3 &pcfg_pull_none>;
}; };
i2c2m1_gpio: i2c2m1-gpio { i2c2m1_gpio: i2c2m1-gpio {
...@@ -744,8 +744,8 @@ i2c2m1_gpio: i2c2m1-gpio { ...@@ -744,8 +744,8 @@ i2c2m1_gpio: i2c2m1-gpio {
i2c2m05v { i2c2m05v {
i2c2m05v_xfer: i2c2m05v-xfer { i2c2m05v_xfer: i2c2m05v-xfer {
rockchip,pins = <1 RK_PD5 RK_FUNC_2 &pcfg_pull_none>, rockchip,pins = <1 RK_PD5 2 &pcfg_pull_none>,
<1 RK_PD4 RK_FUNC_2 &pcfg_pull_none>; <1 RK_PD4 2 &pcfg_pull_none>;
}; };
i2c2m05v_gpio: i2c2m05v-gpio { i2c2m05v_gpio: i2c2m05v-gpio {
...@@ -756,123 +756,123 @@ i2c2m05v_gpio: i2c2m05v-gpio { ...@@ -756,123 +756,123 @@ i2c2m05v_gpio: i2c2m05v-gpio {
i2c3 { i2c3 {
i2c3_xfer: i2c3-xfer { i2c3_xfer: i2c3-xfer {
rockchip,pins = <0 RK_PB6 RK_FUNC_1 &pcfg_pull_none>, rockchip,pins = <0 RK_PB6 1 &pcfg_pull_none>,
<0 RK_PC4 RK_FUNC_2 &pcfg_pull_none>; <0 RK_PC4 2 &pcfg_pull_none>;
}; };
}; };
pwm0 { pwm0 {
pwm0_pin: pwm0-pin { pwm0_pin: pwm0-pin {
rockchip,pins = <0 RK_PC5 RK_FUNC_1 &pcfg_pull_none>; rockchip,pins = <0 RK_PC5 1 &pcfg_pull_none>;
}; };
}; };
pwm1 { pwm1 {
pwm1_pin: pwm1-pin { pwm1_pin: pwm1-pin {
rockchip,pins = <0 RK_PC4 RK_FUNC_1 &pcfg_pull_none>; rockchip,pins = <0 RK_PC4 1 &pcfg_pull_none>;
}; };
}; };
pwm2 { pwm2 {
pwm2_pin: pwm2-pin { pwm2_pin: pwm2-pin {
rockchip,pins = <0 RK_PC6 RK_FUNC_1 &pcfg_pull_none>; rockchip,pins = <0 RK_PC6 1 &pcfg_pull_none>;
}; };
}; };
pwm3 { pwm3 {
pwm3_pin: pwm3-pin { pwm3_pin: pwm3-pin {
rockchip,pins = <0 RK_PC0 RK_FUNC_1 &pcfg_pull_none>; rockchip,pins = <0 RK_PC0 1 &pcfg_pull_none>;
}; };
}; };
pwm4 { pwm4 {
pwm4_pin: pwm4-pin { pwm4_pin: pwm4-pin {
rockchip,pins = <1 RK_PC1 RK_FUNC_3 &pcfg_pull_none>; rockchip,pins = <1 RK_PC1 3 &pcfg_pull_none>;
}; };
}; };
pwm5 { pwm5 {
pwm5_pin: pwm5-pin { pwm5_pin: pwm5-pin {
rockchip,pins = <1 RK_PA7 RK_FUNC_2 &pcfg_pull_none>; rockchip,pins = <1 RK_PA7 2 &pcfg_pull_none>;
}; };
}; };
pwm6 { pwm6 {
pwm6_pin: pwm6-pin { pwm6_pin: pwm6-pin {
rockchip,pins = <1 RK_PB0 RK_FUNC_2 &pcfg_pull_none>; rockchip,pins = <1 RK_PB0 2 &pcfg_pull_none>;
}; };
}; };
pwm7 { pwm7 {
pwm7_pin: pwm7-pin { pwm7_pin: pwm7-pin {
rockchip,pins = <1 RK_PB1 RK_FUNC_2 &pcfg_pull_none>; rockchip,pins = <1 RK_PB1 2 &pcfg_pull_none>;
}; };
}; };
sdmmc { sdmmc {
sdmmc_clk: sdmmc-clk { sdmmc_clk: sdmmc-clk {
rockchip,pins = <3 RK_PC4 RK_FUNC_1 &pcfg_pull_none_drv_4ma>; rockchip,pins = <3 RK_PC4 1 &pcfg_pull_none_drv_4ma>;
}; };
sdmmc_cmd: sdmmc-cmd { sdmmc_cmd: sdmmc-cmd {
rockchip,pins = <3 RK_PC5 RK_FUNC_1 &pcfg_pull_up_drv_4ma>; rockchip,pins = <3 RK_PC5 1 &pcfg_pull_up_drv_4ma>;
}; };
sdmmc_cd: sdmmc-cd { sdmmc_cd: sdmmc-cd {
rockchip,pins = <0 RK_PA1 RK_FUNC_1 &pcfg_pull_up_drv_4ma>; rockchip,pins = <0 RK_PA1 1 &pcfg_pull_up_drv_4ma>;
}; };
sdmmc_bus1: sdmmc-bus1 { sdmmc_bus1: sdmmc-bus1 {
rockchip,pins = <3 RK_PC3 RK_FUNC_1 &pcfg_pull_up_drv_4ma>; rockchip,pins = <3 RK_PC3 1 &pcfg_pull_up_drv_4ma>;
}; };
sdmmc_bus4: sdmmc-bus4 { sdmmc_bus4: sdmmc-bus4 {
rockchip,pins = <3 RK_PC3 RK_FUNC_1 &pcfg_pull_up_drv_4ma>, rockchip,pins = <3 RK_PC3 1 &pcfg_pull_up_drv_4ma>,
<3 RK_PC2 RK_FUNC_1 &pcfg_pull_up_drv_4ma>, <3 RK_PC2 1 &pcfg_pull_up_drv_4ma>,
<3 RK_PC1 RK_FUNC_1 &pcfg_pull_up_drv_4ma>, <3 RK_PC1 1 &pcfg_pull_up_drv_4ma>,
<3 RK_PC0 RK_FUNC_1 &pcfg_pull_up_drv_4ma>; <3 RK_PC0 1 &pcfg_pull_up_drv_4ma>;
}; };
}; };
spim0 { spim0 {
spim0_clk: spim0-clk { spim0_clk: spim0-clk {
rockchip,pins = <1 RK_PD0 RK_FUNC_2 &pcfg_pull_up>; rockchip,pins = <1 RK_PD0 2 &pcfg_pull_up>;
}; };
spim0_cs0: spim0-cs0 { spim0_cs0: spim0-cs0 {
rockchip,pins = <1 RK_PD1 RK_FUNC_2 &pcfg_pull_up>; rockchip,pins = <1 RK_PD1 2 &pcfg_pull_up>;
}; };
spim0_tx: spim0-tx { spim0_tx: spim0-tx {
rockchip,pins = <1 RK_PD3 RK_FUNC_2 &pcfg_pull_up>; rockchip,pins = <1 RK_PD3 2 &pcfg_pull_up>;
}; };
spim0_rx: spim0-rx { spim0_rx: spim0-rx {
rockchip,pins = <1 RK_PD2 RK_FUNC_2 &pcfg_pull_up>; rockchip,pins = <1 RK_PD2 2 &pcfg_pull_up>;
}; };
}; };
spim1 { spim1 {
spim1_clk: spim1-clk { spim1_clk: spim1-clk {
rockchip,pins = <0 RK_PA3 RK_FUNC_1 &pcfg_pull_up>; rockchip,pins = <0 RK_PA3 1 &pcfg_pull_up>;
}; };
spim1_cs0: spim1-cs0 { spim1_cs0: spim1-cs0 {
rockchip,pins = <0 RK_PA4 RK_FUNC_1 &pcfg_pull_up>; rockchip,pins = <0 RK_PA4 1 &pcfg_pull_up>;
}; };
spim1_rx: spim1-rx { spim1_rx: spim1-rx {
rockchip,pins = <0 RK_PB0 RK_FUNC_1 &pcfg_pull_up>; rockchip,pins = <0 RK_PB0 1 &pcfg_pull_up>;
}; };
spim1_tx: spim1-tx { spim1_tx: spim1-tx {
rockchip,pins = <0 RK_PA7 RK_FUNC_1 &pcfg_pull_up>; rockchip,pins = <0 RK_PA7 1 &pcfg_pull_up>;
}; };
}; };
tsadc { tsadc {
otp_out: otp-out { otp_out: otp-out {
rockchip,pins = <0 RK_PB7 RK_FUNC_1 &pcfg_pull_none>; rockchip,pins = <0 RK_PB7 1 &pcfg_pull_none>;
}; };
otp_gpio: otp-gpio { otp_gpio: otp-gpio {
...@@ -882,16 +882,16 @@ otp_gpio: otp-gpio { ...@@ -882,16 +882,16 @@ otp_gpio: otp-gpio {
uart0 { uart0 {
uart0_xfer: uart0-xfer { uart0_xfer: uart0-xfer {
rockchip,pins = <3 RK_PA6 RK_FUNC_1 &pcfg_pull_up>, rockchip,pins = <3 RK_PA6 1 &pcfg_pull_up>,
<3 RK_PA5 RK_FUNC_1 &pcfg_pull_none>; <3 RK_PA5 1 &pcfg_pull_none>;
}; };
uart0_cts: uart0-cts { uart0_cts: uart0-cts {
rockchip,pins = <3 RK_PA4 RK_FUNC_1 &pcfg_pull_none>; rockchip,pins = <3 RK_PA4 1 &pcfg_pull_none>;
}; };
uart0_rts: uart0-rts { uart0_rts: uart0-rts {
rockchip,pins = <3 RK_PA3 RK_FUNC_1 &pcfg_pull_none>; rockchip,pins = <3 RK_PA3 1 &pcfg_pull_none>;
}; };
uart0_rts_gpio: uart0-rts-gpio { uart0_rts_gpio: uart0-rts-gpio {
...@@ -901,40 +901,40 @@ uart0_rts_gpio: uart0-rts-gpio { ...@@ -901,40 +901,40 @@ uart0_rts_gpio: uart0-rts-gpio {
uart1 { uart1 {
uart1_xfer: uart1-xfer { uart1_xfer: uart1-xfer {
rockchip,pins = <1 RK_PD3 RK_FUNC_1 &pcfg_pull_up>, rockchip,pins = <1 RK_PD3 1 &pcfg_pull_up>,
<1 RK_PD2 RK_FUNC_1 &pcfg_pull_none>; <1 RK_PD2 1 &pcfg_pull_none>;
}; };
uart1_cts: uart1-cts { uart1_cts: uart1-cts {
rockchip,pins = <1 RK_PD0 RK_FUNC_1 &pcfg_pull_none>; rockchip,pins = <1 RK_PD0 1 &pcfg_pull_none>;
}; };
uart1_rts: uart1-rts { uart1_rts: uart1-rts {
rockchip,pins = <1 RK_PD1 RK_FUNC_1 &pcfg_pull_none>; rockchip,pins = <1 RK_PD1 1 &pcfg_pull_none>;
}; };
}; };
uart2m0 { uart2m0 {
uart2m0_xfer: uart2m0-xfer { uart2m0_xfer: uart2m0-xfer {
rockchip,pins = <2 RK_PD2 RK_FUNC_1 &pcfg_pull_up>, rockchip,pins = <2 RK_PD2 1 &pcfg_pull_up>,
<2 RK_PD1 RK_FUNC_1 &pcfg_pull_none>; <2 RK_PD1 1 &pcfg_pull_none>;
}; };
}; };
uart2m1 { uart2m1 {
uart2m1_xfer: uart2m1-xfer { uart2m1_xfer: uart2m1-xfer {
rockchip,pins = <3 RK_PC3 RK_FUNC_2 &pcfg_pull_up>, rockchip,pins = <3 RK_PC3 2 &pcfg_pull_up>,
<3 RK_PC2 RK_FUNC_2 &pcfg_pull_none>; <3 RK_PC2 2 &pcfg_pull_none>;
}; };
}; };
uart2_5v { uart2_5v {
uart2_5v_cts: uart2_5v-cts { uart2_5v_cts: uart2_5v-cts {
rockchip,pins = <1 RK_PD4 RK_FUNC_1 &pcfg_pull_none>; rockchip,pins = <1 RK_PD4 1 &pcfg_pull_none>;
}; };
uart2_5v_rts: uart2_5v-rts { uart2_5v_rts: uart2_5v-rts {
rockchip,pins = <1 RK_PD5 RK_FUNC_1 &pcfg_pull_none>; rockchip,pins = <1 RK_PD5 1 &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