rockchip: pinctrl: use include from dts/upstream
Subsystems (4)
cover rockchip: pinctrl: use include from dts/upstream
Before we can use the Rockchip pinctrl include from dts/upstream replace some deprecated defines.
Johan Jonker (3):
rockchip: pinctrl: replace RK_FUNC_n defines
rockchip: pinctrl: replace RK_GPIOn defines
rockchip: pinctrl: use include from dts/upstream
arch/arm/dts/rk3368-sheep.dts | 2 +- doc/develop/driver-model/serial-howto.rst | 4 +- drivers/pinctrl/rockchip/pinctrl-rk3568.c | 186 +++++++++++----------- drivers/pinctrl/rockchip/pinctrl-rv1126.c | 134 ++++++++-------- include/dt-bindings/pinctrl/rockchip.h | 60 ------- 5 files changed, 163 insertions(+), 223 deletions(-) delete mode 100644 include/dt-bindings/pinctrl/rockchip.h
--
2.39.5
PATCH 1/3 rockchip: pinctrl: replace RK_FUNC_n defines
The use of RK_FUNC_n defines is deprecated in the upstream rockchip.h file. Replace all them by the function number.
--- arch/arm/dts/rk3368-sheep.dts | 2 +- doc/develop/driver-model/serial-howto.rst | 4 +- drivers/pinctrl/rockchip/pinctrl-rk3568.c | 186 +++++++++++----------- include/dt-bindings/pinctrl/rockchip.h | 6 - 4 files changed, 96 insertions(+), 102 deletions(-)
arch/arm/dts/rk3368-sheep.dts +1 -1
@@ -250,7 +250,7 @@ pmic { pmic_sleep: pmic-sleep { - rockchip,pins = <0 0 RK_FUNC_2 &pcfg_pull_none>; + rockchip,pins = <0 0 2 &pcfg_pull_none>; }; pmic_int: pmic-int {
doc/develop/driver-model/serial-howto.rst +2 -2
@@ -97,8 +97,8 @@ Here are some things you might need to consider: uart2: uart2 { uart2_xfer: uart2-xfer { - rockchip,pins = <1 RK_PC2 RK_FUNC_2 &pcfg_pull_up>, - <1 RK_PC3 RK_FUNC_2 &pcfg_pull_none>; + rockchip,pins = <1 RK_PC2 2 &pcfg_pull_up>, + <1 RK_PC3 2 &pcfg_pull_none>; }; ... };
drivers/pinctrl/rockchip/pinctrl-rk3568.c +93 -93
192 lines not on this page · raw message
include/dt-bindings/pinctrl/rockchip.h +0 -6
@@ -50,11 +50,5 @@#define RK_PD7 31#define RK_FUNC_GPIO 0 -#define RK_FUNC_1 1 -#define RK_FUNC_2 2 -#define RK_FUNC_3 3 -#define RK_FUNC_4 4 -#define RK_FUNC_5 5 -#define RK_FUNC_6 6#endif
--
2.39.5
Re: [PATCH v1 1/3] rockchip: pinctrl: replace RK_FUNC_n defines
Hi Johan,
Quoted 3 lines · Johan Jonker
The use of
RK_FUNC_ndefines is deprecated in the upstreamrockchip.hfile. Replace all them by the function number.
Thanks!
Quentin
PATCH 2/3 rockchip: pinctrl: replace RK_GPIOn defines
In reply to Johan JonkerThe use of RK_GPIOn defines is deprecated in the upstream rockchip.h file. Replace all them by the gpio number.
--- drivers/pinctrl/rockchip/pinctrl-rk3568.c | 186 +++++++++++----------- drivers/pinctrl/rockchip/pinctrl-rv1126.c | 134 ++++++++-------- include/dt-bindings/pinctrl/rockchip.h | 7 - 3 files changed, 160 insertions(+), 167 deletions(-)
drivers/pinctrl/rockchip/pinctrl-rk3568.c +93 -93
@@ -12,99 +12,99 @@#include "pinctrl-rockchip.h" static struct rockchip_mux_route_data rk3568_mux_route_data[] = { -MR_PMUGRF (RK_GPIO0 ,RK_PB7 ,1 ,0x0110 ,RK_GENMASK_VAL (1 ,0 ,0 )),/* PWM0 IO mux selection M0 */ -MR_PMUGRF (RK_GPIO0 ,RK_PC7 ,2 ,0x0110 ,RK_GENMASK_VAL (1 ,0 ,1 )),/* PWM0 IO mux selection M1 */ -MR_PMUGRF (RK_GPIO0 ,RK_PC0 ,1 ,0x0110 ,RK_GENMASK_VAL (3 ,2 ,0 )),/* PWM1 IO mux selection M0 */ -MR_PMUGRF (RK_GPIO0 ,RK_PB5 ,4 ,0x0110 ,RK_GENMASK_VAL (3 ,2 ,1 )),/* PWM1 IO mux selection M1 */ -MR_PMUGRF (RK_GPIO0 ,RK_PC1 ,1 ,0x0110 ,RK_GENMASK_VAL (5 ,4 ,0 )),/* PWM2 IO mux selection M0 */ -MR_PMUGRF (RK_GPIO0 ,RK_PB6 ,4 ,0x0110 ,RK_GENMASK_VAL (5 ,4 ,1 )),/* PWM2 IO mux selection M1 */ -MR_TOPGRF (RK_GPIO0 ,RK_PB3 ,2 ,0x0300 ,RK_GENMASK_VAL (0 ,0 ,0 )),/* CAN0 IO mux selection M0 */ -MR_TOPGRF (RK_GPIO2 ,RK_PA1 ,4 ,0x0300 ,RK_GENMASK_VAL (0 ,0 ,1 )),/* CAN0 IO mux selection M1 */ -MR_TOPGRF (RK_GPIO1 ,RK_PA1 ,3 ,0x0300 ,RK_GENMASK_VAL (2 ,2 ,0 )),/* CAN1 IO mux selection M0 */ -MR_TOPGRF (RK_GPIO4 ,RK_PC3 ,3 ,0x0300 ,RK_GENMASK_VAL (2 ,2 ,1 )),/* CAN1 IO mux selection M1 */ -MR_TOPGRF (RK_GPIO4 ,RK_PB5 ,3 ,0x0300 ,RK_GENMASK_VAL (4 ,4 ,0 )),/* CAN2 IO mux selection M0 */ -MR_TOPGRF (RK_GPIO2 ,RK_PB2 ,4 ,0x0300 ,RK_GENMASK_VAL (4 ,4 ,1 )),/* CAN2 IO mux selection M1 */ -MR_TOPGRF (RK_GPIO4 ,RK_PC4 ,1 ,0x0300 ,RK_GENMASK_VAL (6 ,6 ,0 )),/* EDPDP_HPDIN IO mux selection M0 */ -MR_TOPGRF (RK_GPIO0 ,RK_PC2 ,2 ,0x0300 ,RK_GENMASK_VAL (6 ,6 ,1 )),/* EDPDP_HPDIN IO mux selection M1 */ -MR_TOPGRF (RK_GPIO3 ,RK_PB1 ,3 ,0x0300 ,RK_GENMASK_VAL (8 ,8 ,0 )),/* GMAC1 IO mux selection M0 */ -MR_TOPGRF (RK_GPIO4 ,RK_PA7 ,3 ,0x0300 ,RK_GENMASK_VAL (8 ,8 ,1 )),/* GMAC1 IO mux selection M1 */ -MR_TOPGRF (RK_GPIO4 ,RK_PD1 ,1 ,0x0300 ,RK_GENMASK_VAL (10 ,10 ,0 )),/* HDMITX IO mux selection M0 */ -MR_TOPGRF (RK_GPIO0 ,RK_PC7 ,1 ,0x0300 ,RK_GENMASK_VAL (10 ,10 ,1 )),/* HDMITX IO mux selection M1 */ -MR_TOPGRF (RK_GPIO0 ,RK_PB6 ,1 ,0x0300 ,RK_GENMASK_VAL (14 ,14 ,0 )),/* I2C2 IO mux selection M0 */ -MR_TOPGRF (RK_GPIO4 ,RK_PB4 ,1 ,0x0300 ,RK_GENMASK_VAL (14 ,14 ,1 )),/* I2C2 IO mux selection M1 */ -MR_TOPGRF (RK_GPIO1 ,RK_PA0 ,1 ,0x0304 ,RK_GENMASK_VAL (0 ,0 ,0 )),/* I2C3 IO mux selection M0 */ -MR_TOPGRF (RK_GPIO3 ,RK_PB6 ,4 ,0x0304 ,RK_GENMASK_VAL (0 ,0 ,1 )),/* I2C3 IO mux selection M1 */ -MR_TOPGRF (RK_GPIO4 ,RK_PB2 ,1 ,0x0304 ,RK_GENMASK_VAL (2 ,2 ,0 )),/* I2C4 IO mux selection M0 */ -MR_TOPGRF (RK_GPIO2 ,RK_PB1 ,2 ,0x0304 ,RK_GENMASK_VAL (2 ,2 ,1 )),/* I2C4 IO mux selection M1 */ -MR_TOPGRF (RK_GPIO3 ,RK_PB4 ,4 ,0x0304 ,RK_GENMASK_VAL (4 ,4 ,0 )),/* I2C5 IO mux selection M0 */ -MR_TOPGRF (RK_GPIO4 ,RK_PD0 ,2 ,0x0304 ,RK_GENMASK_VAL (4 ,4 ,1 )),/* I2C5 IO mux selection M1 */ -MR_TOPGRF (RK_GPIO3 ,RK_PB1 ,5 ,0x0304 ,RK_GENMASK_VAL (14 ,14 ,0 )),/* PWM8 IO mux selection M0 */ -MR_TOPGRF (RK_GPIO1 ,RK_PD5 ,4 ,0x0304 ,RK_GENMASK_VAL (14 ,14 ,1 )),/* PWM8 IO mux selection M1 */ -MR_TOPGRF (RK_GPIO3 ,RK_PB2 ,5 ,0x0308 ,RK_GENMASK_VAL (0 ,0 ,0 )),/* PWM9 IO mux selection M0 */ -MR_TOPGRF (RK_GPIO1 ,RK_PD6 ,4 ,0x0308 ,RK_GENMASK_VAL (0 ,0 ,1 )),/* PWM9 IO mux selection M1 */ -MR_TOPGRF (RK_GPIO3 ,RK_PB5 ,5 ,0x0308 ,RK_GENMASK_VAL (2 ,2 ,0 )),/* PWM10 IO mux selection M0 */ -MR_TOPGRF (RK_GPIO2 ,RK_PA1 ,2 ,0x0308 ,RK_GENMASK_VAL (2 ,2 ,1 )),/* PWM10 IO mux selection M1 */ -MR_TOPGRF (RK_GPIO3 ,RK_PB6 ,5 ,0x0308 ,RK_GENMASK_VAL (4 ,4 ,0 )),/* PWM11 IO mux selection M0 */ -MR_TOPGRF (RK_GPIO4 ,RK_PC0 ,3 ,0x0308 ,RK_GENMASK_VAL (4 ,4 ,1 )),/* PWM11 IO mux selection M1 */ -MR_TOPGRF (RK_GPIO3 ,RK_PB7 ,2 ,0x0308 ,RK_GENMASK_VAL (6 ,6 ,0 )),/* PWM12 IO mux selection M0 */ -MR_TOPGRF (RK_GPIO4 ,RK_PC5 ,1 ,0x0308 ,RK_GENMASK_VAL (6 ,6 ,1 )),/* PWM12 IO mux selection M1 */ -MR_TOPGRF (RK_GPIO3 ,RK_PC0 ,2 ,0x0308 ,RK_GENMASK_VAL (8 ,8 ,0 )),/* PWM13 IO mux selection M0 */ -MR_TOPGRF (RK_GPIO4 ,RK_PC6 ,1 ,0x0308 ,RK_GENMASK_VAL (8 ,8 ,1 )),/* PWM13 IO mux selection M1 */ -MR_TOPGRF (RK_GPIO3 ,RK_PC4 ,1 ,0x0308 ,RK_GENMASK_VAL (10 ,10 ,0 )),/* PWM14 IO mux selection M0 */ -MR_TOPGRF (RK_GPIO4 ,RK_PC2 ,1 ,0x0308 ,RK_GENMASK_VAL (10 ,10 ,1 )),/* PWM14 IO mux selection M1 */ -MR_TOPGRF (RK_GPIO3 ,RK_PC5 ,1 ,0x0308 ,RK_GENMASK_VAL (12 ,12 ,0 )),/* PWM15 IO mux selection M0 */ -MR_TOPGRF (RK_GPIO4 ,RK_PC3 ,1 ,0x0308 ,RK_GENMASK_VAL (12 ,12 ,1 )),/* PWM15 IO mux selection M1 */ -MR_TOPGRF (RK_GPIO3 ,RK_PD2 ,3 ,0x0308 ,RK_GENMASK_VAL (14 ,14 ,0 )),/* SDMMC2 IO mux selection M0 */ -MR_TOPGRF (RK_GPIO3 ,RK_PA5 ,5 ,0x0308 ,RK_GENMASK_VAL (14 ,14 ,1 )),/* SDMMC2 IO mux selection M1 */ -MR_TOPGRF (RK_GPIO0 ,RK_PB5 ,2 ,0x030c ,RK_GENMASK_VAL (0 ,0 ,0 )),/* SPI0 IO mux selection M0 */ -MR_TOPGRF (RK_GPIO2 ,RK_PD3 ,3 ,0x030c ,RK_GENMASK_VAL (0 ,0 ,1 )),/* SPI0 IO mux selection M1 */ -MR_TOPGRF (RK_GPIO2 ,RK_PB5 ,3 ,0x030c ,RK_GENMASK_VAL (2 ,2 ,0 )),/* SPI1 IO mux selection M0 */ -MR_TOPGRF (RK_GPIO3 ,RK_PC3 ,3 ,0x030c ,RK_GENMASK_VAL (2 ,2 ,1 )),/* SPI1 IO mux selection M1 */ -MR_TOPGRF (RK_GPIO2 ,RK_PC1 ,4 ,0x030c ,RK_GENMASK_VAL (4 ,4 ,0 )),/* SPI2 IO mux selection M0 */ -MR_TOPGRF (RK_GPIO3 ,RK_PA0 ,3 ,0x030c ,RK_GENMASK_VAL (4 ,4 ,1 )),/* SPI2 IO mux selection M1 */ -MR_TOPGRF (RK_GPIO4 ,RK_PB3 ,4 ,0x030c ,RK_GENMASK_VAL (6 ,6 ,0 )),/* SPI3 IO mux selection M0 */ -MR_TOPGRF (RK_GPIO4 ,RK_PC2 ,2 ,0x030c ,RK_GENMASK_VAL (6 ,6 ,1 )),/* SPI3 IO mux selection M1 */ -MR_TOPGRF (RK_GPIO2 ,RK_PB4 ,2 ,0x030c ,RK_GENMASK_VAL (8 ,8 ,0 )),/* UART1 IO mux selection M0 */ -MR_TOPGRF (RK_GPIO3 ,RK_PD6 ,4 ,0x030c ,RK_GENMASK_VAL (8 ,8 ,1 )),/* UART1 IO mux selection M1 */ -MR_TOPGRF (RK_GPIO0 ,RK_PD1 ,1 ,0x030c ,RK_GENMASK_VAL (10 ,10 ,0 )),/* UART2 IO mux selection M0 */ -MR_TOPGRF (RK_GPIO1 ,RK_PD5 ,2 ,0x030c ,RK_GENMASK_VAL (10 ,10 ,1 )),/* UART2 IO mux selection M1 */ -MR_TOPGRF (RK_GPIO1 ,RK_PA1 ,2 ,0x030c ,RK_GENMASK_VAL (12 ,12 ,0 )),/* UART3 IO mux selection M0 */ -MR_TOPGRF (RK_GPIO3 ,RK_PB7 ,4 ,0x030c ,RK_GENMASK_VAL (12 ,12 ,1 )),/* UART3 IO mux selection M1 */ -MR_TOPGRF (RK_GPIO1 ,RK_PA6 ,2 ,0x030c ,RK_GENMASK_VAL (14 ,14 ,0 )),/* UART4 IO mux selection M0 */ -MR_TOPGRF (RK_GPIO3 ,RK_PB2 ,4 ,0x030c ,RK_GENMASK_VAL (14 ,14 ,1 )),/* UART4 IO mux selection M1 */ -MR_TOPGRF (RK_GPIO2 ,RK_PA2 ,3 ,0x0310 ,RK_GENMASK_VAL (0 ,0 ,0 )),/* UART5 IO mux selection M0 */ -MR_TOPGRF (RK_GPIO3 ,RK_PC2 ,4 ,0x0310 ,RK_GENMASK_VAL (0 ,0 ,1 )),/* UART5 IO mux selection M1 */ -MR_TOPGRF (RK_GPIO2 ,RK_PA4 ,3 ,0x0310 ,RK_GENMASK_VAL (2 ,2 ,0 )),/* UART6 IO mux selection M0 */ -MR_TOPGRF (RK_GPIO1 ,RK_PD5 ,3 ,0x0310 ,RK_GENMASK_VAL (2 ,2 ,1 )),/* UART6 IO mux selection M1 */ -MR_TOPGRF (RK_GPIO2 ,RK_PA6 ,3 ,0x0310 ,RK_GENMASK_VAL (5 ,4 ,0 )),/* UART7 IO mux selection M0 */ -MR_TOPGRF (RK_GPIO3 ,RK_PC4 ,4 ,0x0310 ,RK_GENMASK_VAL (5 ,4 ,1 )),/* UART7 IO mux selection M1 */ -MR_TOPGRF (RK_GPIO4 ,RK_PA2 ,4 ,0x0310 ,RK_GENMASK_VAL (5 ,4 ,2 )),/* UART7 IO mux selection M2 */ -MR_TOPGRF (RK_GPIO2 ,RK_PC5 ,3 ,0x0310 ,RK_GENMASK_VAL (6 ,6 ,0 )),/* UART8 IO mux selection M0 */ -MR_TOPGRF (RK_GPIO2 ,RK_PD7 ,4 ,0x0310 ,RK_GENMASK_VAL (6 ,6 ,1 )),/* UART8 IO mux selection M1 */ -MR_TOPGRF (RK_GPIO2 ,RK_PB0 ,3 ,0x0310 ,RK_GENMASK_VAL (9 ,8 ,0 )),/* UART9 IO mux selection M0 */ -MR_TOPGRF (RK_GPIO4 ,RK_PC5 ,4 ,0x0310 ,RK_GENMASK_VAL (9 ,8 ,1 )),/* UART9 IO mux selection M1 */ -MR_TOPGRF (RK_GPIO4 ,RK_PA4 ,4 ,0x0310 ,RK_GENMASK_VAL (9 ,8 ,2 )),/* UART9 IO mux selection M2 */ -MR_TOPGRF (RK_GPIO1 ,RK_PA2 ,1 ,0x0310 ,RK_GENMASK_VAL (11 ,10 ,0 )),/* I2S1 IO mux selection M0 */ -MR_TOPGRF (RK_GPIO3 ,RK_PC6 ,4 ,0x0310 ,RK_GENMASK_VAL (11 ,10 ,1 )),/* I2S1 IO mux selection M1 */ -MR_TOPGRF (RK_GPIO2 ,RK_PD0 ,5 ,0x0310 ,RK_GENMASK_VAL (11 ,10 ,2 )),/* I2S1 IO mux selection M2 */ -MR_TOPGRF (RK_GPIO2 ,RK_PC1 ,1 ,0x0310 ,RK_GENMASK_VAL (12 ,12 ,0 )),/* I2S2 IO mux selection M0 */ -MR_TOPGRF (RK_GPIO4 ,RK_PB6 ,5 ,0x0310 ,RK_GENMASK_VAL (12 ,12 ,1 )),/* I2S2 IO mux selection M1 */ -MR_TOPGRF (RK_GPIO3 ,RK_PA2 ,4 ,0x0310 ,RK_GENMASK_VAL (14 ,14 ,0 )),/* I2S3 IO mux selection M0 */ -MR_TOPGRF (RK_GPIO4 ,RK_PC2 ,5 ,0x0310 ,RK_GENMASK_VAL (14 ,14 ,1 )),/* I2S3 IO mux selection M1 */ -MR_TOPGRF (RK_GPIO1 ,RK_PA4 ,3 ,0x0314 ,RK_GENMASK_VAL (1 ,0 ,0 )),/* PDM IO mux selection M0 */ -MR_TOPGRF (RK_GPIO1 ,RK_PA6 ,3 ,0x0314 ,RK_GENMASK_VAL (1 ,0 ,0 )),/* PDM IO mux selection M0 */ -MR_TOPGRF (RK_GPIO3 ,RK_PD6 ,5 ,0x0314 ,RK_GENMASK_VAL (1 ,0 ,1 )),/* PDM IO mux selection M1 */ -MR_TOPGRF (RK_GPIO4 ,RK_PA0 ,4 ,0x0314 ,RK_GENMASK_VAL (1 ,0 ,1 )),/* PDM IO mux selection M1 */ -MR_TOPGRF (RK_GPIO3 ,RK_PC4 ,5 ,0x0314 ,RK_GENMASK_VAL (1 ,0 ,2 )),/* PDM IO mux selection M2 */ -MR_TOPGRF (RK_GPIO0 ,RK_PA5 ,3 ,0x0314 ,RK_GENMASK_VAL (3 ,2 ,0 )),/* PCIE20 IO mux selection M0 */ -MR_TOPGRF (RK_GPIO2 ,RK_PD0 ,4 ,0x0314 ,RK_GENMASK_VAL (3 ,2 ,1 )),/* PCIE20 IO mux selection M1 */ -MR_TOPGRF (RK_GPIO1 ,RK_PB0 ,4 ,0x0314 ,RK_GENMASK_VAL (3 ,2 ,2 )),/* PCIE20 IO mux selection M2 */ -MR_TOPGRF (RK_GPIO0 ,RK_PA4 ,3 ,0x0314 ,RK_GENMASK_VAL (5 ,4 ,0 )),/* PCIE30X1 IO mux selection M0 */ -MR_TOPGRF (RK_GPIO2 ,RK_PD2 ,4 ,0x0314 ,RK_GENMASK_VAL (5 ,4 ,1 )),/* PCIE30X1 IO mux selection M1 */ -MR_TOPGRF (RK_GPIO1 ,RK_PA5 ,4 ,0x0314 ,RK_GENMASK_VAL (5 ,4 ,2 )),/* PCIE30X1 IO mux selection M2 */ -MR_TOPGRF (RK_GPIO0 ,RK_PA6 ,2 ,0x0314 ,RK_GENMASK_VAL (7 ,6 ,0 )),/* PCIE30X2 IO mux selection M0 */ -MR_TOPGRF (RK_GPIO2 ,RK_PD4 ,4 ,0x0314 ,RK_GENMASK_VAL (7 ,6 ,1 )),/* PCIE30X2 IO mux selection M1 */ -MR_TOPGRF (RK_GPIO4 ,RK_PC2 ,4 ,0x0314 ,RK_GENMASK_VAL (7 ,6 ,2 )),/* PCIE30X2 IO mux selection M2 */ +MR_PMUGRF (0 ,RK_PB7 ,1 ,0x0110 ,RK_GENMASK_VAL (1 ,0 ,0 )),/* PWM0 IO mux selection M0 */ +MR_PMUGRF (0 ,RK_PC7 ,2 ,0x0110 ,RK_GENMASK_VAL (1 ,0 ,1 )),/* PWM0 IO mux selection M1 */ +MR_PMUGRF (0 ,RK_PC0 ,1 ,0x0110 ,RK_GENMASK_VAL (3 ,2 ,0 )),/* PWM1 IO mux selection M0 */ +MR_PMUGRF (0 ,RK_PB5 ,4 ,0x0110 ,RK_GENMASK_VAL (3 ,2 ,1 )),/* PWM1 IO mux selection M1 */ +MR_PMUGRF (0 ,RK_PC1 ,1 ,0x0110 ,RK_GENMASK_VAL (5 ,4 ,0 )),/* PWM2 IO mux selection M0 */ +MR_PMUGRF (0 ,RK_PB6 ,4 ,0x0110 ,RK_GENMASK_VAL (5 ,4 ,1 )),/* PWM2 IO mux selection M1 */ +MR_TOPGRF (0 ,RK_PB3 ,2 ,0x0300 ,RK_GENMASK_VAL (0 ,0 ,0 )),/* CAN0 IO mux selection M0 */ +MR_TOPGRF (2 ,RK_PA1 ,4 ,0x0300 ,RK_GENMASK_VAL (0 ,0 ,1 )),/* CAN0 IO mux selection M1 */ +MR_TOPGRF (1 ,RK_PA1 ,3 ,0x0300 ,RK_GENMASK_VAL (2 ,2 ,0 )),/* CAN1 IO mux selection M0 */ +MR_TOPGRF (4 ,RK_PC3 ,3 ,0x0300 ,RK_GENMASK_VAL (2 ,2 ,1 )),/* CAN1 IO mux selection M1 */ +MR_TOPGRF (4 ,RK_PB5 ,3 ,0x0300 ,RK_GENMASK_VAL (4 ,4 ,0 )),/* CAN2 IO mux selection M0 */ +MR_TOPGRF (2 ,RK_PB2 ,4 ,0x0300 ,RK_GENMASK_VAL (4 ,4 ,1 )),/* CAN2 IO mux selection M1 */ +MR_TOPGRF (4 ,RK_PC4 ,1 ,0x0300 ,RK_GENMASK_VAL (6 ,6 ,0 )),/* EDPDP_HPDIN IO mux selection M0 */ +MR_TOPGRF (0 ,RK_PC2 ,2 ,0x0300 ,RK_GENMASK_VAL (6 ,6 ,1 )),/* EDPDP_HPDIN IO mux selection M1 */ +MR_TOPGRF (3 ,RK_PB1 ,3 ,0x0300 ,RK_GENMASK_VAL (8 ,8 ,0 )),/* GMAC1 IO mux selection M0 */ +MR_TOPGRF (4 ,RK_PA7 ,3 ,0x0300 ,RK_GENMASK_VAL (8 ,8 ,1 )),/* GMAC1 IO mux selection M1 */ +MR_TOPGRF (4 ,RK_PD1 ,1 ,0x0300 ,RK_GENMASK_VAL (10 ,10 ,0 )),/* HDMITX IO mux selection M0 */ +MR_TOPGRF (0 ,RK_PC7 ,1 ,0x0300 ,RK_GENMASK_VAL (10 ,10 ,1 )),/* HDMITX IO mux selection M1 */ +MR_TOPGRF (0 ,RK_PB6 ,1 ,0x0300 ,RK_GENMASK_VAL (14 ,14 ,0 )),/* I2C2 IO mux selection M0 */ +MR_TOPGRF (4 ,RK_PB4 ,1 ,0x0300 ,RK_GENMASK_VAL (14 ,14 ,1 )),/* I2C2 IO mux selection M1 */ +MR_TOPGRF (1 ,RK_PA0 ,1 ,0x0304 ,RK_GENMASK_VAL (0 ,0 ,0 )),/* I2C3 IO mux selection M0 */ +MR_TOPGRF (3 ,RK_PB6 ,4 ,0x0304 ,RK_GENMASK_VAL (0 ,0 ,1 )),/* I2C3 IO mux selection M1 */ +MR_TOPGRF (4 ,RK_PB2 ,1 ,0x0304 ,RK_GENMASK_VAL (2 ,2 ,0 )),/* I2C4 IO mux selection M0 */ +MR_TOPGRF (2 ,RK_PB1 ,2 ,0x0304 ,RK_GENMASK_VAL (2 ,2 ,1 )),/* I2C4 IO mux selection M1 */ +MR_TOPGRF (3 ,RK_PB4 ,4 ,0x0304 ,RK_GENMASK_VAL (4 ,4 ,0 )),/* I2C5 IO mux selection M0 */ +MR_TOPGRF (4 ,RK_PD0 ,2 ,0x0304 ,RK_GENMASK_VAL (4 ,4 ,1 )),/* I2C5 IO mux selection M1 */ +MR_TOPGRF (3 ,RK_PB1 ,5 ,0x0304 ,RK_GENMASK_VAL (14 ,14 ,0 )),/* PWM8 IO mux selection M0 */ +MR_TOPGRF (1 ,RK_PD5 ,4 ,0x0304 ,RK_GENMASK_VAL (14 ,14 ,1 )),/* PWM8 IO mux selection M1 */ +MR_TOPGRF (3 ,RK_PB2 ,5 ,0x0308 ,RK_GENMASK_VAL (0 ,0 ,0 )),/* PWM9 IO mux selection M0 */ +MR_TOPGRF (1 ,RK_PD6 ,4 ,0x0308 ,RK_GENMASK_VAL (0 ,0 ,1 )),/* PWM9 IO mux selection M1 */ +MR_TOPGRF (3 ,RK_PB5 ,5 ,0x0308 ,RK_GENMASK_VAL (2 ,2 ,0 )),/* PWM10 IO mux selection M0 */ +MR_TOPGRF (2 ,RK_PA1 ,2 ,0x0308 ,RK_GENMASK_VAL (2 ,2 ,1 )),/* PWM10 IO mux selection M1 */ +MR_TOPGRF (3 ,RK_PB6 ,5 ,0x0308 ,RK_GENMASK_VAL (4 ,4 ,0 )),/* PWM11 IO mux selection M0 */ +MR_TOPGRF (4 ,RK_PC0 ,3 ,0x0308 ,RK_GENMASK_VAL (4 ,4 ,1 )),/* PWM11 IO mux selection M1 */ +MR_TOPGRF (3 ,RK_PB7 ,2 ,0x0308 ,RK_GENMASK_VAL (6 ,6 ,0 )),/* PWM12 IO mux selection M0 */ +MR_TOPGRF (4 ,RK_PC5 ,1 ,0x0308 ,RK_GENMASK_VAL (6 ,6 ,1 )),/* PWM12 IO mux selection M1 */ +MR_TOPGRF (3 ,RK_PC0 ,2 ,0x0308 ,RK_GENMASK_VAL (8 ,8 ,0 )),/* PWM13 IO mux selection M0 */ +MR_TOPGRF (4 ,RK_PC6 ,1 ,0x0308 ,RK_GENMASK_VAL (8 ,8 ,1 )),/* PWM13 IO mux selection M1 */ +MR_TOPGRF (3 ,RK_PC4 ,1 ,0x0308 ,RK_GENMASK_VAL (10 ,10 ,0 )),/* PWM14 IO mux selection M0 */ +MR_TOPGRF (4 ,RK_PC2 ,1 ,0x0308 ,RK_GENMASK_VAL (10 ,10 ,1 )),/* PWM14 IO mux selection M1 */ +MR_TOPGRF (3 ,RK_PC5 ,1 ,0x0308 ,RK_GENMASK_VAL (12 ,12 ,0 )),/* PWM15 IO mux selection M0 */ +MR_TOPGRF (4 ,RK_PC3 ,1 ,0x0308 ,RK_GENMASK_VAL (12 ,12 ,1 )),/* PWM15 IO mux selection M1 */ +MR_TOPGRF (3 ,RK_PD2 ,3 ,0x0308 ,RK_GENMASK_VAL (14 ,14 ,0 )),/* SDMMC2 IO mux selection M0 */ +MR_TOPGRF (3 ,RK_PA5 ,5 ,0x0308 ,RK_GENMASK_VAL (14 ,14 ,1 )),/* SDMMC2 IO mux selection M1 */ +MR_TOPGRF (0 ,RK_PB5 ,2 ,0x030c ,RK_GENMASK_VAL (0 ,0 ,0 )),/* SPI0 IO mux selection M0 */ +MR_TOPGRF (2 ,RK_PD3 ,3 ,0x030c ,RK_GENMASK_VAL (0 ,0 ,1 )),/* SPI0 IO mux selection M1 */ +MR_TOPGRF (2 ,RK_PB5 ,3 ,0x030c ,RK_GENMASK_VAL (2 ,2 ,0 )),/* SPI1 IO mux selection M0 */ +MR_TOPGRF (3 ,RK_PC3 ,3 ,0x030c ,RK_GENMASK_VAL (2 ,2 ,1 )),/* SPI1 IO mux selection M1 */ +MR_TOPGRF (2 ,RK_PC1 ,4 ,0x030c ,RK_GENMASK_VAL (4 ,4 ,0 )),/* SPI2 IO mux selection M0 */ +MR_TOPGRF (3 ,RK_PA0 ,3 ,0x030c ,RK_GENMASK_VAL (4 ,4 ,1 )),/* SPI2 IO mux selection M1 */ +MR_TOPGRF (4 ,RK_PB3 ,4 ,0x030c ,RK_GENMASK_VAL (6 ,6 ,0 )),/* SPI3 IO mux selection M0 */ +MR_TOPGRF (4 ,RK_PC2 ,2 ,0x030c ,RK_GENMASK_VAL (6 ,6 ,1 )),/* SPI3 IO mux selection M1 */ +MR_TOPGRF (2 ,RK_PB4 ,2 ,0x030c ,RK_GENMASK_VAL (8 ,8 ,0 )),/* UART1 IO mux selection M0 */ +MR_TOPGRF (3 ,RK_PD6 ,4 ,0x030c ,RK_GENMASK_VAL (8 ,8 ,1 )),/* UART1 IO mux selection M1 */ +MR_TOPGRF (0 ,RK_PD1 ,1 ,0x030c ,RK_GENMASK_VAL (10 ,10 ,0 )),/* UART2 IO mux selection M0 */ +MR_TOPGRF (1 ,RK_PD5 ,2 ,0x030c ,RK_GENMASK_VAL (10 ,10 ,1 )),/* UART2 IO mux selection M1 */ +MR_TOPGRF (1 ,RK_PA1 ,2 ,0x030c ,RK_GENMASK_VAL (12 ,12 ,0 )),/* UART3 IO mux selection M0 */ +MR_TOPGRF (3 ,RK_PB7 ,4 ,0x030c ,RK_GENMASK_VAL (12 ,12 ,1 )),/* UART3 IO mux selection M1 */ +MR_TOPGRF (1 ,RK_PA6 ,2 ,0x030c ,RK_GENMASK_VAL (14 ,14 ,0 )),/* UART4 IO mux selection M0 */ +MR_TOPGRF (3 ,RK_PB2 ,4 ,0x030c ,RK_GENMASK_VAL (14 ,14 ,1 )),/* UART4 IO mux selection M1 */ +MR_TOPGRF (2 ,RK_PA2 ,3 ,0x0310 ,RK_GENMASK_VAL (0 ,0 ,0 )),/* UART5 IO mux selection M0 */ +MR_TOPGRF (3 ,RK_PC2 ,4 ,0x0310 ,RK_GENMASK_VAL (0 ,0 ,1 )),/* UART5 IO mux selection M1 */ +MR_TOPGRF (2 ,RK_PA4 ,3 ,0x0310 ,RK_GENMASK_VAL (2 ,2 ,0 )),/* UART6 IO mux selection M0 */ +MR_TOPGRF (1 ,RK_PD5 ,3 ,0x0310 ,RK_GENMASK_VAL (2 ,2 ,1 )),/* UART6 IO mux selection M1 */ +MR_TOPGRF (2 ,RK_PA6 ,3 ,0x0310 ,RK_GENMASK_VAL (5 ,4 ,0 )),/* UART7 IO mux selection M0 */ +MR_TOPGRF (3 ,RK_PC4 ,4 ,0x0310 ,RK_GENMASK_VAL (5 ,4 ,1 )),/* UART7 IO mux selection M1 */ +MR_TOPGRF (4 ,RK_PA2 ,4 ,0x0310 ,RK_GENMASK_VAL (5 ,4 ,2 )),/* UART7 IO mux selection M2 */ +MR_TOPGRF (2 ,RK_PC5 ,3 ,0x0310 ,RK_GENMASK_VAL (6 ,6 ,0 )),/* UART8 IO mux selection M0 */ +MR_TOPGRF (2 ,RK_PD7 ,4 ,0x0310 ,RK_GENMASK_VAL (6 ,6 ,1 )),/* UART8 IO mux selection M1 */ +MR_TOPGRF (2 ,RK_PB0 ,3 ,0x0310 ,RK_GENMASK_VAL (9 ,8 ,0 )),/* UART9 IO mux selection M0 */ +MR_TOPGRF (4 ,RK_PC5 ,4 ,0x0310 ,RK_GENMASK_VAL (9 ,8 ,1 )),/* UART9 IO mux selection M1 */ +MR_TOPGRF (4 ,RK_PA4 ,4 ,0x0310 ,RK_GENMASK_VAL (9 ,8 ,2 )),/* UART9 IO mux selection M2 */ +MR_TOPGRF (1 ,RK_PA2 ,1 ,0x0310 ,RK_GENMASK_VAL (11 ,10 ,0 )),/* I2S1 IO mux selection M0 */ +MR_TOPGRF (3 ,RK_PC6 ,4 ,0x0310 ,RK_GENMASK_VAL (11 ,10 ,1 )),/* I2S1 IO mux selection M1 */ +MR_TOPGRF (2 ,RK_PD0 ,5 ,0x0310 ,RK_GENMASK_VAL (11 ,10 ,2 )),/* I2S1 IO mux selection M2 */ +MR_TOPGRF (2 ,RK_PC1 ,1 ,0x0310 ,RK_GENMASK_VAL (12 ,12 ,0 )),/* I2S2 IO mux selection M0 */ +MR_TOPGRF (4 ,RK_PB6 ,5 ,0x0310 ,RK_GENMASK_VAL (12 ,12 ,1 )),/* I2S2 IO mux selection M1 */ +MR_TOPGRF (3 ,RK_PA2 ,4 ,0x0310 ,RK_GENMASK_VAL (14 ,14 ,0 )),/* I2S3 IO mux selection M0 */ +MR_TOPGRF (4 ,RK_PC2 ,5 ,0x0310 ,RK_GENMASK_VAL (14 ,14 ,1 )),/* I2S3 IO mux selection M1 */ +MR_TOPGRF (1 ,RK_PA4 ,3 ,0x0314 ,RK_GENMASK_VAL (1 ,0 ,0 )),/* PDM IO mux selection M0 */ +MR_TOPGRF (1 ,RK_PA6 ,3 ,0x0314 ,RK_GENMASK_VAL (1 ,0 ,0 )),/* PDM IO mux selection M0 */ +MR_TOPGRF (3 ,RK_PD6 ,5 ,0x0314 ,RK_GENMASK_VAL (1 ,0 ,1 )),/* PDM IO mux selection M1 */ +MR_TOPGRF (4 ,RK_PA0 ,4 ,0x0314 ,RK_GENMASK_VAL (1 ,0 ,1 )),/* PDM IO mux selection M1 */ +MR_TOPGRF (3 ,RK_PC4 ,5 ,0x0314 ,RK_GENMASK_VAL (1 ,0 ,2 )),/* PDM IO mux selection M2 */ +MR_TOPGRF (0 ,RK_PA5 ,3 ,0x0314 ,RK_GENMASK_VAL (3 ,2 ,0 )),/* PCIE20 IO mux selection M0 */ +MR_TOPGRF (2 ,RK_PD0 ,4 ,0x0314 ,RK_GENMASK_VAL (3 ,2 ,1 )),/* PCIE20 IO mux selection M1 */ +MR_TOPGRF (1 ,RK_PB0 ,4 ,0x0314 ,RK_GENMASK_VAL (3 ,2 ,2 )),/* PCIE20 IO mux selection M2 */ +MR_TOPGRF (0 ,RK_PA4 ,3 ,0x0314 ,RK_GENMASK_VAL (5 ,4 ,0 )),/* PCIE30X1 IO mux selection M0 */ +MR_TOPGRF (2 ,RK_PD2 ,4 ,0x0314 ,RK_GENMASK_VAL (5 ,4 ,1 )),/* PCIE30X1 IO mux selection M1 */ +MR_TOPGRF (1 ,RK_PA5 ,4 ,0x0314 ,RK_GENMASK_VAL (5 ,4 ,2 )),/* PCIE30X1 IO mux selection M2 */ +MR_TOPGRF (0 ,RK_PA6 ,2 ,0x0314 ,RK_GENMASK_VAL (7 ,6 ,0 )),/* PCIE30X2 IO mux selection M0 */ +MR_TOPGRF (2 ,RK_PD4 ,4 ,0x0314 ,RK_GENMASK_VAL (7 ,6 ,1 )),/* PCIE30X2 IO mux selection M1 */ +MR_TOPGRF (4 ,RK_PC2 ,4 ,0x0314 ,RK_GENMASK_VAL (7 ,6 ,2 )),/* PCIE30X2 IO mux selection M2 */ };static int rk3568_set_mux (struct rockchip_pin_bank *bank,int pin,int mux)
drivers/pinctrl/rockchip/pinctrl-rv1126.c +67 -67
168 lines not on this page · raw message
include/dt-bindings/pinctrl/rockchip.h +0 -7
@@ -9,13 +9,6 @@#ifndef __DT_BINDINGS_ROCKCHIP_PINCTRL_H__#define __DT_BINDINGS_ROCKCHIP_PINCTRL_H__ -#define RK_GPIO0 0 -#define RK_GPIO1 1 -#define RK_GPIO2 2 -#define RK_GPIO3 3 -#define RK_GPIO4 4 -#define RK_GPIO6 6 -#define RK_PA0 0#define RK_PA1 1#define RK_PA2 2
--
2.39.5
Re: [PATCH v1 2/3] rockchip: pinctrl: replace RK_GPIOn defines
Hi Johan,
Quoted 3 lines · Johan Jonker
The use of
RK_GPIOndefines is deprecated in the upstreamrockchip.hfile. Replace all them by the gpio number.
Thanks!
Quentin
PATCH 3/3 rockchip: pinctrl: use include from dts/upstream
In reply to Johan JonkerUse Rockchip pinctrl include from dts/upstream and remove what is now redundant.
--- include/dt-bindings/pinctrl/rockchip.h | 47 -------------------------- 1 file changed, 47 deletions(-) delete mode 100644 include/dt-bindings/pinctrl/rockchip.h
include/dt-bindings/pinctrl/rockchip.h deleted +0 -47
@@ -1,47 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* -* Header providing constants for Rockchip pinctrl bindings. -* -* Copyright (c) 2013 MundoReader S.L. -* Author: Heiko Stuebner <[email protected]> -*/ - -#ifndef __DT_BINDINGS_ROCKCHIP_PINCTRL_H__ -#define __DT_BINDINGS_ROCKCHIP_PINCTRL_H__ - -#define RK_PA0 0 -#define RK_PA1 1 -#define RK_PA2 2 -#define RK_PA3 3 -#define RK_PA4 4 -#define RK_PA5 5 -#define RK_PA6 6 -#define RK_PA7 7 -#define RK_PB0 8 -#define RK_PB1 9 -#define RK_PB2 10 -#define RK_PB3 11 -#define RK_PB4 12 -#define RK_PB5 13 -#define RK_PB6 14 -#define RK_PB7 15 -#define RK_PC0 16 -#define RK_PC1 17 -#define RK_PC2 18 -#define RK_PC3 19 -#define RK_PC4 20 -#define RK_PC5 21 -#define RK_PC6 22 -#define RK_PC7 23 -#define RK_PD0 24 -#define RK_PD1 25 -#define RK_PD2 26 -#define RK_PD3 27 -#define RK_PD4 28 -#define RK_PD5 29 -#define RK_PD6 30 -#define RK_PD7 31 - -#define RK_FUNC_GPIO 0 - -#endif
--
2.39.5
Hi Johan,
Quoted 3 lines · Johan Jonker
Use Rockchip pinctrl include from dts/upstream and remove what is now redundant.
Thanks for the cleanup!
Quentin