Add common pinctrl driver support for rockchip
Subsystems (4)
v2 cover Add common pinctrl driver support for rockchip
The common pinctrl driver for rockchip Socs, it depends the PINCTRL_FULL config. If use it, the default pinctrl setup from DTS could be configured at device probe.
Changes in v2:
- Remove px30, rk2928, rk3066*.
- Split it to multiple files for the relevant per-SoC data structures.
David Wu (9):
rockchip: rk3399-evb: defconfig: Enable FDT for new pinctrl driver
ARM: rockchip: rk3188: Remove the pinctrl setup and enable uart at SPL
ARM: rockchip: Kconfig: Remove the SPL_PINCTRL for rk3188
ARM: rockchip: Remove the pinctrl request at rk3288-board-spl
rk3288: chrome: defconfig: Enable FDT for new pinctrl driver
pinctrl: rockchip: Add common rockchip pinctrl driver
rockchip: defconfig: Clean the unused pinctrl config
pinctrl: rockchip: Clean the unused rockchip pinctrl drivers
ARM: dts: rk322x: Correct the uart2 default pin configuration
arch/arm/dts/rk322x.dtsi | 11 +- arch/arm/mach-rockchip/Kconfig | 1 - arch/arm/mach-rockchip/rk3188-board-spl.c | 41 +- arch/arm/mach-rockchip/rk3288-board-spl.c | 79 -- configs/chromebit_mickey_defconfig | 4 - configs/chromebook_jerry_defconfig | 4 - configs/chromebook_minnie_defconfig | 4 - configs/evb-px5_defconfig | 1 - configs/evb-rk3128_defconfig | 1 - configs/evb-rk3229_defconfig | 1 - configs/evb-rk3288_defconfig | 2 - configs/evb-rk3399_defconfig | 2 - configs/evb-rv1108_defconfig | 1 - configs/fennec-rk3288_defconfig | 2 - configs/firefly-rk3288_defconfig | 2 - configs/firefly-rk3399_defconfig | 1 - configs/geekbox_defconfig | 1 - configs/kylin-rk3036_defconfig | 1 - configs/lion-rk3368_defconfig | 1 - configs/miqi-rk3288_defconfig | 2 - configs/phycore-rk3288_defconfig | 2 - configs/popmetal-rk3288_defconfig | 2 - configs/puma-rk3399_defconfig | 1 - configs/rock2_defconfig | 2 - configs/rock_defconfig | 1 - configs/sandbox_defconfig | 2 - configs/sandbox_flattree_defconfig | 2 - configs/sandbox_noblk_defconfig | 2 - configs/sheep-rk3368_defconfig | 1 - configs/tinker-rk3288_defconfig | 2 - configs/vyasa-rk3288_defconfig | 2 - drivers/pinctrl/Kconfig | 91 +- drivers/pinctrl/Makefile | 2 +- drivers/pinctrl/rockchip/Kconfig | 17 + drivers/pinctrl/rockchip/Makefile | 19 +- drivers/pinctrl/rockchip/pinctrl-rk3036.c | 65 ++ drivers/pinctrl/rockchip/pinctrl-rk3128.c | 155 +++ drivers/pinctrl/rockchip/pinctrl-rk3188.c | 82 ++ drivers/pinctrl/rockchip/pinctrl-rk322x.c | 215 ++++ drivers/pinctrl/rockchip/pinctrl-rk3288.c | 157 +++ drivers/pinctrl/rockchip/pinctrl-rk3328.c | 227 ++++ drivers/pinctrl/rockchip/pinctrl-rk3368.c | 116 ++ drivers/pinctrl/rockchip/pinctrl-rk3399.c | 193 ++++ .../pinctrl/rockchip/pinctrl-rockchip-core.c | 788 ++++++++++++++ drivers/pinctrl/rockchip/pinctrl-rockchip.h | 302 ++++++ drivers/pinctrl/rockchip/pinctrl-rv1108.c | 203 ++++ drivers/pinctrl/rockchip/pinctrl_rk3036.c | 671 ------------ drivers/pinctrl/rockchip/pinctrl_rk3128.c | 186 ---- drivers/pinctrl/rockchip/pinctrl_rk3188.c | 989 ------------------ drivers/pinctrl/rockchip/pinctrl_rk322x.c | 894 ---------------- drivers/pinctrl/rockchip/pinctrl_rk3288.c | 869 --------------- drivers/pinctrl/rockchip/pinctrl_rk3328.c | 705 ------------- drivers/pinctrl/rockchip/pinctrl_rk3368.c | 739 ------------- drivers/pinctrl/rockchip/pinctrl_rk3399.c | 503 --------- drivers/pinctrl/rockchip/pinctrl_rv1108.c | 580 ---------- 55 files changed, 2543 insertions(+), 6406 deletions(-) create mode 100644 drivers/pinctrl/rockchip/Kconfig create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3036.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3128.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3188.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk322x.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3288.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3328.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3368.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3399.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rockchip-core.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rockchip.h create mode 100644 drivers/pinctrl/rockchip/pinctrl-rv1108.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3036.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3128.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3188.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk322x.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3288.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3328.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3368.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3399.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rv1108.c
Signature · 1 line
2.19.1
PATCH v2 1/9 rockchip: rk3399-evb: defconfig: Enable FDT for new pinctrl driver
The FDT is requested for new pinctrl driver, disable SPL_OF_PLATDATA to make FDT be built in.
---
Changes in v2: None
configs/evb-rk3399_defconfig | 1 - 1 file changed, 1 deletion(-)
configs/evb-rk3399_defconfig +0 -1
@@ -31,7 +31,6 @@ CONFIG_CMD_TIME=y CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="rk3399-evb" CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" -CONFIG_SPL_OF_PLATDATA=y CONFIG_ENV_IS_IN_MMC=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_REGMAP=y
Signature · 1 line
2.19.1
PATCH v2 1/9 rockchip: rk3399-evb: defconfig: Enable FDT for new pinctrl driver
Quoted 11 lines · David Wu
The FDT is requested for new pinctrl driver, disable
SPL_OF_PLATDATAto make FDT be built in.Signed-off-by David Wu <[email protected]>---
Changes in v2: None
configs/evb-rk3399_defconfig | 1 - 1 file changed, 1 deletion(-)
Tested on chromebook_bob:
PATCH v2 1/9 rockchip: rk3399-evb: defconfig: Enable FDT for new pinctrl driver
In reply to David WuQuoted 4 lines · David Wu
The FDT is requested for new pinctrl driver, disable
SPL_OF_PLATDATAto make FDT be built in.Signed-off-by David Wu <[email protected]>
Thanks,
- Kever
Quoted 19 lines
---
Changes in v2: None
configs/evb-rk3399_defconfig | 1 - 1 file changed, 1 deletion(-)configs/evb-rk3399_defconfig +0
-1@@ -31,7 +31,6 @@ CONFIG_CMD_TIME=y CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="rk3399-evb" CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" -CONFIG_SPL_OF_PLATDATA=y CONFIG_ENV_IS_IN_MMC=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_REGMAP=y
PATCH v2 1/9 rockchip: rk3399-evb: defconfig: Enable FDT for new pinctrl driver
In reply to David WuQuoted 7 lines
The FDT is requested for new pinctrl driver, disable
SPL_OF_PLATDATAto make FDT be built in.Signed-off-by David Wu <[email protected]>Reviewed-by Simon Glass <[email protected]>Tested-by Simon Glass <[email protected]>Reviewed-by Kever Yang <[email protected]>
Quoted 7 lines
---
Changes in v2: None
configs/evb-rk3399_defconfig | 1 - 1 file changed, 1 deletion(-)
PATCH v2 1/9 rockchip: rk3399-evb: defconfig: Enable FDT for new pinctrl driver
In reply to David WuQuoted 7 lines
The FDT is requested for new pinctrl driver, disable
SPL_OF_PLATDATAto make FDT be built in.Signed-off-by David Wu <[email protected]>Reviewed-by Simon Glass <[email protected]>Tested-by Simon Glass <[email protected]>Reviewed-by Kever Yang <[email protected]>
Quoted 7 lines
---
Changes in v2: None
configs/evb-rk3399_defconfig | 1 - 1 file changed, 1 deletion(-)
Applied to u-boot-rockchip, thanks!
PATCH v2 2/9 ARM: rockchip: rk3188: Remove the pinctrl setup and enable uart at SPL
In reply to David WuWhen the boot ROM sets up MMC we don't need to do it again. Remove the MMC setup code entirely, but we also need to enable uart for debug message.
---
Changes in v2: None
arch/arm/mach-rockchip/rk3188-board-spl.c | 41 ++--------------------- 1 file changed, 2 insertions(+), 39 deletions(-)
arch/arm/mach-rockchip/rk3188-board-spl.c +2 -39
@@ -120,7 +120,7 @@ void board_debug_uart_init(void)void board_init_f (ulong dummy) { -struct udevice *pinctrl, *dev; +struct udevice *dev;int ret;#define EARLY_UART
@@ -134,10 +134,7 @@ void board_init_f(ulong dummy)* printascii("string"); */ debug_uart_init (); -printch ('s' ); -printch ('p' ); -printch ('l' ); -printch ('\n' ); +printascii ("U-Boot SPL board init" );#endif #ifdef CONFIG_ROCKCHIP_USB_UART
@@ -171,12 +168,6 @@ void board_init_f(ulong dummy)return ; } - ret =uclass_get_device (UCLASS_PINCTRL ,0 , &pinctrl); -if (ret) { -debug ("Pinctrl init failed: %d\n" , ret); -return ; - } - ret =uclass_get_device (UCLASS_RAM ,0 , &dev);if (ret) {debug ("DRAM init failed: %d\n" , ret);
@@ -214,7 +205,6 @@ static int setup_led(void)void spl_board_init (void ) { -struct udevice *pinctrl;int ret; ret =setup_led ();
@@ -223,36 +213,9 @@ void spl_board_init(void)hang (); } - ret =uclass_get_device (UCLASS_PINCTRL ,0 , &pinctrl); -if (ret) { -debug ("%s: Cannot find pinctrl device\n" , __func__); - goto err; - } - -#ifdef CONFIG_SPL_MMC_SUPPORT - ret =pinctrl_request_noflags (pinctrl,PERIPH_ID_SDCARD ); -if (ret) { -debug ("%s: Failed to set up SD card\n" , __func__); - goto err; - } -#endif - -/* Enable debug UART */ - ret =pinctrl_request_noflags (pinctrl,PERIPH_ID_UART_DBG ); -if (ret) { -debug ("%s: Failed to set up console UART\n" , __func__); - goto err; - } -preloader_console_init ();#if CONFIG_IS_ENABLED (ROCKCHIP_BACK_TO_BROM )back_to_bootrom (BROM_BOOT_NEXTSTAGE );#endif return ; - -err: -printf ("spl_board_init: Error %d\n" , ret); - -/* No way to report error here */ -hang (); }
Signature · 1 line
2.19.1
Heiko Stuebner
maintainerPATCH v2 2/9 ARM: rockchip: rk3188: Remove the pinctrl setup and enable uart at SPL
Hi David,
Am Mittwoch, 2. Januar 2019, 13:50:58 CET schrieb David Wu:
Quoted 25 lines
When the boot ROM sets up MMC we don't need to do it again. Remove the MMC setup code entirely, but we also need to enable uart for debug message.
Signed-off-by David Wu <[email protected]>---
Changes in v2: None
arch/arm/mach-rockchip/rk3188-board-spl.c | 41 ++--------------------- 1 file changed, 2 insertions(+), 39 deletions(-)arch/arm/mach-rockchip/rk3188-board-spl.c +1
-1@@ -120,7 +120,7 @@ void board_debug_uart_init(void)void board_init_f (ulong dummy) { -struct udevice *pinctrl, *dev; +struct udevice *dev;int ret;#define EARLY_UART
arch/arm/mach-rockchip/rk3188-board-spl.c void board_init_f(ulong dummy) · line 137
Quoted 8 lines
arch/arm/mach-rockchip/rk3188-board-spl.c +1
-4@@ -134,10 +134,7 @@ void board_init_f(ulong dummy)* printascii("string"); */ debug_uart_init (); -printch ('s' ); -printch ('p' ); -printch ('l' ); -printch ('\n' ); +printascii ("U-Boot SPL board init" );
Did you test this change?
I remember rk3188 having issues (aka hanging) when trying to print strings through the debug uart and only printch working at all. (Timer issue or so?) ... Not sure if this got fixed in the meantime?
Quoted 39 lines
arch/arm/mach-rockchip/rk3188-board-spl.c +0
-18#endif #ifdef CONFIG_ROCKCHIP_USB_UART @@ -171,12 +168,6 @@ void board_init_f(ulong dummy)return ; } - ret =uclass_get_device (UCLASS_PINCTRL ,0 , &pinctrl); -if (ret) { -debug ("Pinctrl init failed: %d\n" , ret); -return ; - } - ret =uclass_get_device (UCLASS_RAM ,0 , &dev);if (ret) {debug ("DRAM init failed: %d\n" , ret);@@ -214,7 +205,6 @@ static int setup_led(void)void spl_board_init (void ) { -struct udevice *pinctrl;int ret; ret =setup_led ();@@ -223,36 +213,9 @@ void spl_board_init(void)hang (); } - ret =uclass_get_device (UCLASS_PINCTRL ,0 , &pinctrl); -if (ret) { -debug ("%s: Cannot find pinctrl device\n" , __func__); - goto err; - } - -#ifdef CONFIG_SPL_MMC_SUPPORT - ret =pinctrl_request_noflags (pinctrl,PERIPH_ID_SDCARD ); -if (ret) { -debug ("%s: Failed to set up SD card\n" , __func__); - goto err;
arch/arm/mach-rockchip/rk3188-board-spl.c void spl_board_init(void) · line 246
Quoted 10 lines
arch/arm/mach-rockchip/rk3188-board-spl.c +0
-10- } -#endif - -/* Enable debug UART */ - ret =pinctrl_request_noflags (pinctrl,PERIPH_ID_UART_DBG ); -if (ret) { -debug ("%s: Failed to set up console UART\n" , __func__); - goto err; - } -
Hmm, I see that you're removing the uarts setup in the spl-stage, but where do you expect it to get setup now, in the case that only the regular uart but no debug uart gets setup in spl?
Thanks
Heiko
Heiko Stuebner
maintainerPATCH v2 2/9 ARM: rockchip: rk3188: Remove the pinctrl setup and enable uart at SPL
Am Samstag, 5. Januar 2019, 18:17:34 CET schrieb Heiko Stuebner:
Quoted 87 lines
Hi David,
Am Mittwoch, 2. Januar 2019, 13:50:58 CET schrieb David Wu:
Quoted 25 lines
When the boot ROM sets up MMC we don't need to do it again. Remove the MMC setup code entirely, but we also need to enable uart for debug message.
Signed-off-by David Wu <[email protected]>---
Changes in v2: None
arch/arm/mach-rockchip/rk3188-board-spl.c | 41 ++--------------------- 1 file changed, 2 insertions(+), 39 deletions(-)arch/arm/mach-rockchip/rk3188-board-spl.c +1
-1@@ -120,7 +120,7 @@ void board_debug_uart_init(void)void board_init_f (ulong dummy) { -struct udevice *pinctrl, *dev; +struct udevice *dev;int ret;#define EARLY_UART arch/arm/mach-rockchip/rk3188-board-spl.c void board_init_f(ulong dummy) · line 137
Quoted 8 lines
arch/arm/mach-rockchip/rk3188-board-spl.c +1
-4@@ -134,10 +134,7 @@ void board_init_f(ulong dummy)* printascii("string"); */ debug_uart_init (); -printch ('s' ); -printch ('p' ); -printch ('l' ); -printch ('\n' ); +printascii ("U-Boot SPL board init" );Did you test this change?
I remember rk3188 having issues (aka hanging) when trying to print strings through the debug uart and only printch working at all. (Timer issue or so?) ... Not sure if this got fixed in the meantime?Quoted 45 lines
arch/arm/mach-rockchip/rk3188-board-spl.c +0
-24#endif #ifdef CONFIG_ROCKCHIP_USB_UART @@ -171,12 +168,6 @@ void board_init_f(ulong dummy)return ; } - ret =uclass_get_device (UCLASS_PINCTRL ,0 , &pinctrl); -if (ret) { -debug ("Pinctrl init failed: %d\n" , ret); -return ; - } - ret =uclass_get_device (UCLASS_RAM ,0 , &dev);if (ret) {debug ("DRAM init failed: %d\n" , ret);@@ -214,7 +205,6 @@ static int setup_led(void)void spl_board_init (void ) { -struct udevice *pinctrl;int ret; ret =setup_led ();@@ -223,36 +213,9 @@ void spl_board_init(void)hang (); } - ret =uclass_get_device (UCLASS_PINCTRL ,0 , &pinctrl); -if (ret) { -debug ("%s: Cannot find pinctrl device\n" , __func__); - goto err; - } - -#ifdef CONFIG_SPL_MMC_SUPPORT - ret =pinctrl_request_noflags (pinctrl,PERIPH_ID_SDCARD ); -if (ret) { -debug ("%s: Failed to set up SD card\n" , __func__); - goto err; - } -#endif - -/* Enable debug UART */ - ret =pinctrl_request_noflags (pinctrl,PERIPH_ID_UART_DBG ); -if (ret) {
Quoted 8 lines
arch/arm/mach-rockchip/rk3188-board-spl.c void spl_board_init(void) · line 246
Quoted 4 lines
arch/arm/mach-rockchip/rk3188-board-spl.c +0
-4-debug ("%s: Failed to set up console UART\n" , __func__); - goto err; - } -Hmm, I see that you're removing the uarts setup in the spl-stage, but where do you expect it to get setup now, in the case that only the regular uart but no debug uart gets setup in spl?
Ah, looking at the following patch, I guess you expect the new pinctrl driver to set this up, right? The this looks good.
Heiko
PATCH v2 2/9 ARM: rockchip: rk3188: Remove the pinctrl setup and enable uart at SPL
Heiko,
Quoted 41 lines · Heiko Stuebner
Am Samstag, 5. Januar 2019, 18:17:34 CET schrieb Heiko Stuebner:
Quoted 40 lines
Hi David,
Am Mittwoch, 2. Januar 2019, 13:50:58 CET schrieb David Wu:
Quoted 25 lines
When the boot ROM sets up MMC we don't need to do it again. Remove the MMC setup code entirely, but we also need to enable uart for debug message.
Signed-off-by David Wu <[email protected]>---
Changes in v2: None
arch/arm/mach-rockchip/rk3188-board-spl.c | 41 ++--------------------- 1 file changed, 2 insertions(+), 39 deletions(-)arch/arm/mach-rockchip/rk3188-board-spl.c +1
-1@@ -120,7 +120,7 @@ void board_debug_uart_init(void)void board_init_f (ulong dummy) { -struct udevice *pinctrl, *dev; +struct udevice *dev;int ret;#define EARLY_UART arch/arm/mach-rockchip/rk3188-board-spl.c void board_init_f(ulong dummy) · line 137
Quoted 8 lines
arch/arm/mach-rockchip/rk3188-board-spl.c +1
-4@@ -134,10 +134,7 @@ void board_init_f(ulong dummy)* printascii("string"); */ debug_uart_init (); -printch ('s' ); -printch ('p' ); -printch ('l' ); -printch ('\n' ); +printascii ("U-Boot SPL board init" );Did you test this change?
I remember rk3188 having issues (aka hanging) when trying to print strings through the debug uart and only printch working at all. (Timer issue or so?) ... Not sure if this got fixed in the meantime?
When did you met this issue? I don't think printascii could not work and I never met this kind of issue. here is the difference between the two API:
136 void printch(int ch)
\
137 {
\
138 _printch(ch);
\
139 }
\
140
\
141 void printascii(const char *str)
\
142 {
\
143 while (*str)
\
144 _printch(*str++);
\
145 }
\
146 \
Thanks,
- Kever
Quoted 63 lines
Quoted 45 lines
Quoted 45 lines
arch/arm/mach-rockchip/rk3188-board-spl.c +0
-23#endif #ifdef CONFIG_ROCKCHIP_USB_UART @@ -171,12 +168,6 @@ void board_init_f(ulong dummy)return ; } - ret =uclass_get_device (UCLASS_PINCTRL ,0 , &pinctrl); -if (ret) { -debug ("Pinctrl init failed: %d\n" , ret); -return ; - } - ret =uclass_get_device (UCLASS_RAM ,0 , &dev);if (ret) {debug ("DRAM init failed: %d\n" , ret);@@ -214,7 +205,6 @@ static int setup_led(void)void spl_board_init (void ) { -struct udevice *pinctrl;int ret; ret =setup_led ();@@ -223,36 +213,9 @@ void spl_board_init(void)hang (); } - ret =uclass_get_device (UCLASS_PINCTRL ,0 , &pinctrl); -if (ret) { -debug ("%s: Cannot find pinctrl device\n" , __func__); - goto err; - } - -#ifdef CONFIG_SPL_MMC_SUPPORT - ret =pinctrl_request_noflags (pinctrl,PERIPH_ID_SDCARD ); -if (ret) { -debug ("%s: Failed to set up SD card\n" , __func__); - goto err; - } -#endif - -/* Enable debug UART */ - ret =pinctrl_request_noflags (pinctrl,PERIPH_ID_UART_DBG );Quoted 8 lines
arch/arm/mach-rockchip/rk3188-board-spl.c void spl_board_init(void) · line 246
Quoted 5 lines
arch/arm/mach-rockchip/rk3188-board-spl.c +0
-5-if (ret) { -debug ("%s: Failed to set up console UART\n" , __func__); - goto err; - } -Hmm, I see that you're removing the uarts setup in the spl-stage, but where do you expect it to get setup now, in the case that only the regular uart but no debug uart gets setup in spl?
Ah, looking at the following patch, I guess you expect the new pinctrl driver to set this up, right? The this looks good.
Heiko
PATCH v2 2/9 ARM: rockchip: rk3188: Remove the pinctrl setup and enable uart at SPL
In reply to Heiko StuebnerHi Heiko,
Quoted 12 lines · Heiko Stuebner
Quoted 12 lines
arch/arm/mach-rockchip/rk3188-board-spl.c +1
-1@@ -120,7 +120,7 @@ void board_debug_uart_init(void)void board_init_f (ulong dummy) { -struct udevice *pinctrl, *dev; +struct udevice *dev;int ret;
Quoted 15 lines
arch/arm/mach-rockchip/rk3188-board-spl.c void board_init_f(ulong dummy) · line 137
Quoted 10 lines
arch/arm/mach-rockchip/rk3188-board-spl.c +1
-4#define EARLY_UART @@ -134,10 +134,7 @@ void board_init_f(ulong dummy)* printascii("string"); */ debug_uart_init (); -printch ('s' ); -printch ('p' ); -printch ('l' ); -printch ('\n' ); +printascii ("U-Boot SPL board init" );Did you test this change?
I remember rk3188 having issues (aka hanging) when trying to print strings through the debug uart and only printch working at all. (Timer issue or so?) ... Not sure if this got fixed in the meantime?
I don't know there was a issue, but i test it on the Radxa board today, it looks okay.
U-Boot SPL board init
U-Boot SPL 2019.01-rc1-00009-gdd7b9156fe (Jan 14 2019 - 19:53:50 +0800) Returning to boot ROM...
U-Boot 2019.01-rc1-00009-gdd7b9156fe (Jan 14 2019 - 19:53:50 +0800)
Model: Radxa Rock DRAM: 2 GiB MMC: dwmmc at 10214000: 0
Loading Environment from MMC... Card did not respond to voltage select! *** Warning - No block device, using default environment
In: serial at 20064000 Out: serial at 20064000 Err: serial at 20064000 Model: Radxa Rock rockchip_dnl_key_pressed: adc_channel_single_shot fail! Net: Net Initialization Skipped
No ethernet found.
Hit any key to stop autoboot: 0
=>
PATCH v2 2/9 ARM: rockchip: rk3188: Remove the pinctrl setup and enable uart at SPL
Hi David,
Quoted 30 lines
Hi Heiko,
Quoted 27 lines · Heiko Stuebner
Quoted 14 lines
(quoted diff) +0
-0
b/arch/arm/mach-rockchip/rk3188-board-spl.cindex3c6c3d3c09..a5e4d39cb7100644 ---a/arch/arm/mach-rockchip/rk3188-board-spl.c+++b/arch/arm/mach-rockchip/rk3188-board-spl.c@@ -120,7 +120,7 @@ voidboard_debug_uart_init(void)
voidboard_init_f(ulong dummy)
{arch/arm/mach-rockchip/rk3188-board-spl.c +1
-1-struct udevice *pinctrl, *dev; +struct udevice *dev;int ret;#define EARLY_UART arch/arm/mach-rockchip/rk3188-board-spl.c void board_init_f(ulong dummy) · line 137
Quoted 8 lines
arch/arm/mach-rockchip/rk3188-board-spl.c +1
-4@@ -134,10 +134,7 @@ void board_init_f(ulong dummy)* printascii("string"); */ debug_uart_init (); -printch ('s' ); -printch ('p' ); -printch ('l' ); -printch ('\n' ); +printascii ("U-Boot SPL board init" );Did you test this change?
I remember rk3188 having issues (aka hanging) when trying to print strings through the debug uart and only printch working at all. (Timer issue or so?) ... Not sure if this got fixed in the meantime?
But you are using the debug uart for "production". Please use the proper driver.
You may either properly setup normal uart or buffer the console output until the uart is configured by device model (DM).
Quoted 28 lines
I don't know there was a issue, but i test it on the Radxa board today, it looks okay.
U-Boot SPL board init
U-Boot SPL 2019.01-rc1-00009-gdd7b9156fe (Jan 14 2019 - 19:53:50 +0800) Returning to boot ROM...U-Boot 2019.01-rc1-00009-gdd7b9156fe (Jan 14 2019 - 19:53:50 +0800)
Model: Radxa Rock DRAM: 2 GiB MMC: dwmmc at 10214000: 0Loading Environment from MMC... Card did not respond to voltage select! *** Warning - No block device, using default environment
In: serial at 20064000 Out: serial at 20064000 Err: serial at 20064000 Model: Radxa Rock rockchip_dnl_key_pressed: adc_channel_single_shot fail! Net: Net Initialization SkippedNo ethernet found.
Hit any key to stop autoboot: 0
=>
Quoted 4 lines
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190119/57047017/attachment.sig>
PATCH v2 2/9 ARM: rockchip: rk3188: Remove the pinctrl setup and enable uart at SPL【请注意,邮件由[email protected]代发】
Lukasz,
Quoted 32 lines · Lukasz Majewski
Hi David,
Quoted 30 lines
Hi Heiko,
Quoted 27 lines · Heiko Stuebner
Quoted 14 lines
(quoted diff) +0
-0
b/arch/arm/mach-rockchip/rk3188-board-spl.cindex3c6c3d3c09..a5e4d39cb7100644 ---a/arch/arm/mach-rockchip/rk3188-board-spl.c+++b/arch/arm/mach-rockchip/rk3188-board-spl.c@@ -120,7 +120,7 @@ voidboard_debug_uart_init(void)
voidboard_init_f(ulong dummy)
{arch/arm/mach-rockchip/rk3188-board-spl.c +1
-1-struct udevice *pinctrl, *dev; +struct udevice *dev;int ret;#define EARLY_UART arch/arm/mach-rockchip/rk3188-board-spl.c void board_init_f(ulong dummy) · line 137
Quoted 8 lines
arch/arm/mach-rockchip/rk3188-board-spl.c +1
-4@@ -134,10 +134,7 @@ void board_init_f(ulong dummy)* printascii("string"); */ debug_uart_init (); -printch ('s' ); -printch ('p' ); -printch ('l' ); -printch ('\n' ); +printascii ("U-Boot SPL board init" );Did you test this change?
I remember rk3188 having issues (aka hanging) when trying to print strings through the debug uart and only printch working at all. (Timer issue or so?) ... Not sure if this got fixed in the meantime?
Quoted 5 lines
But you are using the debug uart for "production". Please use the proper driver.
You may either properly setup normal uart or buffer the console output until the uart is configured by device model (DM).
If this is U-Boot proper, I would agree with you, but I don't agree this opinion for using in TPL, because TPL is running in limited SRAM, and we may not enable DM/console for it, DEBUG_UART is pretty good enough and small enough for U-Boot TPL.
If everything works fine, you can just turn off the DEBUG_UART and get a TPL without any debug message in production, this is acceptable just like we
may add silent mode for both U-Boot and Kernel in production which do not have any debug output.
Thanks,
- Kever
Quoted 51 lines
Quoted 29 lines
I don't know there was a issue, but i test it on the Radxa board today, it looks okay.
U-Boot SPL board init
U-Boot SPL 2019.01-rc1-00009-gdd7b9156fe (Jan 14 2019 - 19:53:50 +0800) Returning to boot ROM...U-Boot 2019.01-rc1-00009-gdd7b9156fe (Jan 14 2019 - 19:53:50 +0800)
Model: Radxa Rock DRAM: 2 GiB MMC: dwmmc at 10214000: 0Loading Environment from MMC... Card did not respond to voltage select! *** Warning - No block device, using default environment
In: serial at 20064000 Out: serial at 20064000 Err: serial at 20064000 Model: Radxa Rock rockchip_dnl_key_pressed: adc_channel_single_shot fail! Net: Net Initialization SkippedNo ethernet found.
Hit any key to stop autoboot: 0
=>Quoted 4 lines
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-bootBest regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot
PATCH v2 2/9 ARM: rockchip: rk3188: Remove the pinctrl setup and enable uart at SPL【请注意,邮件由[email protected]代发】
Hi Kever,
Quoted 39 lines
Lukasz,
Quoted 35 lines · Lukasz Majewski
Hi David,
Quoted 30 lines
Hi Heiko,
Quoted 27 lines · Heiko Stuebner
Quoted 14 lines
(quoted diff) +0
-0
b/arch/arm/mach-rockchip/rk3188-board-spl.cindex3c6c3d3c09..a5e4d39cb7100644 ---a/arch/arm/mach-rockchip/rk3188-board-spl.c+++b/arch/arm/mach-rockchip/rk3188-board-spl.c@@ -120,7 +120,7 @@ voidboard_debug_uart_init(void)
voidboard_init_f(ulong dummy)
{arch/arm/mach-rockchip/rk3188-board-spl.c +1
-1-struct udevice *pinctrl, *dev; +struct udevice *dev;int ret;#define EARLY_UART arch/arm/mach-rockchip/rk3188-board-spl.c void board_init_f(ulong dummy) · line 137
Quoted 8 lines
arch/arm/mach-rockchip/rk3188-board-spl.c +1
-4@@ -134,10 +134,7 @@ void board_init_f(ulong dummy)* printascii("string"); */ debug_uart_init (); -printch ('s' ); -printch ('p' ); -printch ('l' ); -printch ('\n' ); +printascii ("U-Boot SPL board init" );Did you test this change?
I remember rk3188 having issues (aka hanging) when trying to print strings through the debug uart and only printch working at all. (Timer issue or so?) ... Not sure if this got fixed in the meantime?But you are using the debug uart for "production". Please use the proper driver.
Quoted 6 lines
Quoted 2 lines
You may either properly setup normal uart or buffer the console output until the uart is configured by device model (DM).
If this is U-Boot proper, I would agree with you, but I don't agree this opinion for using in TPL, because TPL is running in limited SRAM, and we may not enable DM/console for it,
If I may ask - what is the limit for TPL size?
Have you considered using OF_PLATDATA with some DTS converted to C structs?
Quoted 2 lines
DEBUG_UARTis pretty
good enough and small enough for U-Boot TPL.
Do you have U-boot TPL -> SPL -> U-boot proper ?
Quoted 5 lines
If everything works fine, you can just turn off the
DEBUG_UARTand get a TPL without any debug message in production, this is acceptable just like we
may add silent mode for both U-Boot and Kernel in production which do not have any debug output.
I see your point.
Quoted 56 lines
Thanks,
- KeverQuoted 52 lines
Quoted 29 lines
I don't know there was a issue, but i test it on the Radxa board today, it looks okay.
U-Boot SPL board init
U-Boot SPL 2019.01-rc1-00009-gdd7b9156fe (Jan 14 2019 - 19:53:50 +0800) Returning to boot ROM...U-Boot 2019.01-rc1-00009-gdd7b9156fe (Jan 14 2019 - 19:53:50 +0800)
Model: Radxa Rock DRAM: 2 GiB MMC: dwmmc at 10214000: 0Loading Environment from MMC... Card did not respond to voltage select! *** Warning - No block device, using default environment
In: serial at 20064000 Out: serial at 20064000 Err: serial at 20064000 Model: Radxa Rock rockchip_dnl_key_pressed: adc_channel_single_shot fail! Net: Net Initialization SkippedNo ethernet found.
Hit any key to stop autoboot: 0
=>Quoted 4 lines
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-bootBest regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang
Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email:
lukma at denx.de_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190122/538ab1e2/attachment.sig>
PATCH v2 2/9 ARM: rockchip: rk3188: Remove the pinctrl setup and enable uart at SPL
In reply to Lukasz MajewskiHi Lukasz,
Quoted 33 lines · Lukasz Majewski
Hi David,
Quoted 30 lines
Hi Heiko,
Quoted 27 lines · Heiko Stuebner
Quoted 14 lines
(quoted diff) +0
-0
b/arch/arm/mach-rockchip/rk3188-board-spl.cindex3c6c3d3c09..a5e4d39cb7100644 ---a/arch/arm/mach-rockchip/rk3188-board-spl.c+++b/arch/arm/mach-rockchip/rk3188-board-spl.c@@ -120,7 +120,7 @@ voidboard_debug_uart_init(void)
voidboard_init_f(ulong dummy)
{arch/arm/mach-rockchip/rk3188-board-spl.c +1
-1-struct udevice *pinctrl, *dev; +struct udevice *dev;int ret;#define EARLY_UART arch/arm/mach-rockchip/rk3188-board-spl.c void board_init_f(ulong dummy) · line 137
Quoted 8 lines
arch/arm/mach-rockchip/rk3188-board-spl.c +1
-4@@ -134,10 +134,7 @@ void board_init_f(ulong dummy)* printascii("string"); */ debug_uart_init (); -printch ('s' ); -printch ('p' ); -printch ('l' ); -printch ('\n' ); +printascii ("U-Boot SPL board init" );Did you test this change?
I remember rk3188 having issues (aka hanging) when trying to print strings through the debug uart and only printch working at all. (Timer issue or so?) ... Not sure if this got fixed in the meantime?
Quoted 6 lines
But you are using the debug uart for "production". Please use the proper driver.
You may either properly setup normal uart or buffer the console output until the uart is configured by device model (DM).
Here, we just use it for debug print, and the sram size is limited to use more complex driver at spl stage.
Quoted 47 lines
Quoted 29 lines
I don't know there was a issue, but i test it on the Radxa board today, it looks okay.
U-Boot SPL board init
U-Boot SPL 2019.01-rc1-00009-gdd7b9156fe (Jan 14 2019 - 19:53:50 +0800) Returning to boot ROM...U-Boot 2019.01-rc1-00009-gdd7b9156fe (Jan 14 2019 - 19:53:50 +0800)
Model: Radxa Rock DRAM: 2 GiB MMC: dwmmc at 10214000: 0Loading Environment from MMC... Card did not respond to voltage select! *** Warning - No block device, using default environment
In: serial at 20064000 Out: serial at 20064000 Err: serial at 20064000 Model: Radxa Rock rockchip_dnl_key_pressed: adc_channel_single_shot fail! Net: Net Initialization SkippedNo ethernet found.
Hit any key to stop autoboot: 0
=>Quoted 4 lines
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-bootBest regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de
PATCH v2 2/9 ARM: rockchip: rk3188: Remove the pinctrl setup and enable uart at SPL
In reply to David WuQuoted 4 lines · David Wu
When the boot ROM sets up MMC we don't need to do it again. Remove the MMC setup code entirely, but we also need to enable uart for debug message.
Signed-off-by David Wu <[email protected]>
Thanks,
- Kever
Quoted 90 lines
---
Changes in v2: None
arch/arm/mach-rockchip/rk3188-board-spl.c | 41 ++--------------------- 1 file changed, 2 insertions(+), 39 deletions(-)arch/arm/mach-rockchip/rk3188-board-spl.c +2
-39@@ -120,7 +120,7 @@ void board_debug_uart_init(void)void board_init_f (ulong dummy) { -struct udevice *pinctrl, *dev; +struct udevice *dev;int ret;#define EARLY_UART @@ -134,10 +134,7 @@ void board_init_f(ulong dummy)* printascii("string"); */ debug_uart_init (); -printch ('s' ); -printch ('p' ); -printch ('l' ); -printch ('\n' ); +printascii ("U-Boot SPL board init" );#endif #ifdef CONFIG_ROCKCHIP_USB_UART @@ -171,12 +168,6 @@ void board_init_f(ulong dummy)return ; } - ret =uclass_get_device (UCLASS_PINCTRL ,0 , &pinctrl); -if (ret) { -debug ("Pinctrl init failed: %d\n" , ret); -return ; - } - ret =uclass_get_device (UCLASS_RAM ,0 , &dev);if (ret) {debug ("DRAM init failed: %d\n" , ret);@@ -214,7 +205,6 @@ static int setup_led(void)void spl_board_init (void ) { -struct udevice *pinctrl;int ret; ret =setup_led ();@@ -223,36 +213,9 @@ void spl_board_init(void)hang (); } - ret =uclass_get_device (UCLASS_PINCTRL ,0 , &pinctrl); -if (ret) { -debug ("%s: Cannot find pinctrl device\n" , __func__); - goto err; - } - -#ifdef CONFIG_SPL_MMC_SUPPORT - ret =pinctrl_request_noflags (pinctrl,PERIPH_ID_SDCARD ); -if (ret) { -debug ("%s: Failed to set up SD card\n" , __func__); - goto err; - } -#endif - -/* Enable debug UART */ - ret =pinctrl_request_noflags (pinctrl,PERIPH_ID_UART_DBG ); -if (ret) { -debug ("%s: Failed to set up console UART\n" , __func__); - goto err; - } -preloader_console_init ();#if CONFIG_IS_ENABLED (ROCKCHIP_BACK_TO_BROM )back_to_bootrom (BROM_BOOT_NEXTSTAGE );#endif return ; - -err: -printf ("spl_board_init: Error %d\n" , ret); - -/* No way to report error here */ -hang (); }
PATCH v2 2/9 ARM: rockchip: rk3188: Remove the pinctrl setup and enable uart at SPL
In reply to David WuQuoted 12 lines
When the boot ROM sets up MMC we don't need to do it again. Remove the MMC setup code entirely, but we also need to enable uart for debug message.
Signed-off-by David Wu <[email protected]>Reviewed-by Kever Yang <[email protected]>---
Changes in v2: None
arch/arm/mach-rockchip/rk3188-board-spl.c | 41 ++--------------------- 1 file changed, 2 insertions(+), 39 deletions(-)
PATCH v2 2/9 ARM: rockchip: rk3188: Remove the pinctrl setup and enable uart at SPL
In reply to David WuQuoted 12 lines
When the boot ROM sets up MMC we don't need to do it again. Remove the MMC setup code entirely, but we also need to enable uart for debug message.
Signed-off-by David Wu <[email protected]>Reviewed-by Kever Yang <[email protected]>---
Changes in v2: None
arch/arm/mach-rockchip/rk3188-board-spl.c | 41 ++--------------------- 1 file changed, 2 insertions(+), 39 deletions(-)
Applied to u-boot-rockchip, thanks!
PATCH v2 3/9 ARM: rockchip: Kconfig: Remove the SPL_PINCTRL for rk3188
In reply to David WuIt seems that pinctrl is not requested for rk3188 SPL, remove it so that can save more space for SPL image size.
---
Changes in v2: None
arch/arm/mach-rockchip/Kconfig | 1 - 1 file changed, 1 deletion(-)
arch/arm/mach-rockchip/Kconfig +0 -1
@@ -29,7 +29,6 @@ config ROCKCHIP_RK3188 select SUPPORT_SPL select SPL select SPL_CLK - select SPL_PINCTRL select SPL_REGMAP select SPL_SYSCON select SPL_RAM
Signature · 1 line
2.19.1
PATCH v2 3/9 ARM: rockchip: Kconfig: Remove the SPL_PINCTRL for rk3188
Quoted 5 lines · David Wu
It seems that pinctrl is not requested for rk3188 SPL, remove it so that can save more space for SPL image size.
Signed-off-by David Wu <[email protected]>Reviewed-by Philipp Tomsich <[email protected]>
Thanks,
- Kever
Quoted 19 lines
---
Changes in v2: None
arch/arm/mach-rockchip/Kconfig | 1 - 1 file changed, 1 deletion(-)arch/arm/mach-rockchip/Kconfig +0
-1@@ -29,7 +29,6 @@ config ROCKCHIP_RK3188 select SUPPORT_SPL select SPL select SPL_CLK - select SPL_PINCTRL select SPL_REGMAP select SPL_SYSCON select SPL_RAM
PATCH v2 3/9 ARM: rockchip: Kconfig: Remove the SPL_PINCTRL for rk3188
In reply to David WuQuoted 6 lines
It seems that pinctrl is not requested for rk3188 SPL, remove it so that can save more space for SPL image size.
Signed-off-by David Wu <[email protected]>Reviewed-by Philipp Tomsich <[email protected]>Reviewed-by Kever Yang <[email protected]>
Quoted 7 lines
---
Changes in v2: None
arch/arm/mach-rockchip/Kconfig | 1 - 1 file changed, 1 deletion(-)
PATCH v2 3/9 ARM: rockchip: Kconfig: Remove the SPL_PINCTRL for rk3188
In reply to David WuQuoted 6 lines
It seems that pinctrl is not requested for rk3188 SPL, remove it so that can save more space for SPL image size.
Signed-off-by David Wu <[email protected]>Reviewed-by Philipp Tomsich <[email protected]>Reviewed-by Kever Yang <[email protected]>
Quoted 7 lines
---
Changes in v2: None
arch/arm/mach-rockchip/Kconfig | 1 - 1 file changed, 1 deletion(-)
Applied to u-boot-rockchip, thanks!
PATCH v2 4/9 ARM: rockchip: Remove the pinctrl request at rk3288-board-spl
In reply to David WuIf we use the new pinctrl driver, the pinctrl setup will be done by device probe. Remove the pinctrl setup at rk3288-board-spl.
---
Changes in v2: None
arch/arm/mach-rockchip/rk3288-board-spl.c | 79 ----------------------- 1 file changed, 79 deletions(-)
arch/arm/mach-rockchip/rk3288-board-spl.c +0 -79
@@ -77,45 +77,6 @@ fallback:return BOOT_DEVICE_MMC1 ; } -#ifdef CONFIG_SPL_MMC_SUPPORT -static int configure_emmc (struct udevice *pinctrl) -{ -#if defined(CONFIG_TARGET_CHROMEBOOK_JERRY ) - -struct gpio_desc desc; -int ret; - -pinctrl_request_noflags (pinctrl,PERIPH_ID_EMMC ); - -/* -* TODO(sjg at chromium.org): Pick this up from device tree or perhaps -* use the EMMC_PWREN setting. -*/ - ret =dm_gpio_lookup_name ("D9" , &desc); -if (ret) { -debug ("gpio ret=%d\n" , ret); -return ret; - } - ret =dm_gpio_request (&desc,"emmc_pwren" ); -if (ret) { -debug ("gpio_request ret=%d\n" , ret); -return ret; - } - ret =dm_gpio_set_dir_flags (&desc,GPIOD_IS_OUT ); -if (ret) { -debug ("gpio dir ret=%d\n" , ret); -return ret; - } - ret =dm_gpio_set_value (&desc,1 ); -if (ret) { -debug ("gpio value ret=%d\n" , ret); -return ret; - } -#endif -return 0 ; -} -#endif -#if !defined(CONFIG_SPL_OF_PLATDATA )static int phycore_init (void ) {
@@ -144,7 +105,6 @@ static int phycore_init(void)void board_init_f (ulong dummy) { -struct udevice *pinctrl;struct udevice *dev;int ret;
@@ -183,12 +143,6 @@ void board_init_f(ulong dummy)return ; } - ret =uclass_get_device (UCLASS_PINCTRL ,0 , &pinctrl); -if (ret) { -debug ("Pinctrl init failed: %d\n" , ret); -return ; - } -#if !defined(CONFIG_SPL_OF_PLATDATA )if (of_machine_is_compatible ("phytec,rk3288-phycore-som" )) { ret =phycore_init ();
@@ -239,52 +193,19 @@ static int setup_led(void)void spl_board_init (void ) { -struct udevice *pinctrl;int ret; ret =setup_led (); -if (ret) {debug ("LED ret=%d\n" , ret);hang (); } - ret =uclass_get_device (UCLASS_PINCTRL ,0 , &pinctrl); -if (ret) { -debug ("%s: Cannot find pinctrl device\n" , __func__); - goto err; - } - -#ifdef CONFIG_SPL_MMC_SUPPORT - ret =pinctrl_request_noflags (pinctrl,PERIPH_ID_SDCARD ); -if (ret) { -debug ("%s: Failed to set up SD card\n" , __func__); - goto err; - } - ret =configure_emmc (pinctrl); -if (ret) { -debug ("%s: Failed to set up eMMC\n" , __func__); - goto err; - } -#endif - -/* Enable debug UART */ - ret =pinctrl_request_noflags (pinctrl,PERIPH_ID_UART_DBG ); -if (ret) { -debug ("%s: Failed to set up console UART\n" , __func__); - goto err; - } -preloader_console_init ();#if CONFIG_IS_ENABLED (ROCKCHIP_BACK_TO_BROM )back_to_bootrom (BROM_BOOT_NEXTSTAGE );#endif return ; -err: -printf ("spl_board_init: Error %d\n" , ret); - -/* No way to report error here */ -hang (); }#ifdef CONFIG_SPL_OS_BOOT
Signature · 1 line
2.19.1
PATCH v2 4/9 ARM: rockchip: Remove the pinctrl request at rk3288-board-spl
Quoted 5 lines · David Wu
If we use the new pinctrl driver, the pinctrl setup will be done by device probe. Remove the pinctrl setup at rk3288-board-spl.
Signed-off-by David Wu <[email protected]>Reviewed-by Philipp Tomsich <[email protected]>
Thanks,
- Kever
Quoted 131 lines
---
Changes in v2: None
arch/arm/mach-rockchip/rk3288-board-spl.c | 79 ----------------------- 1 file changed, 79 deletions(-)arch/arm/mach-rockchip/rk3288-board-spl.c +0
-79@@ -77,45 +77,6 @@ fallback:return BOOT_DEVICE_MMC1 ; } -#ifdef CONFIG_SPL_MMC_SUPPORT -static int configure_emmc (struct udevice *pinctrl) -{ -#if defined(CONFIG_TARGET_CHROMEBOOK_JERRY ) - -struct gpio_desc desc; -int ret; - -pinctrl_request_noflags (pinctrl,PERIPH_ID_EMMC ); - -/* -* TODO(sjg at chromium.org): Pick this up from device tree or perhaps -* use the EMMC_PWREN setting. -*/ - ret =dm_gpio_lookup_name ("D9" , &desc); -if (ret) { -debug ("gpio ret=%d\n" , ret); -return ret; - } - ret =dm_gpio_request (&desc,"emmc_pwren" ); -if (ret) { -debug ("gpio_request ret=%d\n" , ret); -return ret; - } - ret =dm_gpio_set_dir_flags (&desc,GPIOD_IS_OUT ); -if (ret) { -debug ("gpio dir ret=%d\n" , ret); -return ret; - } - ret =dm_gpio_set_value (&desc,1 ); -if (ret) { -debug ("gpio value ret=%d\n" , ret); -return ret; - } -#endif -return 0 ; -} -#endif -#if !defined(CONFIG_SPL_OF_PLATDATA )static int phycore_init (void ) {@@ -144,7 +105,6 @@ static int phycore_init(void)void board_init_f (ulong dummy) { -struct udevice *pinctrl;struct udevice *dev;int ret;@@ -183,12 +143,6 @@ void board_init_f(ulong dummy)return ; } - ret =uclass_get_device (UCLASS_PINCTRL ,0 , &pinctrl); -if (ret) { -debug ("Pinctrl init failed: %d\n" , ret); -return ; - } -#if !defined(CONFIG_SPL_OF_PLATDATA )if (of_machine_is_compatible ("phytec,rk3288-phycore-som" )) { ret =phycore_init ();@@ -239,52 +193,19 @@ static int setup_led(void)void spl_board_init (void ) { -struct udevice *pinctrl;int ret; ret =setup_led (); -if (ret) {debug ("LED ret=%d\n" , ret);hang (); } - ret =uclass_get_device (UCLASS_PINCTRL ,0 , &pinctrl); -if (ret) { -debug ("%s: Cannot find pinctrl device\n" , __func__); - goto err; - } - -#ifdef CONFIG_SPL_MMC_SUPPORT - ret =pinctrl_request_noflags (pinctrl,PERIPH_ID_SDCARD ); -if (ret) { -debug ("%s: Failed to set up SD card\n" , __func__); - goto err; - } - ret =configure_emmc (pinctrl); -if (ret) { -debug ("%s: Failed to set up eMMC\n" , __func__); - goto err; - } -#endif - -/* Enable debug UART */ - ret =pinctrl_request_noflags (pinctrl,PERIPH_ID_UART_DBG ); -if (ret) { -debug ("%s: Failed to set up console UART\n" , __func__); - goto err; - } -preloader_console_init ();#if CONFIG_IS_ENABLED (ROCKCHIP_BACK_TO_BROM )back_to_bootrom (BROM_BOOT_NEXTSTAGE );#endif return ; -err: -printf ("spl_board_init: Error %d\n" , ret); - -/* No way to report error here */ -hang (); }#ifdef CONFIG_SPL_OS_BOOT
PATCH v2 4/9 ARM: rockchip: Remove the pinctrl request at rk3288-board-spl
In reply to David WuQuoted 6 lines
If we use the new pinctrl driver, the pinctrl setup will be done by device probe. Remove the pinctrl setup at rk3288-board-spl.
Signed-off-by David Wu <[email protected]>Reviewed-by Philipp Tomsich <[email protected]>Reviewed-by Kever Yang <[email protected]>
Quoted 7 lines
---
Changes in v2: None
arch/arm/mach-rockchip/rk3288-board-spl.c | 79 ----------------------- 1 file changed, 79 deletions(-)
PATCH v2 4/9 ARM: rockchip: Remove the pinctrl request at rk3288-board-spl
In reply to David WuQuoted 6 lines
If we use the new pinctrl driver, the pinctrl setup will be done by device probe. Remove the pinctrl setup at rk3288-board-spl.
Signed-off-by David Wu <[email protected]>Reviewed-by Philipp Tomsich <[email protected]>Reviewed-by Kever Yang <[email protected]>
Quoted 7 lines
---
Changes in v2: None
arch/arm/mach-rockchip/rk3288-board-spl.c | 79 ----------------------- 1 file changed, 79 deletions(-)
Applied to u-boot-rockchip, thanks!
PATCH v2 5/9 rk3288: chrome: defconfig: Enable FDT for new pinctrl driver
In reply to David WuThe FDT is requested for new pinctrl driver, disable SPL_OF_PLATDATA and enable SPL_OF_LIBFDT to make FDT be built in.
---
Changes in v2: None
configs/chromebit_mickey_defconfig | 2 -- configs/chromebook_jerry_defconfig | 2 -- configs/chromebook_minnie_defconfig | 2 -- 3 files changed, 6 deletions(-)
configs/chromebit_mickey_defconfig +0 -2
@@ -38,7 +38,6 @@ CONFIG_SPL_PARTITION_UUIDS=y CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="rk3288-veyron-mickey" CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" -CONFIG_SPL_OF_PLATDATA=y CONFIG_REGMAP=y CONFIG_SPL_REGMAP=y CONFIG_SYSCON=y
@@ -93,4 +92,3 @@ CONFIG_DISPLAY_ROCKCHIP_HDMI=y CONFIG_USE_TINY_PRINTF=y CONFIG_CMD_DHRYSTONE=y CONFIG_ERRNO_STR=y -# CONFIG_SPL_OF_LIBFDT is not set
configs/chromebook_jerry_defconfig +0 -2
@@ -40,7 +40,6 @@ CONFIG_SPL_PARTITION_UUIDS=y CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="rk3288-veyron-jerry" CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" -CONFIG_SPL_OF_PLATDATA=y CONFIG_REGMAP=y CONFIG_SPL_REGMAP=y CONFIG_SYSCON=y
@@ -95,4 +94,3 @@ CONFIG_DISPLAY_ROCKCHIP_HDMI=y CONFIG_USE_TINY_PRINTF=y CONFIG_CMD_DHRYSTONE=y CONFIG_ERRNO_STR=y -# CONFIG_SPL_OF_LIBFDT is not set
configs/chromebook_minnie_defconfig +0 -2
@@ -39,7 +39,6 @@ CONFIG_SPL_PARTITION_UUIDS=y CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="rk3288-veyron-minnie" CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" -CONFIG_SPL_OF_PLATDATA=y CONFIG_REGMAP=y CONFIG_SPL_REGMAP=y CONFIG_SYSCON=y
@@ -95,4 +94,3 @@ CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_USE_TINY_PRINTF=y CONFIG_CMD_DHRYSTONE=y CONFIG_ERRNO_STR=y -# CONFIG_SPL_OF_LIBFDT is not set
Signature · 1 line
2.19.1
PATCH v2 5/9 rk3288: chrome: defconfig: Enable FDT for new pinctrl driver
Quoted 4 lines
The FDT is requested for new pinctrl driver, disable
SPL_OF_PLATDATAand enableSPL_OF_LIBFDTto make FDT be built in.Signed-off-by David Wu <[email protected]>
Quoted 9 lines
---
Changes in v2: None
configs/chromebit_mickey_defconfig | 2 -- configs/chromebook_jerry_defconfig | 2 -- configs/chromebook_minnie_defconfig | 2 -- 3 files changed, 6 deletions(-)
PATCH v2 5/9 rk3288: chrome: defconfig: Enable FDT for new pinctrl driver
In reply to David WuQuoted 4 lines
The FDT is requested for new pinctrl driver, disable
SPL_OF_PLATDATAand enableSPL_OF_LIBFDTto make FDT be built in.Signed-off-by David Wu <[email protected]>
Quoted 9 lines
---
Changes in v2: None
configs/chromebit_mickey_defconfig | 2 -- configs/chromebook_jerry_defconfig | 2 -- configs/chromebook_minnie_defconfig | 2 -- 3 files changed, 6 deletions(-)
Applied to u-boot-rockchip, thanks!
PATCH v2 6/9 pinctrl: rockchip: Add common rockchip pinctrl driver
In reply to David WuUse this driver to fit all Rockchip SOCs and to support the desired pinctrl configuration via DTS.
---
Changes in v2:
- Remove px30, rk2928, rk3066*.
- Split it to multiple files for the relevant per-SoC data structures.
drivers/pinctrl/Kconfig | 91 +- drivers/pinctrl/Makefile | 2 +- drivers/pinctrl/rockchip/Kconfig | 17 + drivers/pinctrl/rockchip/Makefile | 19 +- drivers/pinctrl/rockchip/pinctrl-rk3036.c | 65 ++ drivers/pinctrl/rockchip/pinctrl-rk3128.c | 155 ++++ drivers/pinctrl/rockchip/pinctrl-rk3188.c | 82 ++ drivers/pinctrl/rockchip/pinctrl-rk322x.c | 215 +++++ drivers/pinctrl/rockchip/pinctrl-rk3288.c | 157 ++++ drivers/pinctrl/rockchip/pinctrl-rk3328.c | 227 +++++ drivers/pinctrl/rockchip/pinctrl-rk3368.c | 116 +++ drivers/pinctrl/rockchip/pinctrl-rk3399.c | 193 +++++ .../pinctrl/rockchip/pinctrl-rockchip-core.c | 788 ++++++++++++++++++ drivers/pinctrl/rockchip/pinctrl-rockchip.h | 302 +++++++ drivers/pinctrl/rockchip/pinctrl-rv1108.c | 203 +++++ 15 files changed, 2532 insertions(+), 100 deletions(-) create mode 100644 drivers/pinctrl/rockchip/Kconfig create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3036.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3128.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3188.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk322x.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3288.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3328.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3368.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3399.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rockchip-core.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rockchip.h create mode 100644 drivers/pinctrl/rockchip/pinctrl-rv1108.c
drivers/pinctrl/Kconfig +1 -90
@@ -158,96 +158,6 @@ config PINCTRL_QCA953X the GPIO definitions and pin control functions for each available multiplex function. -config PINCTRL_ROCKCHIP_RK3036 - bool "Rockchip rk3036 pin control driver" - depends on DM - help - Support pin multiplexing control on Rockchip rk3036 SoCs. - - The driver is controlled by a device tree node which contains both - the GPIO definitions and pin control functions for each available - multiplex function. - -config PINCTRL_ROCKCHIP_RK3128 - bool "Rockchip rk3128 pin control driver" - depends on DM - help - Support pin multiplexing control on Rockchip rk3128 SoCs. - - The driver is controlled by a device tree node which contains both - the GPIO definitions and pin control functions for each available - multiplex function. - -config PINCTRL_ROCKCHIP_RK3188 - bool "Rockchip rk3188 pin control driver" - depends on DM - help - Support pin multiplexing control on Rockchip rk3188 SoCs. - - The driver is controlled by a device tree node which contains both - the GPIO definitions and pin control functions for each available - multiplex function. - -config PINCTRL_ROCKCHIP_RK322X - bool "Rockchip rk322x pin control driver" - depends on DM - help - Support pin multiplexing control on Rockchip rk322x SoCs. - - The driver is controlled by a device tree node which contains both - the GPIO definitions and pin control functions for each available - multiplex function. - -config PINCTRL_ROCKCHIP_RK3288 - bool "Rockchip rk3288 pin control driver" - depends on DM - help - Support pin multiplexing control on Rockchip rk3288 SoCs. - - The driver is controlled by a device tree node which contains both - the GPIO definitions and pin control functions for each available - multiplex function. - -config PINCTRL_ROCKCHIP_RK3328 - bool "Rockchip rk3328 pin control driver" - depends on DM - help - Support pin multiplexing control on Rockchip rk3328 SoCs. - - The driver is controlled by a device tree node which contains both - the GPIO definitions and pin control functions for each available - multiplex function. - -config PINCTRL_ROCKCHIP_RK3368 - bool "Rockchip RK3368 pin control driver" - depends on DM - help - Support pin multiplexing control on Rockchip rk3368 SoCs. - - The driver is controlled by a device tree node which contains both - the GPIO definitions and pin control functions for each available - multiplex function. - -config PINCTRL_ROCKCHIP_RK3399 - bool "Rockchip rk3399 pin control driver" - depends on DM - help - Support pin multiplexing control on Rockchip rk3399 SoCs. - - The driver is controlled by a device tree node which contains both - the GPIO definitions and pin control functions for each available - multiplex function. - -config PINCTRL_ROCKCHIP_RV1108 - bool "Rockchip rv1108 pin control driver" - depends on DM - help - Support pin multiplexing control on Rockchip rv1108 SoC. - - The driver is controlled by a device tree node which contains - both the GPIO definitions and pin control functions for each - available multiplex function. - config PINCTRL_SANDBOX bool "Sandbox pinctrl driver" depends on SANDBOX
@@ -304,6 +214,7 @@ source "drivers/pinctrl/meson/Kconfig" source "drivers/pinctrl/mediatek/Kconfig" source "drivers/pinctrl/nxp/Kconfig" source "drivers/pinctrl/renesas/Kconfig" +source "drivers/pinctrl/rockchip/Kconfig" source "drivers/pinctrl/uniphier/Kconfig" source "drivers/pinctrl/exynos/Kconfig" source "drivers/pinctrl/mvebu/Kconfig"
drivers/pinctrl/Makefile +1 -1
@@ -6,10 +6,10 @@ obj-$(CONFIG_$(SPL_)PINCTRL_GENERIC) += pinctrl-generic.o obj-$(CONFIG_PINCTRL_AT91) += pinctrl-at91.o obj-$(CONFIG_PINCTRL_AT91PIO4) += pinctrl-at91-pio4.o obj-y += nxp/ +obj-$(CONFIG_$(SPL_)PINCTRL_ROCKCHIP) += rockchip/ obj-$(CONFIG_ARCH_ASPEED) += aspeed/ obj-$(CONFIG_ARCH_ATH79) += ath79/ obj-$(CONFIG_ARCH_RMOBILE) += renesas/ -obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip/ obj-$(CONFIG_PINCTRL_SANDBOX) += pinctrl-sandbox.o obj-$(CONFIG_PINCTRL_UNIPHIER) += uniphier/
drivers/pinctrl/rockchip/Kconfig new file +17 -0
@@ -0,0 +1,17 @@ +if ARCH_ROCKCHIP + +config PINCTRL_ROCKCHIP + bool "Rockchip pin control drivers" + depends on ARCH_ROCKCHIP && PINCTRL_GENERIC + default y + help + Enable support pin control functions for Rockchip SoCs. + +config SPL_PINCTRL_ROCKCHIP + bool "Support Rockchip pin controllers in SPL" + depends on ARCH_ROCKCHIP && SPL_PINCTRL_GENERIC + default y + help + This option is an SPL-variant of the PINCTRL_ROCKCHIP option. + +endif
drivers/pinctrl/rockchip/Makefile +10 -9
@@ -2,12 +2,13 @@ # # Copyright (c) 2017 Rockchip Electronics Co., Ltd -obj-$(CONFIG_PINCTRL_ROCKCHIP_RK3036) += pinctrl_rk3036.o -obj-$(CONFIG_PINCTRL_ROCKCHIP_RK3128) += pinctrl_rk3128.o -obj-$(CONFIG_PINCTRL_ROCKCHIP_RK3188) += pinctrl_rk3188.o -obj-$(CONFIG_PINCTRL_ROCKCHIP_RK322X) += pinctrl_rk322x.o -obj-$(CONFIG_PINCTRL_ROCKCHIP_RK3288) += pinctrl_rk3288.o -obj-$(CONFIG_PINCTRL_ROCKCHIP_RK3328) += pinctrl_rk3328.o -obj-$(CONFIG_PINCTRL_ROCKCHIP_RK3368) += pinctrl_rk3368.o -obj-$(CONFIG_PINCTRL_ROCKCHIP_RK3399) += pinctrl_rk3399.o -obj-$(CONFIG_PINCTRL_ROCKCHIP_RV1108) += pinctrl_rv1108.o +obj-y += pinctrl-rockchip-core.o +obj-$(CONFIG_ROCKCHIP_RK3036) += pinctrl-rk3036.o +obj-$(CONFIG_ROCKCHIP_RK3128) += pinctrl-rk3128.o +obj-$(CONFIG_ROCKCHIP_RK3188) += pinctrl-rk3188.o +obj-$(CONFIG_ROCKCHIP_RK322X) += pinctrl-rk322x.o +obj-$(CONFIG_ROCKCHIP_RK3288) += pinctrl-rk3288.o +obj-$(CONFIG_ROCKCHIP_RK3328) += pinctrl-rk3328.o +obj-$(CONFIG_ROCKCHIP_RK3368) += pinctrl-rk3368.o +obj-$(CONFIG_ROCKCHIP_RK3399) += pinctrl-rk3399.o +obj-$(CONFIG_ROCKCHIP_RV1108) += pinctrl-rv1108.o
drivers/pinctrl/rockchip/pinctrl-rk3036.c new file +65 -0
65 lines not on this page · raw message
drivers/pinctrl/rockchip/pinctrl-rk3128.c new file +155 -0
155 lines not on this page · raw message
drivers/pinctrl/rockchip/pinctrl-rk3188.c new file +82 -0
82 lines not on this page · raw message
drivers/pinctrl/rockchip/pinctrl-rk322x.c new file +215 -0
215 lines not on this page · raw message
drivers/pinctrl/rockchip/pinctrl-rk3288.c new file +157 -0
157 lines not on this page · raw message
drivers/pinctrl/rockchip/pinctrl-rk3328.c new file +227 -0
227 lines not on this page · raw message
drivers/pinctrl/rockchip/pinctrl-rk3368.c new file +116 -0
116 lines not on this page · raw message
drivers/pinctrl/rockchip/pinctrl-rk3399.c new file +193 -0
193 lines not on this page · raw message
drivers/pinctrl/rockchip/pinctrl-rockchip-core.c new file +788 -0
788 lines not on this page · raw message
drivers/pinctrl/rockchip/pinctrl-rockchip.h new file +302 -0
302 lines not on this page · raw message
drivers/pinctrl/rockchip/pinctrl-rv1108.c new file +203 -0
203 lines not on this page · raw message
Signature · 1 line
2.19.1
Heiko Stuebner
maintainerPATCH v2 6/9 pinctrl: rockchip: Add common rockchip pinctrl driver
Hi David,
Am Mittwoch, 2. Januar 2019, 14:00:55 CET schrieb David Wu:
Quoted 9 lines
Use this driver to fit all Rockchip SOCs and to support the desired pinctrl configuration via DTS.
Signed-off-by David Wu <[email protected]>---
Changes in v2:
- Remove px30, rk2928, rk3066*.
- Split it to multiple files for the relevant per-SoC data structures.
Moving so nicely close to the Linux pinctrl driver is way cool. And while I haven't looked in that much detail, this looks nice, so
Out of curiosity, why did you remove px30, rk2928 and rk3066 support? I'm still hoping to support those at some point (someone was working on rk3066 uboot support for example last year or so), so having the pinctrl support already present might encourage things?
Or was that a review-request from v1?
Heiko
PATCH v2 6/9 pinctrl: rockchip: Add common rockchip pinctrl driver
Heiko,
Quoted 18 lines · Heiko Stuebner
Hi David,
Am Mittwoch, 2. Januar 2019, 14:00:55 CET schrieb David Wu:
Quoted 9 lines
Use this driver to fit all Rockchip SOCs and to support the desired pinctrl configuration via DTS.
Signed-off-by David Wu <[email protected]>---
Changes in v2:
- Remove px30, rk2928, rk3066*.
- Split it to multiple files for the relevant per-SoC data structures.Moving so nicely close to the Linux pinctrl driver is way cool. And while I haven't looked in that much detail, this looks nice, so
Quoted 7 lines
Acked-by Heiko Stuebner <[email protected]>Out of curiosity, why did you remove px30, rk2928 and rk3066 support? I'm still hoping to support those at some point (someone was working on rk3066 uboot support for example last year or so), so having the pinctrl support already present might encourage things?
Or was that a review-request from v1?
I requested to not have any drivers includeed for chips that are not supported in U-Boot. Each additional pinctrl-driver should then come in once the respective SoC is added (i.e. I’d like to have the pinctrl driver part of the respective enablement series)…
Thanks,
Philipp.
Heiko Stuebner
maintainerPATCH v2 6/9 pinctrl: rockchip: Add common rockchip pinctrl driver
Hi Philipp,
Am Sonntag, 6. Januar 2019, 19:57:42 CET schrieb Philipp Tomsich:
Quoted 23 lines
Quoted 15 lines · Heiko Stuebner
Am Mittwoch, 2. Januar 2019, 14:00:55 CET schrieb David Wu:
Quoted 9 lines
Use this driver to fit all Rockchip SOCs and to support the desired pinctrl configuration via DTS.
Signed-off-by David Wu <[email protected]>---
Changes in v2:
- Remove px30, rk2928, rk3066*.
- Split it to multiple files for the relevant per-SoC data structures.Moving so nicely close to the Linux pinctrl driver is way cool. And while I haven't looked in that much detail, this looks nice, so
Quoted 7 lines
Acked-by Heiko Stuebner <[email protected]>Out of curiosity, why did you remove px30, rk2928 and rk3066 support? I'm still hoping to support those at some point (someone was working on rk3066 uboot support for example last year or so), so having the pinctrl support already present might encourage things?
Or was that a review-request from v1?
Quoted 4 lines
I requested to not have any drivers includeed for chips that are not supported in U-Boot. Each additional pinctrl-driver should then come in once the respective SoC is added (i.e. I’d like to have the pinctrl driver part of the respective enablement series)…
fair enough, thanks for the heads up :-)
Heiko
PATCH v2 6/9 pinctrl: rockchip: Add common rockchip pinctrl driver
In reply to David WuQuoted 4 lines · David Wu
Use this driver to fit all Rockchip SOCs and to support the desired pinctrl configuration via DTS.
Signed-off-by David Wu <[email protected]>
Thanks,
- Kever
Quoted 2,779 lines
---
Changes in v2:
- Remove px30, rk2928, rk3066*.
- Split it to multiple files for the relevant per-SoC data structures.drivers/pinctrl/Kconfig | 91 +- drivers/pinctrl/Makefile | 2 +- drivers/pinctrl/rockchip/Kconfig | 17 + drivers/pinctrl/rockchip/Makefile | 19 +- drivers/pinctrl/rockchip/pinctrl-rk3036.c | 65 ++ drivers/pinctrl/rockchip/pinctrl-rk3128.c | 155 ++++ drivers/pinctrl/rockchip/pinctrl-rk3188.c | 82 ++ drivers/pinctrl/rockchip/pinctrl-rk322x.c | 215 +++++ drivers/pinctrl/rockchip/pinctrl-rk3288.c | 157 ++++ drivers/pinctrl/rockchip/pinctrl-rk3328.c | 227 +++++ drivers/pinctrl/rockchip/pinctrl-rk3368.c | 116 +++ drivers/pinctrl/rockchip/pinctrl-rk3399.c | 193 +++++ .../pinctrl/rockchip/pinctrl-rockchip-core.c | 788 ++++++++++++++++++ drivers/pinctrl/rockchip/pinctrl-rockchip.h | 302 +++++++ drivers/pinctrl/rockchip/pinctrl-rv1108.c | 203 +++++ 15 files changed, 2532 insertions(+), 100 deletions(-) create mode 100644 drivers/pinctrl/rockchip/Kconfig create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3036.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3128.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3188.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk322x.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3288.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3328.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3368.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3399.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rockchip-core.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rockchip.h create mode 100644 drivers/pinctrl/rockchip/pinctrl-rv1108.cdrivers/pinctrl/Kconfig +1
-90@@ -158,96 +158,6 @@ config PINCTRL_QCA953X the GPIO definitions and pin control functions for each available multiplex function. -config PINCTRL_ROCKCHIP_RK3036 - bool "Rockchip rk3036 pin control driver" - depends on DM - help - Support pin multiplexing control on Rockchip rk3036 SoCs. - - The driver is controlled by a device tree node which contains both - the GPIO definitions and pin control functions for each available - multiplex function. - -config PINCTRL_ROCKCHIP_RK3128 - bool "Rockchip rk3128 pin control driver" - depends on DM - help - Support pin multiplexing control on Rockchip rk3128 SoCs. - - The driver is controlled by a device tree node which contains both - the GPIO definitions and pin control functions for each available - multiplex function. - -config PINCTRL_ROCKCHIP_RK3188 - bool "Rockchip rk3188 pin control driver" - depends on DM - help - Support pin multiplexing control on Rockchip rk3188 SoCs. - - The driver is controlled by a device tree node which contains both - the GPIO definitions and pin control functions for each available - multiplex function. - -config PINCTRL_ROCKCHIP_RK322X - bool "Rockchip rk322x pin control driver" - depends on DM - help - Support pin multiplexing control on Rockchip rk322x SoCs. - - The driver is controlled by a device tree node which contains both - the GPIO definitions and pin control functions for each available - multiplex function. - -config PINCTRL_ROCKCHIP_RK3288 - bool "Rockchip rk3288 pin control driver" - depends on DM - help - Support pin multiplexing control on Rockchip rk3288 SoCs. - - The driver is controlled by a device tree node which contains both - the GPIO definitions and pin control functions for each available - multiplex function. - -config PINCTRL_ROCKCHIP_RK3328 - bool "Rockchip rk3328 pin control driver" - depends on DM - help - Support pin multiplexing control on Rockchip rk3328 SoCs. - - The driver is controlled by a device tree node which contains both - the GPIO definitions and pin control functions for each available - multiplex function. - -config PINCTRL_ROCKCHIP_RK3368 - bool "Rockchip RK3368 pin control driver" - depends on DM - help - Support pin multiplexing control on Rockchip rk3368 SoCs. - - The driver is controlled by a device tree node which contains both - the GPIO definitions and pin control functions for each available - multiplex function. - -config PINCTRL_ROCKCHIP_RK3399 - bool "Rockchip rk3399 pin control driver" - depends on DM - help - Support pin multiplexing control on Rockchip rk3399 SoCs. - - The driver is controlled by a device tree node which contains both - the GPIO definitions and pin control functions for each available - multiplex function. - -config PINCTRL_ROCKCHIP_RV1108 - bool "Rockchip rv1108 pin control driver" - depends on DM - help - Support pin multiplexing control on Rockchip rv1108 SoC. - - The driver is controlled by a device tree node which contains - both the GPIO definitions and pin control functions for each - available multiplex function. - config PINCTRL_SANDBOX bool "Sandbox pinctrl driver" depends on SANDBOX@@ -304,6 +214,7 @@ source "drivers/pinctrl/meson/Kconfig" source "drivers/pinctrl/mediatek/Kconfig" source "drivers/pinctrl/nxp/Kconfig" source "drivers/pinctrl/renesas/Kconfig" +source "drivers/pinctrl/rockchip/Kconfig" source "drivers/pinctrl/uniphier/Kconfig" source "drivers/pinctrl/exynos/Kconfig" source "drivers/pinctrl/mvebu/Kconfig"drivers/pinctrl/Makefile +1
-1@@ -6,10 +6,10 @@ obj-$(CONFIG_$(SPL_)PINCTRL_GENERIC) += pinctrl-generic.o obj-$(CONFIG_PINCTRL_AT91) += pinctrl-at91.o obj-$(CONFIG_PINCTRL_AT91PIO4) += pinctrl-at91-pio4.o obj-y += nxp/ +obj-$(CONFIG_$(SPL_)PINCTRL_ROCKCHIP) += rockchip/ obj-$(CONFIG_ARCH_ASPEED) += aspeed/ obj-$(CONFIG_ARCH_ATH79) += ath79/ obj-$(CONFIG_ARCH_RMOBILE) += renesas/ -obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip/ obj-$(CONFIG_PINCTRL_SANDBOX) += pinctrl-sandbox.o obj-$(CONFIG_PINCTRL_UNIPHIER) += uniphier/drivers/pinctrl/rockchip/Kconfig new file +17
-0@@ -0,0 +1,17 @@ +if ARCH_ROCKCHIP + +config PINCTRL_ROCKCHIP + bool "Rockchip pin control drivers" + depends on ARCH_ROCKCHIP && PINCTRL_GENERIC + default y + help + Enable support pin control functions for Rockchip SoCs. + +config SPL_PINCTRL_ROCKCHIP + bool "Support Rockchip pin controllers in SPL" + depends on ARCH_ROCKCHIP && SPL_PINCTRL_GENERIC + default y + help + This option is an SPL-variant of the PINCTRL_ROCKCHIP option. + +endifdrivers/pinctrl/rockchip/Makefile +10
-9@@ -2,12 +2,13 @@ # # Copyright (c) 2017 Rockchip Electronics Co., Ltd -obj-$(CONFIG_PINCTRL_ROCKCHIP_RK3036) += pinctrl_rk3036.o -obj-$(CONFIG_PINCTRL_ROCKCHIP_RK3128) += pinctrl_rk3128.o -obj-$(CONFIG_PINCTRL_ROCKCHIP_RK3188) += pinctrl_rk3188.o -obj-$(CONFIG_PINCTRL_ROCKCHIP_RK322X) += pinctrl_rk322x.o -obj-$(CONFIG_PINCTRL_ROCKCHIP_RK3288) += pinctrl_rk3288.o -obj-$(CONFIG_PINCTRL_ROCKCHIP_RK3328) += pinctrl_rk3328.o -obj-$(CONFIG_PINCTRL_ROCKCHIP_RK3368) += pinctrl_rk3368.o -obj-$(CONFIG_PINCTRL_ROCKCHIP_RK3399) += pinctrl_rk3399.o -obj-$(CONFIG_PINCTRL_ROCKCHIP_RV1108) += pinctrl_rv1108.o +obj-y += pinctrl-rockchip-core.o +obj-$(CONFIG_ROCKCHIP_RK3036) += pinctrl-rk3036.o +obj-$(CONFIG_ROCKCHIP_RK3128) += pinctrl-rk3128.o +obj-$(CONFIG_ROCKCHIP_RK3188) += pinctrl-rk3188.o +obj-$(CONFIG_ROCKCHIP_RK322X) += pinctrl-rk322x.o +obj-$(CONFIG_ROCKCHIP_RK3288) += pinctrl-rk3288.o +obj-$(CONFIG_ROCKCHIP_RK3328) += pinctrl-rk3328.o +obj-$(CONFIG_ROCKCHIP_RK3368) += pinctrl-rk3368.o +obj-$(CONFIG_ROCKCHIP_RK3399) += pinctrl-rk3399.o +obj-$(CONFIG_ROCKCHIP_RV1108) += pinctrl-rv1108.odrivers/pinctrl/rockchip/pinctrl-rk3036.c new file +65
-0@@ -0,0 +1,65 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* (C) Copyright 2019 Rockchip Electronics Co., Ltd +*/ + +#include <common.h> +#include <dm.h> +#include <dm/pinctrl.h> +#include <regmap.h> +#include <syscon.h> + +#include "pinctrl-rockchip.h" + +#define RK3036_PULL_OFFSET 0x118 +#define RK3036_PULL_PINS_PER_REG 16 +#define RK3036_PULL_BANK_STRIDE 8 + +static void rk3036_calc_pull_reg_and_bit (struct rockchip_pin_bank *bank, +int pin_num,struct regmap **regmap, +int *reg,u8 *bit) +{ +struct rockchip_pinctrl_priv *priv = bank->priv; + + *regmap = priv->regmap_base; + *reg =RK3036_PULL_OFFSET ; + *reg += bank->bank_num *RK3036_PULL_BANK_STRIDE ; + *reg += (pin_num /RK3036_PULL_PINS_PER_REG ) *4 ; + + *bit = pin_num %RK3036_PULL_PINS_PER_REG ; +}; + +static struct rockchip_pin_bank rk3036_pin_banks[] = { +PIN_BANK (0 ,32 ,"gpio0" ), +PIN_BANK (1 ,32 ,"gpio1" ), +PIN_BANK (2 ,32 ,"gpio2" ), +}; + +static struct rockchip_pin_ctrl rk3036_pin_ctrl = { + .pin_banks = rk3036_pin_banks, + .nr_banks =ARRAY_SIZE (rk3036_pin_banks), + .label ="RK3036-GPIO" , + .type =RK3036 , + .grf_mux_offset =0xa8 , + .pull_calc_reg = rk3036_calc_pull_reg_and_bit, +}; + +static const struct udevice_id rk3036_pinctrl_ids[] = { + { + .compatible ="rockchip,rk3036-pinctrl" , + .data = (ulong)&rk3036_pin_ctrl + }, + {} +}; + +U_BOOT_DRIVER (pinctrl_rockchip) = { + .name ="rk3036-pinctrl" , + .id =UCLASS_PINCTRL , + .of_match = rk3036_pinctrl_ids, + .priv_auto_alloc_size =sizeof (struct rockchip_pinctrl_priv ), + .ops = &rockchip_pinctrl_ops, +#if !CONFIG_IS_ENABLED(OF_PLATDATA) + .bind = dm_scan_fdt_dev, +#endif + .probe = rockchip_pinctrl_probe, +};drivers/pinctrl/rockchip/pinctrl-rk3128.c new file +155
-0@@ -0,0 +1,155 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* (C) Copyright 2019 Rockchip Electronics Co., Ltd +*/ + +#include <common.h> +#include <dm.h> +#include <dm/pinctrl.h> +#include <regmap.h> +#include <syscon.h> + +#include "pinctrl-rockchip.h" + +static struct rockchip_mux_recalced_data rk3128_mux_recalced_data[] = { + { + .num =2 , + .pin =20 , + .reg =0xe8 , + .bit =0 , + .mask =0x7 + }, { + .num =2 , + .pin =21 , + .reg =0xe8 , + .bit =4 , + .mask =0x7 + }, { + .num =2 , + .pin =22 , + .reg =0xe8 , + .bit =8 , + .mask =0x7 + }, { + .num =2 , + .pin =23 , + .reg =0xe8 , + .bit =12 , + .mask =0x7 + }, { + .num =2 , + .pin =24 , + .reg =0xd4 , + .bit =12 , + .mask =0x7 + }, +}; + +static struct rockchip_mux_route_data rk3128_mux_route_data[] = { + { +/* spi-0 */ + .bank_num =1 , + .pin =10 , + .func =1 , + .route_offset =0x144 , + .route_val =BIT (16 +3 ) |BIT (16 +4 ), + }, { +/* spi-1 */ + .bank_num =1 , + .pin =27 , + .func =3 , + .route_offset =0x144 , + .route_val =BIT (16 +3 ) |BIT (16 +4 ) |BIT (3 ), + }, { +/* spi-2 */ + .bank_num =0 , + .pin =13 , + .func =2 , + .route_offset =0x144 , + .route_val =BIT (16 +3 ) |BIT (16 +4 ) |BIT (4 ), + }, { +/* i2s-0 */ + .bank_num =1 , + .pin =5 , + .func =1 , + .route_offset =0x144 , + .route_val =BIT (16 +5 ), + }, { +/* i2s-1 */ + .bank_num =0 , + .pin =14 , + .func =1 , + .route_offset =0x144 , + .route_val =BIT (16 +5 ) |BIT (5 ), + }, { +/* emmc-0 */ + .bank_num =1 , + .pin =22 , + .func =2 , + .route_offset =0x144 , + .route_val =BIT (16 +6 ), + }, { +/* emmc-1 */ + .bank_num =2 , + .pin =4 , + .func =2 , + .route_offset =0x144 , + .route_val =BIT (16 +6 ) |BIT (6 ), + }, +}; + +#define RK3128_PULL_OFFSET 0x118 +#define RK3128_PULL_PINS_PER_REG 16 +#define RK3128_PULL_BANK_STRIDE 8 + +static void rk3128_calc_pull_reg_and_bit (struct rockchip_pin_bank *bank, +int pin_num,struct regmap **regmap, +int *reg,u8 *bit) +{ +struct rockchip_pinctrl_priv *priv = bank->priv; + + *regmap = priv->regmap_base; + *reg =RK3128_PULL_OFFSET ; + *reg += bank->bank_num *RK3128_PULL_BANK_STRIDE ; + *reg += ((pin_num /RK3128_PULL_PINS_PER_REG ) *4 ); + + *bit = pin_num %RK3128_PULL_PINS_PER_REG ; +} + +static struct rockchip_pin_bank rk3128_pin_banks[] = { +PIN_BANK (0 ,32 ,"gpio0" ), +PIN_BANK (1 ,32 ,"gpio1" ), +PIN_BANK (2 ,32 ,"gpio2" ), +PIN_BANK (3 ,32 ,"gpio3" ), +}; + +static struct rockchip_pin_ctrl rk3128_pin_ctrl = { + .pin_banks = rk3128_pin_banks, + .nr_banks =ARRAY_SIZE (rk3128_pin_banks), + .label ="RK3128-GPIO" , + .type =RK3128 , + .grf_mux_offset =0xa8 , + .iomux_recalced = rk3128_mux_recalced_data, + .niomux_recalced =ARRAY_SIZE (rk3128_mux_recalced_data), + .iomux_routes = rk3128_mux_route_data, + .niomux_routes =ARRAY_SIZE (rk3128_mux_route_data), + .pull_calc_reg = rk3128_calc_pull_reg_and_bit, +}; + +static const struct udevice_id rk3128_pinctrl_ids[] = { + { .compatible ="rockchip,rk3128-pinctrl" , + .data = (ulong)&rk3128_pin_ctrl }, + { } +}; + +U_BOOT_DRIVER (pinctrl_rk3128) = { + .name ="pinctrl_rk3128" , + .id =UCLASS_PINCTRL , + .of_match = rk3128_pinctrl_ids, + .priv_auto_alloc_size =sizeof (struct rockchip_pinctrl_priv ), + .ops = &rockchip_pinctrl_ops, +#if !CONFIG_IS_ENABLED(OF_PLATDATA) + .bind = dm_scan_fdt_dev, +#endif + .probe = rockchip_pinctrl_probe, +};drivers/pinctrl/rockchip/pinctrl-rk3188.c new file +82
-0@@ -0,0 +1,82 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* (C) Copyright 2019 Rockchip Electronics Co., Ltd +*/ + +#include <common.h> +#include <dm.h> +#include <dm/pinctrl.h> +#include <regmap.h> +#include <syscon.h> + +#include "pinctrl-rockchip.h" + +#define RK3188_PULL_OFFSET 0x164 +#define RK3188_PULL_PMU_OFFSET 0x64 + +static void rk3188_calc_pull_reg_and_bit (struct rockchip_pin_bank *bank, +int pin_num,struct regmap **regmap, +int *reg,u8 *bit) +{ +struct rockchip_pinctrl_priv *priv = bank->priv; + +/* The first 12 pins of the first bank are located elsewhere */ +if (bank->bank_num ==0 && pin_num <12 ) { + *regmap = priv->regmap_pmu; + *reg =RK3188_PULL_PMU_OFFSET ; + + *reg += ((pin_num /ROCKCHIP_PULL_PINS_PER_REG ) *4 ); + *bit = pin_num %ROCKCHIP_PULL_PINS_PER_REG ; + *bit *=ROCKCHIP_PULL_BITS_PER_PIN ; + }else { + *regmap = priv->regmap_base; + *reg =RK3188_PULL_OFFSET ; + +/* correct the offset, as it is the 2nd pull register */ + *reg -=4 ; + *reg += bank->bank_num *ROCKCHIP_PULL_BANK_STRIDE ; + *reg += ((pin_num /ROCKCHIP_PULL_PINS_PER_REG ) *4 ); + +/* +* The bits in these registers have an inverse ordering +* with the lowest pin being in bits 15:14 and the highest +* pin in bits 1:0 +*/ + *bit =7 - (pin_num %ROCKCHIP_PULL_PINS_PER_REG ); + *bit *=ROCKCHIP_PULL_BITS_PER_PIN ; + } +} + +static struct rockchip_pin_bank rk3188_pin_banks[] = { +PIN_BANK_IOMUX_FLAGS (0 ,32 ,"gpio0" ,IOMUX_GPIO_ONLY ,0 ,0 ,0 ), +PIN_BANK (1 ,32 ,"gpio1" ), +PIN_BANK (2 ,32 ,"gpio2" ), +PIN_BANK (3 ,32 ,"gpio3" ), +}; + +static struct rockchip_pin_ctrl rk3188_pin_ctrl = { + .pin_banks = rk3188_pin_banks, + .nr_banks =ARRAY_SIZE (rk3188_pin_banks), + .label ="RK3188-GPIO" , + .type =RK3188 , + .grf_mux_offset =0x60 , + .pull_calc_reg = rk3188_calc_pull_reg_and_bit, +}; + +static const struct udevice_id rk3188_pinctrl_ids[] = { + { .compatible ="rockchip,rk3188-pinctrl" , + .data = (ulong)&rk3188_pin_ctrl }, + { } +}; + +U_BOOT_DRIVER (pinctrl_rk3188) = { + .name ="rockchip_rk3188_pinctrl" , + .id =UCLASS_PINCTRL , + .of_match = rk3188_pinctrl_ids, + .priv_auto_alloc_size =sizeof (struct rockchip_pinctrl_priv ), + .ops = &rockchip_pinctrl_ops, +#if !CONFIG_IS_ENABLED(OF_PLATDATA) + .bind = dm_scan_fdt_dev, +#endif + .probe = rockchip_pinctrl_probe, +};drivers/pinctrl/rockchip/pinctrl-rk322x.c new file +215
-0@@ -0,0 +1,215 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* (C) Copyright 2019 Rockchip Electronics Co., Ltd +*/ + +#include <common.h> +#include <dm.h> +#include <dm/pinctrl.h> +#include <regmap.h> +#include <syscon.h> + +#include "pinctrl-rockchip.h" + +static struct rockchip_mux_route_data rk3228_mux_route_data[] = { + { +/* pwm0-0 */ + .bank_num =0 , + .pin =26 , + .func =1 , + .route_offset =0x50 , + .route_val =BIT (16 ), + }, { +/* pwm0-1 */ + .bank_num =3 , + .pin =21 , + .func =1 , + .route_offset =0x50 , + .route_val =BIT (16 ) |BIT (0 ), + }, { +/* pwm1-0 */ + .bank_num =0 , + .pin =27 , + .func =1 , + .route_offset =0x50 , + .route_val =BIT (16 +1 ), + }, { +/* pwm1-1 */ + .bank_num =0 , + .pin =30 , + .func =2 , + .route_offset =0x50 , + .route_val =BIT (16 +1 ) |BIT (1 ), + }, { +/* pwm2-0 */ + .bank_num =0 , + .pin =28 , + .func =1 , + .route_offset =0x50 , + .route_val =BIT (16 +2 ), + }, { +/* pwm2-1 */ + .bank_num =1 , + .pin =12 , + .func =2 , + .route_offset =0x50 , + .route_val =BIT (16 +2 ) |BIT (2 ), + }, { +/* pwm3-0 */ + .bank_num =3 , + .pin =26 , + .func =1 , + .route_offset =0x50 , + .route_val =BIT (16 +3 ), + }, { +/* pwm3-1 */ + .bank_num =1 , + .pin =11 , + .func =2 , + .route_offset =0x50 , + .route_val =BIT (16 +3 ) |BIT (3 ), + }, { +/* sdio-0_d0 */ + .bank_num =1 , + .pin =1 , + .func =1 , + .route_offset =0x50 , + .route_val =BIT (16 +4 ), + }, { +/* sdio-1_d0 */ + .bank_num =3 , + .pin =2 , + .func =1 , + .route_offset =0x50 , + .route_val =BIT (16 +4 ) |BIT (4 ), + }, { +/* spi-0_rx */ + .bank_num =0 , + .pin =13 , + .func =2 , + .route_offset =0x50 , + .route_val =BIT (16 +5 ), + }, { +/* spi-1_rx */ + .bank_num =2 , + .pin =0 , + .func =2 , + .route_offset =0x50 , + .route_val =BIT (16 +5 ) |BIT (5 ), + }, { +/* emmc-0_cmd */ + .bank_num =1 , + .pin =22 , + .func =2 , + .route_offset =0x50 , + .route_val =BIT (16 +7 ), + }, { +/* emmc-1_cmd */ + .bank_num =2 , + .pin =4 , + .func =2 , + .route_offset =0x50 , + .route_val =BIT (16 +7 ) |BIT (7 ), + }, { +/* uart2-0_rx */ + .bank_num =1 , + .pin =19 , + .func =2 , + .route_offset =0x50 , + .route_val =BIT (16 +8 ), + }, { +/* uart2-1_rx */ + .bank_num =1 , + .pin =10 , + .func =2 , + .route_offset =0x50 , + .route_val =BIT (16 +8 ) |BIT (8 ), + }, { +/* uart1-0_rx */ + .bank_num =1 , + .pin =10 , + .func =1 , + .route_offset =0x50 , + .route_val =BIT (16 +11 ), + }, { +/* uart1-1_rx */ + .bank_num =3 , + .pin =13 , + .func =1 , + .route_offset =0x50 , + .route_val =BIT (16 +11 ) |BIT (11 ), + }, +}; + +#define RK3228_PULL_OFFSET 0x100 + +static void rk3228_calc_pull_reg_and_bit (struct rockchip_pin_bank *bank, +int pin_num,struct regmap **regmap, +int *reg,u8 *bit) +{ +struct rockchip_pinctrl_priv *priv = bank->priv; + + *regmap = priv->regmap_base; + *reg =RK3228_PULL_OFFSET ; + *reg += bank->bank_num *ROCKCHIP_PULL_BANK_STRIDE ; + *reg += ((pin_num /ROCKCHIP_PULL_PINS_PER_REG ) *4 ); + + *bit = (pin_num %ROCKCHIP_PULL_PINS_PER_REG ); + *bit *=ROCKCHIP_PULL_BITS_PER_PIN ; +} + +#define RK3228_DRV_GRF_OFFSET 0x200 + +static void rk3228_calc_drv_reg_and_bit (struct rockchip_pin_bank *bank, +int pin_num,struct regmap **regmap, +int *reg,u8 *bit) +{ +struct rockchip_pinctrl_priv *priv = bank->priv; + + *regmap = priv->regmap_base; + *reg =RK3228_DRV_GRF_OFFSET ; + *reg += bank->bank_num *ROCKCHIP_DRV_BANK_STRIDE ; + *reg += ((pin_num /ROCKCHIP_DRV_PINS_PER_REG ) *4 ); + + *bit = (pin_num %ROCKCHIP_DRV_PINS_PER_REG ); + *bit *=ROCKCHIP_DRV_BITS_PER_PIN ; +} + +static struct rockchip_pin_bank rk3228_pin_banks[] = { +PIN_BANK (0 ,32 ,"gpio0" ), +PIN_BANK (1 ,32 ,"gpio1" ), +PIN_BANK (2 ,32 ,"gpio2" ), +PIN_BANK (3 ,32 ,"gpio3" ), +}; + +static struct rockchip_pin_ctrl rk3228_pin_ctrl = { + .pin_banks = rk3228_pin_banks, + .nr_banks =ARRAY_SIZE (rk3228_pin_banks), + .label ="RK3228-GPIO" , + .type =RK3288 , + .grf_mux_offset =0x0 , + .iomux_routes = rk3228_mux_route_data, + .niomux_routes =ARRAY_SIZE (rk3228_mux_route_data), + .pull_calc_reg = rk3228_calc_pull_reg_and_bit, + .drv_calc_reg = rk3228_calc_drv_reg_and_bit, +}; + +static const struct udevice_id rk3228_pinctrl_ids[] = { + { + .compatible ="rockchip,rk3228-pinctrl" , + .data = (ulong)&rk3228_pin_ctrl + }, + { } +}; + +U_BOOT_DRIVER (pinctrl_rk3228) = { + .name ="rockchip_rk3228_pinctrl" , + .id =UCLASS_PINCTRL , + .of_match = rk3228_pinctrl_ids, + .priv_auto_alloc_size =sizeof (struct rockchip_pinctrl_priv ), + .ops = &rockchip_pinctrl_ops, +#if !CONFIG_IS_ENABLED(OF_PLATDATA) + .bind = dm_scan_fdt_dev, +#endif + .probe = rockchip_pinctrl_probe, +};drivers/pinctrl/rockchip/pinctrl-rk3288.c new file +157
-0@@ -0,0 +1,157 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* (C) Copyright 2019 Rockchip Electronics Co., Ltd +*/ + +#include <common.h> +#include <dm.h> +#include <dm/pinctrl.h> +#include <regmap.h> +#include <syscon.h> + +#include "pinctrl-rockchip.h" + +static struct rockchip_mux_route_data rk3288_mux_route_data[] = { + { +/* edphdmi_cecinoutt1 */ + .bank_num =7 , + .pin =16 , + .func =2 , + .route_offset =0x264 , + .route_val =BIT (16 +12 ) |BIT (12 ), + }, { +/* edphdmi_cecinout */ + .bank_num =7 , + .pin =23 , + .func =4 , + .route_offset =0x264 , + .route_val =BIT (16 +12 ), + }, +}; + +#define RK3288_PULL_OFFSET 0x140 +#define RK3288_PULL_PMU_OFFSET 0x64 + +static void rk3288_calc_pull_reg_and_bit (struct rockchip_pin_bank *bank, +int pin_num,struct regmap **regmap, +int *reg,u8 *bit) +{ +struct rockchip_pinctrl_priv *priv = bank->priv; + +/* The first 24 pins of the first bank are located in PMU */ +if (bank->bank_num ==0 ) { + *regmap = priv->regmap_pmu; + *reg =RK3288_PULL_PMU_OFFSET ; + + *reg += ((pin_num /ROCKCHIP_PULL_PINS_PER_REG ) *4 ); + *bit = pin_num %ROCKCHIP_PULL_PINS_PER_REG ; + *bit *=ROCKCHIP_PULL_BITS_PER_PIN ; + }else { + *regmap = priv->regmap_base; + *reg =RK3288_PULL_OFFSET ; + +/* correct the offset, as we're starting with the 2nd bank */ + *reg -=0x10 ; + *reg += bank->bank_num *ROCKCHIP_PULL_BANK_STRIDE ; + *reg += ((pin_num /ROCKCHIP_PULL_PINS_PER_REG ) *4 ); + + *bit = (pin_num %ROCKCHIP_PULL_PINS_PER_REG ); + *bit *=ROCKCHIP_PULL_BITS_PER_PIN ; + } +} + +#define RK3288_DRV_PMU_OFFSET 0x70 +#define RK3288_DRV_GRF_OFFSET 0x1c0 + +static void rk3288_calc_drv_reg_and_bit (struct rockchip_pin_bank *bank, +int pin_num,struct regmap **regmap, +int *reg,u8 *bit) +{ +struct rockchip_pinctrl_priv *priv = bank->priv; + +/* The first 24 pins of the first bank are located in PMU */ +if (bank->bank_num ==0 ) { + *regmap = priv->regmap_pmu; + *reg =RK3288_DRV_PMU_OFFSET ; + + *reg += ((pin_num /ROCKCHIP_DRV_PINS_PER_REG ) *4 ); + *bit = pin_num %ROCKCHIP_DRV_PINS_PER_REG ; + *bit *=ROCKCHIP_DRV_BITS_PER_PIN ; + }else { + *regmap = priv->regmap_base; + *reg =RK3288_DRV_GRF_OFFSET ; + +/* correct the offset, as we're starting with the 2nd bank */ + *reg -=0x10 ; + *reg += bank->bank_num *ROCKCHIP_DRV_BANK_STRIDE ; + *reg += ((pin_num /ROCKCHIP_DRV_PINS_PER_REG ) *4 ); + + *bit = (pin_num %ROCKCHIP_DRV_PINS_PER_REG ); + *bit *=ROCKCHIP_DRV_BITS_PER_PIN ; + } +} + +static struct rockchip_pin_bank rk3288_pin_banks[] = { +PIN_BANK_IOMUX_FLAGS (0 ,24 ,"gpio0" ,IOMUX_SOURCE_PMU , +IOMUX_SOURCE_PMU , +IOMUX_SOURCE_PMU , +IOMUX_UNROUTED + ), +PIN_BANK_IOMUX_FLAGS (1 ,32 ,"gpio1" ,IOMUX_UNROUTED , +IOMUX_UNROUTED , +IOMUX_UNROUTED , +0 + ), +PIN_BANK_IOMUX_FLAGS (2 ,32 ,"gpio2" ,0 ,0 ,0 ,IOMUX_UNROUTED ), +PIN_BANK_IOMUX_FLAGS (3 ,32 ,"gpio3" ,0 ,0 ,0 ,IOMUX_WIDTH_4BIT ), +PIN_BANK_IOMUX_FLAGS (4 ,32 ,"gpio4" ,IOMUX_WIDTH_4BIT , +IOMUX_WIDTH_4BIT , +0 , +0 + ), +PIN_BANK_IOMUX_FLAGS (5 ,32 ,"gpio5" ,IOMUX_UNROUTED , +0 , +0 , +IOMUX_UNROUTED + ), +PIN_BANK_IOMUX_FLAGS (6 ,32 ,"gpio6" ,0 ,0 ,0 ,IOMUX_UNROUTED ), +PIN_BANK_IOMUX_FLAGS (7 ,32 ,"gpio7" ,0 , +0 , +IOMUX_WIDTH_4BIT , +IOMUX_UNROUTED + ), +PIN_BANK (8 ,16 ,"gpio8" ), +}; + +static struct rockchip_pin_ctrl rk3288_pin_ctrl = { + .pin_banks = rk3288_pin_banks, + .nr_banks =ARRAY_SIZE (rk3288_pin_banks), + .label ="RK3288-GPIO" , + .type =RK3288 , + .grf_mux_offset =0x0 , + .pmu_mux_offset =0x84 , + .iomux_routes = rk3288_mux_route_data, + .niomux_routes =ARRAY_SIZE (rk3288_mux_route_data), + .pull_calc_reg = rk3288_calc_pull_reg_and_bit, + .drv_calc_reg = rk3288_calc_drv_reg_and_bit, +}; + +static const struct udevice_id rk3288_pinctrl_ids[] = { + { + .compatible ="rockchip,rk3288-pinctrl" , + .data = (ulong)&rk3288_pin_ctrl + }, + { } +}; + +U_BOOT_DRIVER (pinctrl_rk3288) = { + .name ="rockchip_rk3288_pinctrl" , + .id =UCLASS_PINCTRL , + .of_match = rk3288_pinctrl_ids, + .priv_auto_alloc_size =sizeof (struct rockchip_pinctrl_priv ), + .ops = &rockchip_pinctrl_ops, +#if !CONFIG_IS_ENABLED(OF_PLATDATA) + .bind = dm_scan_fdt_dev, +#endif + .probe = rockchip_pinctrl_probe, +};drivers/pinctrl/rockchip/pinctrl-rk3328.c new file +227
-0@@ -0,0 +1,227 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* (C) Copyright 2019 Rockchip Electronics Co., Ltd +*/ + +#include <common.h> +#include <dm.h> +#include <dm/pinctrl.h> +#include <regmap.h> +#include <syscon.h> + +#include "pinctrl-rockchip.h" + +static struct rockchip_mux_recalced_data rk3328_mux_recalced_data[] = { + { + .num =2 , + .pin =12 , + .reg =0x24 , + .bit =8 , + .mask =0x3 + }, { + .num =2 , + .pin =15 , + .reg =0x28 , + .bit =0 , + .mask =0x7 + }, { + .num =2 , + .pin =23 , + .reg =0x30 , + .bit =14 , + .mask =0x3 + }, +}; + +static struct rockchip_mux_route_data rk3328_mux_route_data[] = { + { +/* uart2dbg_rxm0 */ + .bank_num =1 , + .pin =1 , + .func =2 , + .route_offset =0x50 , + .route_val =BIT (16 ) |BIT (16 +1 ), + }, { +/* uart2dbg_rxm1 */ + .bank_num =2 , + .pin =1 , + .func =1 , + .route_offset =0x50 , + .route_val =BIT (16 ) |BIT (16 +1 ) |BIT (0 ), + }, { +/* gmac-m1_rxd0 */ + .bank_num =1 , + .pin =11 , + .func =2 , + .route_offset =0x50 , + .route_val =BIT (16 +2 ) |BIT (2 ), + }, { +/* gmac-m1-optimized_rxd3 */ + .bank_num =1 , + .pin =14 , + .func =2 , + .route_offset =0x50 , + .route_val =BIT (16 +10 ) |BIT (10 ), + }, { +/* pdm_sdi0m0 */ + .bank_num =2 , + .pin =19 , + .func =2 , + .route_offset =0x50 , + .route_val =BIT (16 +3 ), + }, { +/* pdm_sdi0m1 */ + .bank_num =1 , + .pin =23 , + .func =3 , + .route_offset =0x50 , + .route_val =BIT (16 +3 ) |BIT (3 ), + }, { +/* spi_rxdm2 */ + .bank_num =3 , + .pin =2 , + .func =4 , + .route_offset =0x50 , + .route_val =BIT (16 +4 ) |BIT (16 +5 ) |BIT (5 ), + }, { +/* i2s2_sdim0 */ + .bank_num =1 , + .pin =24 , + .func =1 , + .route_offset =0x50 , + .route_val =BIT (16 +6 ), + }, { +/* i2s2_sdim1 */ + .bank_num =3 , + .pin =2 , + .func =6 , + .route_offset =0x50 , + .route_val =BIT (16 +6 ) |BIT (6 ), + }, { +/* card_iom1 */ + .bank_num =2 , + .pin =22 , + .func =3 , + .route_offset =0x50 , + .route_val =BIT (16 +7 ) |BIT (7 ), + }, { +/* tsp_d5m1 */ + .bank_num =2 , + .pin =16 , + .func =3 , + .route_offset =0x50 , + .route_val =BIT (16 +8 ) |BIT (8 ), + }, { +/* cif_data5m1 */ + .bank_num =2 , + .pin =16 , + .func =4 , + .route_offset =0x50 , + .route_val =BIT (16 +9 ) |BIT (9 ), + }, +}; + +#define RK3328_PULL_OFFSET 0x100 + +static void rk3328_calc_pull_reg_and_bit (struct rockchip_pin_bank *bank, +int pin_num,struct regmap **regmap, +int *reg,u8 *bit) +{ +struct rockchip_pinctrl_priv *priv = bank->priv; + + *regmap = priv->regmap_base; + *reg =RK3328_PULL_OFFSET ; + *reg += bank->bank_num *ROCKCHIP_PULL_BANK_STRIDE ; + *reg += ((pin_num /ROCKCHIP_PULL_PINS_PER_REG ) *4 ); + + *bit = (pin_num %ROCKCHIP_PULL_PINS_PER_REG ); + *bit *=ROCKCHIP_PULL_BITS_PER_PIN ; +} + +#define RK3328_DRV_GRF_OFFSET 0x200 + +static void rk3328_calc_drv_reg_and_bit (struct rockchip_pin_bank *bank, +int pin_num,struct regmap **regmap, +int *reg,u8 *bit) +{ +struct rockchip_pinctrl_priv *priv = bank->priv; + + *regmap = priv->regmap_base; + *reg =RK3328_DRV_GRF_OFFSET ; + *reg += bank->bank_num *ROCKCHIP_DRV_BANK_STRIDE ; + *reg += ((pin_num /ROCKCHIP_DRV_PINS_PER_REG ) *4 ); + + *bit = (pin_num %ROCKCHIP_DRV_PINS_PER_REG ); + *bit *=ROCKCHIP_DRV_BITS_PER_PIN ; +} + +#define RK3328_SCHMITT_BITS_PER_PIN 1 +#define RK3328_SCHMITT_PINS_PER_REG 16 +#define RK3328_SCHMITT_BANK_STRIDE 8 +#define RK3328_SCHMITT_GRF_OFFSET 0x380 + +static int rk3328_calc_schmitt_reg_and_bit (struct rockchip_pin_bank *bank, +int pin_num, +struct regmap **regmap, +int *reg,u8 *bit) +{ +struct rockchip_pinctrl_priv *priv = bank->priv; + + *regmap = priv->regmap_base; + *reg =RK3328_SCHMITT_GRF_OFFSET ; + + *reg += bank->bank_num *RK3328_SCHMITT_BANK_STRIDE ; + *reg += ((pin_num /RK3328_SCHMITT_PINS_PER_REG ) *4 ); + *bit = pin_num %RK3328_SCHMITT_PINS_PER_REG ; + +return 0 ; +} + +static struct rockchip_pin_bank rk3328_pin_banks[] = { +PIN_BANK_IOMUX_FLAGS (0 ,32 ,"gpio0" ,0 ,0 ,0 ,0 ), +PIN_BANK_IOMUX_FLAGS (1 ,32 ,"gpio1" ,0 ,0 ,0 ,0 ), +PIN_BANK_IOMUX_FLAGS (2 ,32 ,"gpio2" ,0 , +IOMUX_WIDTH_3BIT , +IOMUX_WIDTH_3BIT , +0 ), +PIN_BANK_IOMUX_FLAGS (3 ,32 ,"gpio3" , +IOMUX_WIDTH_3BIT , +IOMUX_WIDTH_3BIT , +0 , +0 ), +}; + +static struct rockchip_pin_ctrl rk3328_pin_ctrl = { + .pin_banks = rk3328_pin_banks, + .nr_banks =ARRAY_SIZE (rk3328_pin_banks), + .label ="RK3328-GPIO" , + .type =RK3288 , + .grf_mux_offset =0x0 , + .iomux_recalced = rk3328_mux_recalced_data, + .niomux_recalced =ARRAY_SIZE (rk3328_mux_recalced_data), + .iomux_routes = rk3328_mux_route_data, + .niomux_routes =ARRAY_SIZE (rk3328_mux_route_data), + .pull_calc_reg = rk3328_calc_pull_reg_and_bit, + .drv_calc_reg = rk3328_calc_drv_reg_and_bit, + .schmitt_calc_reg = rk3328_calc_schmitt_reg_and_bit, +}; + +static const struct udevice_id rk3328_pinctrl_ids[] = { + { + .compatible ="rockchip,rk3328-pinctrl" , + .data = (ulong)&rk3328_pin_ctrl + }, + { } +}; + +U_BOOT_DRIVER (pinctrl_rk3328) = { + .name ="rockchip_rk3328_pinctrl" , + .id =UCLASS_PINCTRL , + .of_match = rk3328_pinctrl_ids, + .priv_auto_alloc_size =sizeof (struct rockchip_pinctrl_priv ), + .ops = &rockchip_pinctrl_ops, +#if !CONFIG_IS_ENABLED(OF_PLATDATA) + .bind = dm_scan_fdt_dev, +#endif + .probe = rockchip_pinctrl_probe, +};drivers/pinctrl/rockchip/pinctrl-rk3368.c new file +116
-0@@ -0,0 +1,116 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* (C) Copyright 2019 Rockchip Electronics Co., Ltd +*/ + +#include <common.h> +#include <dm.h> +#include <dm/pinctrl.h> +#include <regmap.h> +#include <syscon.h> + +#include "pinctrl-rockchip.h" + +#define RK3368_PULL_GRF_OFFSET 0x100 +#define RK3368_PULL_PMU_OFFSET 0x10 + +static void rk3368_calc_pull_reg_and_bit (struct rockchip_pin_bank *bank, +int pin_num,struct regmap **regmap, +int *reg,u8 *bit) +{ +struct rockchip_pinctrl_priv *priv = bank->priv; + +/* The first 32 pins of the first bank are located in PMU */ +if (bank->bank_num ==0 ) { + *regmap = priv->regmap_pmu; + *reg =RK3368_PULL_PMU_OFFSET ; + + *reg += ((pin_num /ROCKCHIP_PULL_PINS_PER_REG ) *4 ); + *bit = pin_num %ROCKCHIP_PULL_PINS_PER_REG ; + *bit *=ROCKCHIP_PULL_BITS_PER_PIN ; + }else { + *regmap = priv->regmap_base; + *reg =RK3368_PULL_GRF_OFFSET ; + +/* correct the offset, as we're starting with the 2nd bank */ + *reg -=0x10 ; + *reg += bank->bank_num *ROCKCHIP_PULL_BANK_STRIDE ; + *reg += ((pin_num /ROCKCHIP_PULL_PINS_PER_REG ) *4 ); + + *bit = (pin_num %ROCKCHIP_PULL_PINS_PER_REG ); + *bit *=ROCKCHIP_PULL_BITS_PER_PIN ; + } +} + +#define RK3368_DRV_PMU_OFFSET 0x20 +#define RK3368_DRV_GRF_OFFSET 0x200 + +static void rk3368_calc_drv_reg_and_bit (struct rockchip_pin_bank *bank, +int pin_num,struct regmap **regmap, +int *reg,u8 *bit) +{ +struct rockchip_pinctrl_priv *priv = bank->priv; + +/* The first 32 pins of the first bank are located in PMU */ +if (bank->bank_num ==0 ) { + *regmap = priv->regmap_pmu; + *reg =RK3368_DRV_PMU_OFFSET ; + + *reg += ((pin_num /ROCKCHIP_DRV_PINS_PER_REG ) *4 ); + *bit = pin_num %ROCKCHIP_DRV_PINS_PER_REG ; + *bit *=ROCKCHIP_DRV_BITS_PER_PIN ; + }else { + *regmap = priv->regmap_base; + *reg =RK3368_DRV_GRF_OFFSET ; + +/* correct the offset, as we're starting with the 2nd bank */ + *reg -=0x10 ; + *reg += bank->bank_num *ROCKCHIP_DRV_BANK_STRIDE ; + *reg += ((pin_num /ROCKCHIP_DRV_PINS_PER_REG ) *4 ); + + *bit = (pin_num %ROCKCHIP_DRV_PINS_PER_REG ); + *bit *=ROCKCHIP_DRV_BITS_PER_PIN ; + } +} + +static struct rockchip_pin_bank rk3368_pin_banks[] = { +PIN_BANK_IOMUX_FLAGS (0 ,32 ,"gpio0" ,IOMUX_SOURCE_PMU , +IOMUX_SOURCE_PMU , +IOMUX_SOURCE_PMU , +IOMUX_SOURCE_PMU + ), +PIN_BANK (1 ,32 ,"gpio1" ), +PIN_BANK (2 ,32 ,"gpio2" ), +PIN_BANK (3 ,32 ,"gpio3" ), +}; + +static struct rockchip_pin_ctrl rk3368_pin_ctrl = { + .pin_banks = rk3368_pin_banks, + .nr_banks =ARRAY_SIZE (rk3368_pin_banks), + .label ="RK3368-GPIO" , + .type =RK3368 , + .grf_mux_offset =0x0 , + .pmu_mux_offset =0x0 , + .pull_calc_reg = rk3368_calc_pull_reg_and_bit, + .drv_calc_reg = rk3368_calc_drv_reg_and_bit, +}; + +static const struct udevice_id rk3368_pinctrl_ids[] = { + { + .compatible ="rockchip,rk3368-pinctrl" , + .data = (ulong)&rk3368_pin_ctrl + }, + { } +}; + +U_BOOT_DRIVER (pinctrl_rk3368) = { + .name ="rockchip_rk3368_pinctrl" , + .id =UCLASS_PINCTRL , + .of_match = rk3368_pinctrl_ids, + .priv_auto_alloc_size =sizeof (struct rockchip_pinctrl_priv ), + .ops = &rockchip_pinctrl_ops, +#if !CONFIG_IS_ENABLED(OF_PLATDATA) + .bind = dm_scan_fdt_dev, +#endif + .probe = rockchip_pinctrl_probe, +};drivers/pinctrl/rockchip/pinctrl-rk3399.c new file +193
-0@@ -0,0 +1,193 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* (C) Copyright 2019 Rockchip Electronics Co., Ltd +*/ + +#include <common.h> +#include <dm.h> +#include <dm/pinctrl.h> +#include <regmap.h> +#include <syscon.h> + +#include "pinctrl-rockchip.h" + +static struct rockchip_mux_route_data rk3399_mux_route_data[] = { + { +/* uart2dbga_rx */ + .bank_num =4 , + .pin =8 , + .func =2 , + .route_offset =0xe21c , + .route_val =BIT (16 +10 ) |BIT (16 +11 ), + }, { +/* uart2dbgb_rx */ + .bank_num =4 , + .pin =16 , + .func =2 , + .route_offset =0xe21c , + .route_val =BIT (16 +10 ) |BIT (16 +11 ) |BIT (10 ), + }, { +/* uart2dbgc_rx */ + .bank_num =4 , + .pin =19 , + .func =1 , + .route_offset =0xe21c , + .route_val =BIT (16 +10 ) |BIT (16 +11 ) |BIT (11 ), + }, { +/* pcie_clkreqn */ + .bank_num =2 , + .pin =26 , + .func =2 , + .route_offset =0xe21c , + .route_val =BIT (16 +14 ), + }, { +/* pcie_clkreqnb */ + .bank_num =4 , + .pin =24 , + .func =1 , + .route_offset =0xe21c , + .route_val =BIT (16 +14 ) |BIT (14 ), + }, +}; + +#define RK3399_PULL_GRF_OFFSET 0xe040 +#define RK3399_PULL_PMU_OFFSET 0x40 + +static void rk3399_calc_pull_reg_and_bit (struct rockchip_pin_bank *bank, +int pin_num,struct regmap **regmap, +int *reg,u8 *bit) +{ +struct rockchip_pinctrl_priv *priv = bank->priv; + +/* The bank0:16 and bank1:32 pins are located in PMU */ +if (bank->bank_num ==0 || bank->bank_num ==1 ) { + *regmap = priv->regmap_pmu; + *reg =RK3399_PULL_PMU_OFFSET ; + + *reg += bank->bank_num *ROCKCHIP_PULL_BANK_STRIDE ; + + *reg += ((pin_num /ROCKCHIP_PULL_PINS_PER_REG ) *4 ); + *bit = pin_num %ROCKCHIP_PULL_PINS_PER_REG ; + *bit *=ROCKCHIP_PULL_BITS_PER_PIN ; + }else { + *regmap = priv->regmap_base; + *reg =RK3399_PULL_GRF_OFFSET ; + +/* correct the offset, as we're starting with the 3rd bank */ + *reg -=0x20 ; + *reg += bank->bank_num *ROCKCHIP_PULL_BANK_STRIDE ; + *reg += ((pin_num /ROCKCHIP_PULL_PINS_PER_REG ) *4 ); + + *bit = (pin_num %ROCKCHIP_PULL_PINS_PER_REG ); + *bit *=ROCKCHIP_PULL_BITS_PER_PIN ; + } +} + +static void rk3399_calc_drv_reg_and_bit (struct rockchip_pin_bank *bank, +int pin_num,struct regmap **regmap, +int *reg,u8 *bit) +{ +struct rockchip_pinctrl_priv *priv = bank->priv; +int drv_num = (pin_num /8 ); + +/* The bank0:16 and bank1:32 pins are located in PMU */ +if (bank->bank_num ==0 || bank->bank_num ==1 ) + *regmap = priv->regmap_pmu; +else + *regmap = priv->regmap_base; + + *reg = bank->drv[drv_num].offset; +if (bank->drv[drv_num].drv_type ==DRV_TYPE_IO_1V8_3V0_AUTO || + bank->drv[drv_num].drv_type ==DRV_TYPE_IO_3V3_ONLY ) + *bit = (pin_num %8 ) *3 ; +else + *bit = (pin_num %8 ) *2 ; +} + +static struct rockchip_pin_bank rk3399_pin_banks[] = { +PIN_BANK_IOMUX_FLAGS_DRV_FLAGS_OFFSET_PULL_FLAGS (0 ,32 ,"gpio0" , +IOMUX_SOURCE_PMU , +IOMUX_SOURCE_PMU , +IOMUX_SOURCE_PMU , +IOMUX_SOURCE_PMU , +DRV_TYPE_IO_1V8_ONLY , +DRV_TYPE_IO_1V8_ONLY , +DRV_TYPE_IO_DEFAULT , +DRV_TYPE_IO_DEFAULT , +0x80 , +0x88 , +-1 , +-1 , +PULL_TYPE_IO_1V8_ONLY , +PULL_TYPE_IO_1V8_ONLY , +PULL_TYPE_IO_DEFAULT , +PULL_TYPE_IO_DEFAULT + ), +PIN_BANK_IOMUX_DRV_FLAGS_OFFSET (1 ,32 ,"gpio1" ,IOMUX_SOURCE_PMU , +IOMUX_SOURCE_PMU , +IOMUX_SOURCE_PMU , +IOMUX_SOURCE_PMU , +DRV_TYPE_IO_1V8_OR_3V0 , +DRV_TYPE_IO_1V8_OR_3V0 , +DRV_TYPE_IO_1V8_OR_3V0 , +DRV_TYPE_IO_1V8_OR_3V0 , +0xa0 , +0xa8 , +0xb0 , +0xb8 + ), +PIN_BANK_DRV_FLAGS_PULL_FLAGS (2 ,32 ,"gpio2" ,DRV_TYPE_IO_1V8_OR_3V0 , +DRV_TYPE_IO_1V8_OR_3V0 , +DRV_TYPE_IO_1V8_ONLY , +DRV_TYPE_IO_1V8_ONLY , +PULL_TYPE_IO_DEFAULT , +PULL_TYPE_IO_DEFAULT , +PULL_TYPE_IO_1V8_ONLY , +PULL_TYPE_IO_1V8_ONLY + ), +PIN_BANK_DRV_FLAGS (3 ,32 ,"gpio3" ,DRV_TYPE_IO_3V3_ONLY , +DRV_TYPE_IO_3V3_ONLY , +DRV_TYPE_IO_3V3_ONLY , +DRV_TYPE_IO_1V8_OR_3V0 + ), +PIN_BANK_DRV_FLAGS (4 ,32 ,"gpio4" ,DRV_TYPE_IO_1V8_OR_3V0 , +DRV_TYPE_IO_1V8_3V0_AUTO , +DRV_TYPE_IO_1V8_OR_3V0 , +DRV_TYPE_IO_1V8_OR_3V0 + ), +}; + +static struct rockchip_pin_ctrl rk3399_pin_ctrl = { + .pin_banks = rk3399_pin_banks, + .nr_banks =ARRAY_SIZE (rk3399_pin_banks), + .label ="RK3399-GPIO" , + .type =RK3399 , + .grf_mux_offset =0xe000 , + .pmu_mux_offset =0x0 , + .grf_drv_offset =0xe100 , + .pmu_drv_offset =0x80 , + .iomux_routes = rk3399_mux_route_data, + .niomux_routes =ARRAY_SIZE (rk3399_mux_route_data), + .pull_calc_reg = rk3399_calc_pull_reg_and_bit, + .drv_calc_reg = rk3399_calc_drv_reg_and_bit, +}; + +static const struct udevice_id rk3399_pinctrl_ids[] = { + { + .compatible ="rockchip,rk3399-pinctrl" , + .data = (ulong)&rk3399_pin_ctrl + }, + { } +}; + +U_BOOT_DRIVER (pinctrl_rk3399) = { + .name ="rockchip_rk3399_pinctrl" , + .id =UCLASS_PINCTRL , + .of_match = rk3399_pinctrl_ids, + .priv_auto_alloc_size =sizeof (struct rockchip_pinctrl_priv ), + .ops = &rockchip_pinctrl_ops, +#if !CONFIG_IS_ENABLED(OF_PLATDATA) + .bind = dm_scan_fdt_dev, +#endif + .probe = rockchip_pinctrl_probe, +};drivers/pinctrl/rockchip/pinctrl-rockchip-core.c new file +788
-0@@ -0,0 +1,788 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* (C) Copyright 2019 Rockchip Electronics Co., Ltd +*/ + +#include <common.h> +#include <dm.h> +#include <dm/pinctrl.h> +#include <regmap.h> +#include <syscon.h> +#include <fdtdec.h> + +#include "pinctrl-rockchip.h" + +#define MAX_ROCKCHIP_PINS_ENTRIES 30 +#define MAX_ROCKCHIP_GPIO_PER_BANK 32 +#define RK_FUNC_GPIO 0 + +static int rockchip_verify_config (struct udevice *dev,u32 bank,u32 pin) +{ +struct rockchip_pinctrl_priv *priv =dev_get_priv (dev); +struct rockchip_pin_ctrl *ctrl = priv->ctrl; + +if (bank >= ctrl->nr_banks) { +debug ("pin conf bank %d >= nbanks %d\n" , bank, ctrl->nr_banks); +return -EINVAL ; + } + +if (pin >=MAX_ROCKCHIP_GPIO_PER_BANK ) { +debug ("pin conf pin %d >= %d\n" , pin, +MAX_ROCKCHIP_GPIO_PER_BANK ); +return -EINVAL ; + } + +return 0 ; +} + +static void rockchip_get_recalced_mux (struct rockchip_pin_bank *bank,int pin, +int *reg,u8 *bit,int *mask) +{ +struct rockchip_pinctrl_priv *priv = bank->priv; +struct rockchip_pin_ctrl *ctrl = priv->ctrl; +struct rockchip_mux_recalced_data *data; +int i; + +for (i =0 ; i < ctrl->niomux_recalced; i++) { + data = &ctrl->iomux_recalced[i]; +if (data->num == bank->bank_num && + data->pin == pin) +break ; + } + +if (i >= ctrl->niomux_recalced) +return ; + + *reg = data->reg; + *mask = data->mask; + *bit = data->bit; +} + +static bool rockchip_get_mux_route (struct rockchip_pin_bank *bank,int pin, +int mux,u32 *reg,u32 *value) +{ +struct rockchip_pinctrl_priv *priv = bank->priv; +struct rockchip_pin_ctrl *ctrl = priv->ctrl; +struct rockchip_mux_route_data *data; +int i; + +for (i =0 ; i < ctrl->niomux_routes; i++) { + data = &ctrl->iomux_routes[i]; +if (data->bank_num == bank->bank_num && + data->pin == pin && data->func == mux) +break ; + } + +if (i >= ctrl->niomux_routes) +return false; + + *reg = data->route_offset; + *value = data->route_val; + +return true; +} + +static int rockchip_get_mux_data (int mux_type,int pin,u8 *bit,int *mask) +{ +int offset =0 ; + +if (mux_type &IOMUX_WIDTH_4BIT ) { +if ((pin %8 ) >=4 ) + offset =0x4 ; + *bit = (pin %4 ) *4 ; + *mask =0xf ; + }else if (mux_type &IOMUX_WIDTH_3BIT ) { +/* +* pin0 ~ pin4 are at first register, and +* pin5 ~ pin7 are at second register. +*/ +if ((pin %8 ) >=5 ) + offset =0x4 ; + *bit = (pin %8 %5 ) *3 ; + *mask =0x7 ; + }else { + *bit = (pin %8 ) *2 ; + *mask =0x3 ; + } + +return offset; +} + +static int rockchip_get_mux (struct rockchip_pin_bank *bank,int pin) +{ +struct rockchip_pinctrl_priv *priv = bank->priv; +int iomux_num = (pin /8 ); +struct regmap *regmap; +unsigned int val; +int reg, ret, mask, mux_type; +u8 bit; + +if (iomux_num >3 ) +return -EINVAL ; + +if (bank->iomux[iomux_num].type &IOMUX_UNROUTED ) { +debug ("pin %d is unrouted\n" , pin); +return -EINVAL ; + } + +if (bank->iomux[iomux_num].type &IOMUX_GPIO_ONLY ) +return RK_FUNC_GPIO ; + + regmap = (bank->iomux[iomux_num].type &IOMUX_SOURCE_PMU ) + ? priv->regmap_pmu : priv->regmap_base; + +/* get basic quadrupel of mux registers and the correct reg inside */ + mux_type = bank->iomux[iomux_num].type; + reg = bank->iomux[iomux_num].offset; + reg +=rockchip_get_mux_data (mux_type, pin, &bit, &mask); + +if (bank->recalced_mask &BIT (pin)) +rockchip_get_recalced_mux (bank, pin, ®, &bit, &mask); + + ret =regmap_read (regmap, reg, &val); +if (ret) +return ret; + +return ((val >> bit) & mask); +} + +static int rockchip_pinctrl_get_gpio_mux (struct udevice *dev,int banknum, +int index) +{struct rockchip_pinctrl_priv *priv =dev_get_priv (dev); +struct rockchip_pin_ctrl *ctrl = priv->ctrl; + +return rockchip_get_mux (&ctrl->pin_banks[banknum], index); +} + +static int rockchip_verify_mux (struct rockchip_pin_bank *bank, +int pin,int mux) +{ +int iomux_num = (pin /8 ); + +if (iomux_num >3 ) +return -EINVAL ; + +if (bank->iomux[iomux_num].type &IOMUX_UNROUTED ) { +debug ("pin %d is unrouted\n" , pin); +return -EINVAL ; + } + +if (bank->iomux[iomux_num].type &IOMUX_GPIO_ONLY ) { +if (mux !=IOMUX_GPIO_ONLY ) { +debug ("pin %d only supports a gpio mux\n" , pin); +return -ENOTSUPP ; + } + } + +return 0 ; +} + +/* +* Set a new mux function for a pin. +* +* The register is divided into the upper and lower 16 bit. When changing +* a value, the previous register value is not read and changed. Instead +* it seems the changed bits are marked in the upper 16 bit, while the +* changed value gets set in the same offset in the lower 16 bit. +* All pin settings seem to be 2 bit wide in both the upper and lower +* parts. +* @bank: pin bank to change +* @pin: pin to change +* @mux: new mux function to set +*/ +static int rockchip_set_mux (struct rockchip_pin_bank *bank,int pin,int mux) +{ +struct rockchip_pinctrl_priv *priv = bank->priv; +int iomux_num = (pin /8 ); +struct regmap *regmap; +int reg, ret, mask, mux_type; +u8 bit; +u32 data, route_reg, route_val; + + ret =rockchip_verify_mux (bank, pin, mux); +if (ret <0 ) +return ret; + +if (bank->iomux[iomux_num].type &IOMUX_GPIO_ONLY ) +return 0 ; + +debug ("setting mux of GPIO%d-%d to %d\n" , bank->bank_num, pin, mux); + + regmap = (bank->iomux[iomux_num].type &IOMUX_SOURCE_PMU ) + ? priv->regmap_pmu : priv->regmap_base; + +/* get basic quadrupel of mux registers and the correct reg inside */ + mux_type = bank->iomux[iomux_num].type; + reg = bank->iomux[iomux_num].offset; + reg +=rockchip_get_mux_data (mux_type, pin, &bit, &mask); + +if (bank->recalced_mask &BIT (pin)) +rockchip_get_recalced_mux (bank, pin, ®, &bit, &mask); + +if (bank->route_mask &BIT (pin)) { +if (rockchip_get_mux_route (bank, pin, mux, &route_reg, + &route_val)) { + ret =regmap_write (regmap, route_reg, route_val); +if (ret) +return ret; + } + } + + data = (mask << (bit +16 )); + data |= (mux & mask) << bit; + ret =regmap_write (regmap, reg, data); + +return ret; +} + +static int rockchip_perpin_drv_list[DRV_TYPE_MAX ][8 ] = { + {2 ,4 ,8 ,12 ,-1 ,-1 ,-1 ,-1 }, + {3 ,6 ,9 ,12 ,-1 ,-1 ,-1 ,-1 }, + {5 ,10 ,15 ,20 ,-1 ,-1 ,-1 ,-1 }, + {4 ,6 ,8 ,10 ,12 ,14 ,16 ,18 }, + {4 ,7 ,10 ,13 ,16 ,19 ,22 ,26 } +}; + +static int rockchip_set_drive_perpin (struct rockchip_pin_bank *bank, +int pin_num,int strength) +{ +struct rockchip_pinctrl_priv *priv = bank->priv; +struct rockchip_pin_ctrl *ctrl = priv->ctrl; +struct regmap *regmap; +int reg, ret, i; +u32 data, rmask_bits, temp; +u8 bit; +int drv_type = bank->drv[pin_num /8 ].drv_type; + +debug ("setting drive of GPIO%d-%d to %d\n" , bank->bank_num, + pin_num, strength); + + ctrl->drv_calc_reg (bank, pin_num, ®map, ®, &bit); + + ret = -EINVAL ; +for (i =0 ; i <ARRAY_SIZE (rockchip_perpin_drv_list[drv_type]); i++) { +if (rockchip_perpin_drv_list[drv_type][i] == strength) { + ret = i; +break ; + }else if (rockchip_perpin_drv_list[drv_type][i] <0 ) { + ret = rockchip_perpin_drv_list[drv_type][i]; +break ; + } + } + +if (ret <0 ) { +debug ("unsupported driver strength %d\n" , strength); +return ret; + } + +switch (drv_type) { +case DRV_TYPE_IO_1V8_3V0_AUTO : +case DRV_TYPE_IO_3V3_ONLY : + rmask_bits =ROCKCHIP_DRV_3BITS_PER_PIN ; +switch (bit) { + case 0 ... 12: +/* regular case, nothing to do */ +break ; +case 15 : +/* +* drive-strength offset is special, as it is spread +* over 2 registers, the bit data[15] contains bit 0 +* of the value while temp[1:0] contains bits 2 and 1 +*/ + data = (ret &0x1 ) <<15 ; + temp = (ret >>0x1 ) &0x3 ; + + data |=BIT (31 ); + ret =regmap_write (regmap, reg, data); +if (ret) +return ret; + + temp |= (0x3 <<16 ); + reg +=0x4 ; + ret =regmap_write (regmap, reg, temp); + +return ret; + case 18 ... 21: +/* setting fully enclosed in the second register */ + reg +=4 ; + bit -=16 ; +break ; +default : +debug ("unsupported bit: %d for pinctrl drive type: %d\n" , + bit, drv_type); +return -EINVAL ; + } +break ; +case DRV_TYPE_IO_DEFAULT : +case DRV_TYPE_IO_1V8_OR_3V0 : +case DRV_TYPE_IO_1V8_ONLY : + rmask_bits =ROCKCHIP_DRV_BITS_PER_PIN ; +break ; +default : +debug ("unsupported pinctrl drive type: %d\n" , + drv_type); +return -EINVAL ; + } + +/* enable the write to the equivalent lower bits */ + data = ((1 << rmask_bits) -1 ) << (bit +16 ); + data |= (ret << bit); + + ret =regmap_write (regmap, reg, data); +return ret; +} + +static int rockchip_pull_list[PULL_TYPE_MAX ][4 ] = { + { +PIN_CONFIG_BIAS_DISABLE , +PIN_CONFIG_BIAS_PULL_UP , +PIN_CONFIG_BIAS_PULL_DOWN , +PIN_CONFIG_BIAS_BUS_HOLD + }, + { +PIN_CONFIG_BIAS_DISABLE , +PIN_CONFIG_BIAS_PULL_DOWN , +PIN_CONFIG_BIAS_DISABLE , +PIN_CONFIG_BIAS_PULL_UP + }, +}; + +static int rockchip_set_pull (struct rockchip_pin_bank *bank, +int pin_num,int pull) +{ +struct rockchip_pinctrl_priv *priv = bank->priv; +struct rockchip_pin_ctrl *ctrl = priv->ctrl; +struct regmap *regmap; +int reg, ret, i, pull_type; +u8 bit; +u32 data; + +debug ("setting pull of GPIO%d-%d to %d\n" , bank->bank_num, + pin_num, pull); + + ctrl->pull_calc_reg (bank, pin_num, ®map, ®, &bit); + +switch (ctrl->type) { +case RK3036 : +case RK3128 : + data =BIT (bit +16 ); +if (pull ==PIN_CONFIG_BIAS_DISABLE ) + data |=BIT (bit); + ret =regmap_write (regmap, reg, data); +break ; +case RV1108 : +case RK3188 : +case RK3288 : +case RK3368 : +case RK3399 : + pull_type = bank->pull_type[pin_num /8 ]; + ret = -EINVAL ; +for (i =0 ; i <ARRAY_SIZE (rockchip_pull_list[pull_type]); + i++) { +if (rockchip_pull_list[pull_type][i] == pull) { + ret = i; +break ; + } + } + +if (ret <0 ) { +debug ("unsupported pull setting %d\n" , pull); +return ret; + } + +/* enable the write to the equivalent lower bits */ + data = ((1 <<ROCKCHIP_PULL_BITS_PER_PIN ) -1 ) << (bit +16 ); + data |= (ret << bit); + + ret =regmap_write (regmap, reg, data); +break ; +default : +debug ("unsupported pinctrl type\n" ); +return -EINVAL ; + } + +return ret; +} + +static int rockchip_set_schmitt (struct rockchip_pin_bank *bank, +int pin_num,int enable) +{ +struct rockchip_pinctrl_priv *priv = bank->priv; +struct rockchip_pin_ctrl *ctrl = priv->ctrl; +struct regmap *regmap; +int reg, ret; +u8 bit; +u32 data; + +debug ("setting input schmitt of GPIO%d-%d to %d\n" , bank->bank_num, + pin_num, enable); + + ret = ctrl->schmitt_calc_reg (bank, pin_num, ®map, ®, &bit); +if (ret) +return ret; + +/* enable the write to the equivalent lower bits */ + data =BIT (bit +16 ) | (enable << bit); + +return regmap_write (regmap, reg, data); +} + +/* +* Pinconf_ops handling +*/ +static bool rockchip_pinconf_pull_valid (struct rockchip_pin_ctrl *ctrl, +unsigned int pull) +{ +switch (ctrl->type) { +case RK3036 : +case RK3128 : +return (pull ==PIN_CONFIG_BIAS_PULL_PIN_DEFAULT || + pull ==PIN_CONFIG_BIAS_DISABLE ); +case RV1108 : +case RK3188 : +case RK3288 : +case RK3368 : +case RK3399 : +return (pull !=PIN_CONFIG_BIAS_PULL_PIN_DEFAULT ); + } + +return false; +} + +/* set the pin config settings for a specified pin */ +static int rockchip_pinconf_set (struct rockchip_pin_bank *bank, +u32 pin,u32 param,u32 arg) +{ +struct rockchip_pinctrl_priv *priv = bank->priv; +struct rockchip_pin_ctrl *ctrl = priv->ctrl; +int rc; + +switch (param) { +case PIN_CONFIG_BIAS_DISABLE : + rc =rockchip_set_pull (bank, pin, param); +if (rc) +return rc; +break ; + +case PIN_CONFIG_BIAS_PULL_UP : +case PIN_CONFIG_BIAS_PULL_DOWN : +case PIN_CONFIG_BIAS_PULL_PIN_DEFAULT : +case PIN_CONFIG_BIAS_BUS_HOLD : +if (!rockchip_pinconf_pull_valid (ctrl, param)) +return -ENOTSUPP ; + +if (!arg) +return -EINVAL ; + + rc =rockchip_set_pull (bank, pin, param); +if (rc) +return rc; +break ; + +case PIN_CONFIG_DRIVE_STRENGTH : +if (!ctrl->drv_calc_reg) +return -ENOTSUPP ; + + rc =rockchip_set_drive_perpin (bank, pin, arg); +if (rc <0 ) +return rc; +break ; + +case PIN_CONFIG_INPUT_SCHMITT_ENABLE : +if (!ctrl->schmitt_calc_reg) +return -ENOTSUPP ; + + rc =rockchip_set_schmitt (bank, pin, arg); +if (rc <0 ) +return rc; +break ; + +default : +break ; + } + +return 0 ; +} + +static const struct pinconf_param rockchip_conf_params[] = { + {"bias-disable" ,PIN_CONFIG_BIAS_DISABLE ,0 }, + {"bias-bus-hold" ,PIN_CONFIG_BIAS_BUS_HOLD ,0 }, + {"bias-pull-up" ,PIN_CONFIG_BIAS_PULL_UP ,1 }, + {"bias-pull-down" ,PIN_CONFIG_BIAS_PULL_DOWN ,1 }, + {"drive-strength" ,PIN_CONFIG_DRIVE_STRENGTH ,0 }, + {"input-enable" ,PIN_CONFIG_INPUT_ENABLE ,1 }, + {"input-disable" ,PIN_CONFIG_INPUT_ENABLE ,0 }, + {"input-schmitt-disable" ,PIN_CONFIG_INPUT_SCHMITT_ENABLE ,0 }, + {"input-schmitt-enable" ,PIN_CONFIG_INPUT_SCHMITT_ENABLE ,1 }, +}; + +static int rockchip_pinconf_prop_name_to_param (const char *property, +u32 *default_value) +{ +const struct pinconf_param *p, *end; + + p = rockchip_conf_params; + end = p +sizeof (rockchip_conf_params) /sizeof (struct pinconf_param ); + +/* See if this pctldev supports this parameter */ +for (; p < end; p++) { +if (!strcmp (property, p->property)) { + *default_value = p->default_value; +return p->param; + } + } + + *default_value =0 ; +return -EPERM ; +} + +static int rockchip_pinctrl_set_state (struct udevice *dev, +struct udevice *config) +{ +struct rockchip_pinctrl_priv *priv =dev_get_priv (dev); +struct rockchip_pin_ctrl *ctrl = priv->ctrl; +u32 cells[MAX_ROCKCHIP_PINS_ENTRIES *4 ]; +u32 bank, pin, mux, conf, arg, default_val; +int ret, count, i; +const char *prop_name; +const void *value; +int prop_len, param; +const u32 *data; +ofnode node; +#ifdef CONFIG_OF_LIVE +const struct device_node *np; +struct property *pp; +#else +int property_offset, pcfg_node; +const void *blob = gd->fdt_blob; +#endif + data =dev_read_prop (config,"rockchip,pins" , &count); +if (count <0 ) { +debug ("%s: bad array size %d\n" , __func__, count); +return -EINVAL ; + } + + count /=sizeof (u32); +if (count >MAX_ROCKCHIP_PINS_ENTRIES *4 ) { +debug ("%s: unsupported pins array count %d\n" , + __func__, count); +return -EINVAL ; + } + +for (i =0 ; i < count; i++) + cells[i] =fdt32_to_cpu (data[i]); + +for (i =0 ; i < (count >>2 ); i++) { + bank = cells[4 * i +0 ]; + pin = cells[4 * i +1 ]; + mux = cells[4 * i +2 ]; + conf = cells[4 * i +3 ]; + + ret =rockchip_verify_config (dev, bank, pin); +if (ret) +return ret; + + ret =rockchip_set_mux (&ctrl->pin_banks[bank], pin, mux); +if (ret) +return ret; + + node =ofnode_get_by_phandle (conf); +if (!ofnode_valid (node)) +return -ENODEV ; +#ifdef CONFIG_OF_LIVE + np =ofnode_to_np (node); +for (pp = np->properties; pp; pp = pp->next) { + prop_name = pp->name; + prop_len = pp->length; + value = pp->value; +#else + pcfg_node =ofnode_to_offset (node); +fdt_for_each_property_offset (property_offset, blob, pcfg_node) { + value =fdt_getprop_by_offset (blob, property_offset, + &prop_name, &prop_len); +if (!value) +return -ENOENT ; +#endif + param =rockchip_pinconf_prop_name_to_param (prop_name, + &default_val); +if (param <0 ) +break ; + +if (prop_len >=sizeof (fdt32_t)) + arg =fdt32_to_cpu (*(fdt32_t *)value); +else + arg = default_val; + + ret =rockchip_pinconf_set (&ctrl->pin_banks[bank], pin, + param, arg); +if (ret) { +debug ("%s: rockchip_pinconf_set fail: %d\n" , + __func__, ret); +return ret; + } + } + } + +return 0 ; +} + +const struct pinctrl_ops rockchip_pinctrl_ops = { + .set_state = rockchip_pinctrl_set_state, + .get_gpio_mux = rockchip_pinctrl_get_gpio_mux, +}; + +/* retrieve the soc specific data */ +static struct rockchip_pin_ctrl *rockchip_pinctrl_get_soc_data (struct udevice *dev) +{ +struct rockchip_pinctrl_priv *priv =dev_get_priv (dev); +struct rockchip_pin_ctrl *ctrl = + (struct rockchip_pin_ctrl *)dev_get_driver_data (dev); +struct rockchip_pin_bank *bank; +int grf_offs, pmu_offs, drv_grf_offs, drv_pmu_offs, i, j; + + grf_offs = ctrl->grf_mux_offset; + pmu_offs = ctrl->pmu_mux_offset; + drv_pmu_offs = ctrl->pmu_drv_offset; + drv_grf_offs = ctrl->grf_drv_offset; + bank = ctrl->pin_banks; + +for (i =0 ; i < ctrl->nr_banks; ++i, ++bank) { +int bank_pins =0 ; + + bank->priv = priv; + bank->pin_base = ctrl->nr_pins; + ctrl->nr_pins += bank->nr_pins; + +/* calculate iomux and drv offsets */ +for (j =0 ; j <4 ; j++) { +struct rockchip_iomux *iom = &bank->iomux[j]; +struct rockchip_drv *drv = &bank->drv[j]; +int inc; + +if (bank_pins >= bank->nr_pins) +break ; + +/* preset iomux offset value, set new start value */ +if (iom->offset >=0 ) { +if (iom->type &IOMUX_SOURCE_PMU ) + pmu_offs = iom->offset; +else + grf_offs = iom->offset; + }else {/* set current iomux offset */ + iom->offset = (iom->type &IOMUX_SOURCE_PMU ) ? + pmu_offs : grf_offs; + } + +/* preset drv offset value, set new start value */ +if (drv->offset >=0 ) { +if (iom->type &IOMUX_SOURCE_PMU ) + drv_pmu_offs = drv->offset; +else + drv_grf_offs = drv->offset; + }else {/* set current drv offset */ + drv->offset = (iom->type &IOMUX_SOURCE_PMU ) ? + drv_pmu_offs : drv_grf_offs; + } + +debug ("bank %d, iomux %d has iom_offset 0x%x drv_offset 0x%x\n" , + i, j, iom->offset, drv->offset); + +/* +* Increase offset according to iomux width. +* 4bit iomux'es are spread over two registers. +*/ + inc = (iom->type & (IOMUX_WIDTH_4BIT | +IOMUX_WIDTH_3BIT )) ?8 :4 ; +if (iom->type &IOMUX_SOURCE_PMU ) + pmu_offs += inc; +else + grf_offs += inc; + +/* +* Increase offset according to drv width. +* 3bit drive-strenth'es are spread over two registers. +*/ +if ((drv->drv_type ==DRV_TYPE_IO_1V8_3V0_AUTO ) || + (drv->drv_type ==DRV_TYPE_IO_3V3_ONLY )) + inc =8 ; +else + inc =4 ; + +if (iom->type &IOMUX_SOURCE_PMU ) + drv_pmu_offs += inc; +else + drv_grf_offs += inc; + + bank_pins +=8 ; + } + +/* calculate the per-bank recalced_mask */ +for (j =0 ; j < ctrl->niomux_recalced; j++) { +int pin =0 ; + +if (ctrl->iomux_recalced[j].num == bank->bank_num) { + pin = ctrl->iomux_recalced[j].pin; + bank->recalced_mask |=BIT (pin); + } + } + +/* calculate the per-bank route_mask */ +for (j =0 ; j < ctrl->niomux_routes; j++) { +int pin =0 ; + +if (ctrl->iomux_routes[j].bank_num == bank->bank_num) { + pin = ctrl->iomux_routes[j].pin; + bank->route_mask |=BIT (pin); + } + } + } + +return ctrl; +} + +int rockchip_pinctrl_probe (struct udevice *dev) +{ +struct rockchip_pinctrl_priv *priv =dev_get_priv (dev); +struct rockchip_pin_ctrl *ctrl; +struct udevice *syscon; +struct regmap *regmap; +int ret =0 ; + +/* get rockchip grf syscon phandle */ + ret =uclass_get_device_by_phandle (UCLASS_SYSCON , dev,"rockchip,grf" , + &syscon); +if (ret) { +debug ("unable to find rockchip,grf syscon device (%d)\n" , ret); +return ret; + } + +/* get grf-reg base address */ + regmap =syscon_get_regmap (syscon); +if (!regmap) { +debug ("unable to find rockchip grf regmap\n" ); +return -ENODEV ; + } + priv->regmap_base = regmap; + +/* option: get pmu-reg base address */ + ret =uclass_get_device_by_phandle (UCLASS_SYSCON , dev,"rockchip,pmu" , + &syscon); +if (!ret) { +/* get pmugrf-reg base address */ + regmap =syscon_get_regmap (syscon); +if (!regmap) { +debug ("unable to find rockchip pmu regmap\n" ); +return -ENODEV ; + } + priv->regmap_pmu = regmap; + } + + ctrl =rockchip_pinctrl_get_soc_data (dev); +if (!ctrl) { +debug ("driver data not available\n" ); +return -EINVAL ; + } + + priv->ctrl = ctrl; +return 0 ; +}drivers/pinctrl/rockchip/pinctrl-rockchip.h new file +302
-0@@ -0,0 +1,302 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* (C) Copyright 2019 Rockchip Electronics Co., Ltd +*/ + +#ifndef __DRIVERS_PINCTRL_ROCKCHIP_H +#define __DRIVERS_PINCTRL_ROCKCHIP_H + +#include <linux/types.h> + +enum rockchip_pinctrl_type { +RV1108 , +RK3036 , +RK3128 , +RK3188 , +RK3288 , +RK3368 , +RK3399 , +}; + +/** +* Encode variants of iomux registers into a type variable +*/ +#define IOMUX_GPIO_ONLY BIT(0) +#define IOMUX_WIDTH_4BIT BIT(1) +#define IOMUX_SOURCE_PMU BIT(2) +#define IOMUX_UNROUTED BIT(3) +#define IOMUX_WIDTH_3BIT BIT(4) + +/** +* Defined some common pins constants +*/ +#define ROCKCHIP_PULL_BITS_PER_PIN 2 +#define ROCKCHIP_PULL_PINS_PER_REG 8 +#define ROCKCHIP_PULL_BANK_STRIDE 16 +#define ROCKCHIP_DRV_BITS_PER_PIN 2 +#define ROCKCHIP_DRV_PINS_PER_REG 8 +#define ROCKCHIP_DRV_BANK_STRIDE 16 +#define ROCKCHIP_DRV_3BITS_PER_PIN 3 + +/** +* @type: iomux variant using IOMUX_* constants +* @offset: if initialized to -1 it will be autocalculated, by specifying +* an initial offset value the relevant source offset can be reset +* to a new value for autocalculating the following iomux registers. +*/ +struct rockchip_iomux { +int type; +int offset; +}; + +/** +* enum type index corresponding to rockchip_perpin_drv_list arrays index. +*/ +enum rockchip_pin_drv_type { +DRV_TYPE_IO_DEFAULT =0 , +DRV_TYPE_IO_1V8_OR_3V0 , +DRV_TYPE_IO_1V8_ONLY , +DRV_TYPE_IO_1V8_3V0_AUTO , +DRV_TYPE_IO_3V3_ONLY , +DRV_TYPE_MAX +}; + +/** +* enum type index corresponding to rockchip_pull_list arrays index. +*/ +enum rockchip_pin_pull_type { +PULL_TYPE_IO_DEFAULT =0 , +PULL_TYPE_IO_1V8_ONLY , +PULL_TYPE_MAX +}; + +/** +* @drv_type: drive strength variant using rockchip_perpin_drv_type +* @offset: if initialized to -1 it will be autocalculated, by specifying +* an initial offset value the relevant source offset can be reset +* to a new value for autocalculating the following drive strength +* registers. if used chips own cal_drv func instead to calculate +* registers offset, the variant could be ignored. +*/ +struct rockchip_drv { +enum rockchip_pin_drv_type drv_type; +int offset; +}; + +/** +* @priv: common pinctrl private basedata +* @pin_base: first pin number +* @nr_pins: number of pins in this bank +* @name: name of the bank +* @bank_num: number of the bank, to account for holes +* @iomux: array describing the 4 iomux sources of the bank +* @drv: array describing the 4 drive strength sources of the bank +* @pull_type: array describing the 4 pull type sources of the bank +* @recalced_mask: bits describing the mux recalced pins of per bank +* @route_mask: bits describing the routing pins of per bank +*/ +struct rockchip_pin_bank { +struct rockchip_pinctrl_priv *priv; +u32 pin_base; +u8 nr_pins; +char *name; +u8 bank_num; +struct rockchip_iomux iomux[4 ]; +struct rockchip_drv drv[4 ]; +enum rockchip_pin_pull_type pull_type[4 ]; +u32 recalced_mask; +u32 route_mask; +}; + +#define PIN_BANK (id, pins, label) \ + { \ + .bank_num = id, \ + .nr_pins = pins, \ + .name = label, \ + .iomux = { \ + { .offset = -1 }, \ + { .offset = -1 }, \ + { .offset = -1 }, \ + { .offset = -1 }, \ + }, \ + } + +#define PIN_BANK_IOMUX_FLAGS (id, pins, label, iom0, iom1, iom2, iom3) \ + { \ + .bank_num = id, \ + .nr_pins = pins, \ + .name = label, \ + .iomux = { \ + { .type = iom0, .offset = -1 }, \ + { .type = iom1, .offset = -1 }, \ + { .type = iom2, .offset = -1 }, \ + { .type = iom3, .offset = -1 }, \ + }, \ + } + +#define PIN_BANK_DRV_FLAGS (id, pins, label, type0, type1, type2, type3) \ + { \ + .bank_num = id, \ + .nr_pins = pins, \ + .name = label, \ + .iomux = { \ + { .offset = -1 }, \ + { .offset = -1 }, \ + { .offset = -1 }, \ + { .offset = -1 }, \ + }, \ + .drv = { \ + { .drv_type = type0, .offset = -1 }, \ + { .drv_type = type1, .offset = -1 }, \ + { .drv_type = type2, .offset = -1 }, \ + { .drv_type = type3, .offset = -1 }, \ + }, \ + } + +#define PIN_BANK_DRV_FLAGS_PULL_FLAGS (id, pins, label, drv0, drv1, \ + drv2, drv3, pull0, pull1, \ + pull2, pull3) \ + { \ + .bank_num = id, \ + .nr_pins = pins, \ + .name = label, \ + .iomux = { \ + { .offset = -1 }, \ + { .offset = -1 }, \ + { .offset = -1 }, \ + { .offset = -1 }, \ + }, \ + .drv = { \ + { .drv_type = drv0, .offset = -1 }, \ + { .drv_type = drv1, .offset = -1 }, \ + { .drv_type = drv2, .offset = -1 }, \ + { .drv_type = drv3, .offset = -1 }, \ + }, \ + .pull_type[0] = pull0, \ + .pull_type[1] = pull1, \ + .pull_type[2] = pull2, \ + .pull_type[3] = pull3, \ + } + +#define PIN_BANK_IOMUX_DRV_FLAGS_OFFSET (id, pins, label, iom0, iom1, \ + iom2, iom3, drv0, drv1, drv2, \ + drv3, offset0, offset1, \ + offset2, offset3) \ + { \ + .bank_num = id, \ + .nr_pins = pins, \ + .name = label, \ + .iomux = { \ + { .type = iom0, .offset = -1 }, \ + { .type = iom1, .offset = -1 }, \ + { .type = iom2, .offset = -1 }, \ + { .type = iom3, .offset = -1 }, \ + }, \ + .drv = { \ + { .drv_type = drv0, .offset = offset0 }, \ + { .drv_type = drv1, .offset = offset1 }, \ + { .drv_type = drv2, .offset = offset2 }, \ + { .drv_type = drv3, .offset = offset3 }, \ + }, \ + } + +#define PIN_BANK_IOMUX_FLAGS_DRV_FLAGS_OFFSET_PULL_FLAGS (id, pins, \ + label, iom0, iom1, iom2, \ + iom3, drv0, drv1, drv2, \ + drv3, offset0, offset1, \ + offset2, offset3, pull0, \ + pull1, pull2, pull3) \ + { \ + .bank_num = id, \ + .nr_pins = pins, \ + .name = label, \ + .iomux = { \ + { .type = iom0, .offset = -1 }, \ + { .type = iom1, .offset = -1 }, \ + { .type = iom2, .offset = -1 }, \ + { .type = iom3, .offset = -1 }, \ + }, \ + .drv = { \ + { .drv_type = drv0, .offset = offset0 }, \ + { .drv_type = drv1, .offset = offset1 }, \ + { .drv_type = drv2, .offset = offset2 }, \ + { .drv_type = drv3, .offset = offset3 }, \ + }, \ + .pull_type[0] = pull0, \ + .pull_type[1] = pull1, \ + .pull_type[2] = pull2, \ + .pull_type[3] = pull3, \ + } + +/** +* struct rockchip_mux_recalced_data: recalculate a pin iomux data. +* @num: bank number. +* @pin: pin number. +* @reg: register offset. +* @bit: index at register. +* @mask: mask bit +*/ +struct rockchip_mux_recalced_data { +u8 num; +u8 pin; +u32 reg; +u8 bit; +u8 mask; +}; + +/** +* struct rockchip_mux_route_data: route a pin iomux data. +* @bank_num: bank number. +* @pin: index at register or used to calc index. +* @func: the min pin. +* @route_offset: the max pin. +* @route_val: the register offset. +*/ +struct rockchip_mux_route_data { +u8 bank_num; +u8 pin; +u8 func; +u32 route_offset; +u32 route_val; +}; + +/** +*/ +struct rockchip_pin_ctrl { +struct rockchip_pin_bank *pin_banks; +u32 nr_banks; +u32 nr_pins; +char *label; +enum rockchip_pinctrl_type type; +int grf_mux_offset; +int pmu_mux_offset; +int grf_drv_offset; +int pmu_drv_offset; +struct rockchip_mux_recalced_data *iomux_recalced; +u32 niomux_recalced; +struct rockchip_mux_route_data *iomux_routes; +u32 niomux_routes; + +void (*pull_calc_reg)(struct rockchip_pin_bank *bank, +int pin_num,struct regmap **regmap, +int *reg,u8 *bit); +void (*drv_calc_reg)(struct rockchip_pin_bank *bank, +int pin_num,struct regmap **regmap, +int *reg,u8 *bit); +int (*schmitt_calc_reg)(struct rockchip_pin_bank *bank, +int pin_num,struct regmap **regmap, +int *reg,u8 *bit); +}; + +/** +*/ +struct rockchip_pinctrl_priv { +struct rockchip_pin_ctrl *ctrl; +struct regmap *regmap_base; +struct regmap *regmap_pmu; +}; + +extern const struct pinctrl_ops rockchip_pinctrl_ops; +int rockchip_pinctrl_probe (struct udevice *dev); + +#endif /* __DRIVERS_PINCTRL_ROCKCHIP_H */ drivers/pinctrl/rockchip/pinctrl-rv1108.c new file +203
-0@@ -0,0 +1,203 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* (C) Copyright 2019 Rockchip Electronics Co., Ltd +*/ + +#include <common.h> +#include <dm.h> +#include <dm/pinctrl.h> +#include <regmap.h> +#include <syscon.h> + +#include "pinctrl-rockchip.h" + +static struct rockchip_mux_recalced_data rv1108_mux_recalced_data[] = { + { + .num =1 , + .pin =0 , + .reg =0x418 , + .bit =0 , + .mask =0x3 + }, { + .num =1 , + .pin =1 , + .reg =0x418 , + .bit =2 , + .mask =0x3 + }, { + .num =1 , + .pin =2 , + .reg =0x418 , + .bit =4 , + .mask =0x3 + }, { + .num =1 , + .pin =3 , + .reg =0x418 , + .bit =6 , + .mask =0x3 + }, { + .num =1 , + .pin =4 , + .reg =0x418 , + .bit =8 , + .mask =0x3 + }, { + .num =1 , + .pin =5 , + .reg =0x418 , + .bit =10 , + .mask =0x3 + }, { + .num =1 , + .pin =6 , + .reg =0x418 , + .bit =12 , + .mask =0x3 + }, { + .num =1 , + .pin =7 , + .reg =0x418 , + .bit =14 , + .mask =0x3 + }, { + .num =1 , + .pin =8 , + .reg =0x41c , + .bit =0 , + .mask =0x3 + }, { + .num =1 , + .pin =9 , + .reg =0x41c , + .bit =2 , + .mask =0x3 + }, +}; + +#define RV1108_PULL_PMU_OFFSET 0x10 +#define RV1108_PULL_OFFSET 0x110 + +static void rv1108_calc_pull_reg_and_bit (struct rockchip_pin_bank *bank, +int pin_num,struct regmap **regmap, +int *reg,u8 *bit) +{ +struct rockchip_pinctrl_priv *priv = bank->priv; + +/* The first 24 pins of the first bank are located in PMU */ +if (bank->bank_num ==0 ) { + *regmap = priv->regmap_pmu; + *reg =RV1108_PULL_PMU_OFFSET ; + }else { + *reg =RV1108_PULL_OFFSET ; + *regmap = priv->regmap_base; +/* correct the offset, as we're starting with the 2nd bank */ + *reg -=0x10 ; + *reg += bank->bank_num *ROCKCHIP_PULL_BANK_STRIDE ; + } + + *reg += ((pin_num /ROCKCHIP_PULL_PINS_PER_REG ) *4 ); + *bit = (pin_num %ROCKCHIP_PULL_PINS_PER_REG ); + *bit *=ROCKCHIP_PULL_BITS_PER_PIN ; +} + +#define RV1108_DRV_PMU_OFFSET 0x20 +#define RV1108_DRV_GRF_OFFSET 0x210 + +static void rv1108_calc_drv_reg_and_bit (struct rockchip_pin_bank *bank, +int pin_num,struct regmap **regmap, +int *reg,u8 *bit) +{ +struct rockchip_pinctrl_priv *priv = bank->priv; + +/* The first 24 pins of the first bank are located in PMU */ +if (bank->bank_num ==0 ) { + *regmap = priv->regmap_pmu; + *reg =RV1108_DRV_PMU_OFFSET ; + }else { + *regmap = priv->regmap_base; + *reg =RV1108_DRV_GRF_OFFSET ; + +/* correct the offset, as we're starting with the 2nd bank */ + *reg -=0x10 ; + *reg += bank->bank_num *ROCKCHIP_DRV_BANK_STRIDE ; + } + + *reg += ((pin_num /ROCKCHIP_DRV_PINS_PER_REG ) *4 ); + *bit = pin_num %ROCKCHIP_DRV_PINS_PER_REG ; + *bit *=ROCKCHIP_DRV_BITS_PER_PIN ; +} + +#define RV1108_SCHMITT_PMU_OFFSET 0x30 +#define RV1108_SCHMITT_GRF_OFFSET 0x388 +#define RV1108_SCHMITT_BANK_STRIDE 8 +#define RV1108_SCHMITT_PINS_PER_GRF_REG 16 +#define RV1108_SCHMITT_PINS_PER_PMU_REG 8 + +static int rv1108_calc_schmitt_reg_and_bit (struct rockchip_pin_bank *bank, +int pin_num, +struct regmap **regmap, +int *reg,u8 *bit) +{ +struct rockchip_pinctrl_priv *priv = bank->priv; +int pins_per_reg; + +if (bank->bank_num ==0 ) { + *regmap = priv->regmap_pmu; + *reg =RV1108_SCHMITT_PMU_OFFSET ; + pins_per_reg =RV1108_SCHMITT_PINS_PER_PMU_REG ; + }else { + *regmap = priv->regmap_base; + *reg =RV1108_SCHMITT_GRF_OFFSET ; + pins_per_reg =RV1108_SCHMITT_PINS_PER_GRF_REG ; + *reg += (bank->bank_num -1 ) *RV1108_SCHMITT_BANK_STRIDE ; + } + *reg += ((pin_num / pins_per_reg) *4 ); + *bit = pin_num % pins_per_reg; + +return 0 ; +} + +static struct rockchip_pin_bank rv1108_pin_banks[] = { +PIN_BANK_IOMUX_FLAGS (0 ,32 ,"gpio0" ,IOMUX_SOURCE_PMU , +IOMUX_SOURCE_PMU , +IOMUX_SOURCE_PMU , +IOMUX_SOURCE_PMU ), +PIN_BANK_IOMUX_FLAGS (1 ,32 ,"gpio1" ,0 ,0 ,0 ,0 ), +PIN_BANK_IOMUX_FLAGS (2 ,32 ,"gpio2" ,0 ,0 ,0 ,0 ), +PIN_BANK_IOMUX_FLAGS (3 ,32 ,"gpio3" ,0 ,0 ,0 ,0 ), +}; + +static struct rockchip_pin_ctrl rv1108_pin_ctrl = { + .pin_banks = rv1108_pin_banks, + .nr_banks =ARRAY_SIZE (rv1108_pin_banks), + .label ="RV1108-GPIO" , + .type =RV1108 , + .grf_mux_offset =0x10 , + .pmu_mux_offset =0x0 , + .iomux_recalced = rv1108_mux_recalced_data, + .niomux_recalced =ARRAY_SIZE (rv1108_mux_recalced_data), + .pull_calc_reg = rv1108_calc_pull_reg_and_bit, + .drv_calc_reg = rv1108_calc_drv_reg_and_bit, + .schmitt_calc_reg = rv1108_calc_schmitt_reg_and_bit, +}; + +static const struct udevice_id rv1108_pinctrl_ids[] = { + { + .compatible ="rockchip,rv1108-pinctrl" , + .data = (ulong)&rv1108_pin_ctrl + }, + { } +}; + +U_BOOT_DRIVER (pinctrl_rv1108) = { + .name ="pinctrl_rv1108" , + .id =UCLASS_PINCTRL , + .of_match = rv1108_pinctrl_ids, + .priv_auto_alloc_size =sizeof (struct rockchip_pinctrl_priv ), + .ops = &rockchip_pinctrl_ops, +#if !CONFIG_IS_ENABLED(OF_PLATDATA) + .bind = dm_scan_fdt_dev, +#endif + .probe = rockchip_pinctrl_probe, +};
PATCH v2 6/9 pinctrl: rockchip: Add common rockchip pinctrl driver
In reply to David WuQuoted 32 lines
Use this driver to fit all Rockchip SOCs and to support the desired pinctrl configuration via DTS.
Signed-off-by David Wu <[email protected]>Acked-by Heiko Stuebner <[email protected]>Reviewed-by Kever Yang <[email protected]>---
Changes in v2:
- Remove px30, rk2928, rk3066*.
- Split it to multiple files for the relevant per-SoC data structures.drivers/pinctrl/Kconfig | 91 +- drivers/pinctrl/Makefile | 2 +- drivers/pinctrl/rockchip/Kconfig | 17 + drivers/pinctrl/rockchip/Makefile | 19 +- drivers/pinctrl/rockchip/pinctrl-rk3036.c | 65 ++ drivers/pinctrl/rockchip/pinctrl-rk3128.c | 155 ++++ drivers/pinctrl/rockchip/pinctrl-rk3188.c | 82 ++ drivers/pinctrl/rockchip/pinctrl-rk322x.c | 215 +++++ drivers/pinctrl/rockchip/pinctrl-rk3288.c | 157 ++++ drivers/pinctrl/rockchip/pinctrl-rk3328.c | 227 +++++ drivers/pinctrl/rockchip/pinctrl-rk3368.c | 116 +++ drivers/pinctrl/rockchip/pinctrl-rk3399.c | 193 +++++ .../pinctrl/rockchip/pinctrl-rockchip-core.c | 788 ++++++++++++++++++ drivers/pinctrl/rockchip/pinctrl-rockchip.h | 302 +++++++ drivers/pinctrl/rockchip/pinctrl-rv1108.c | 203 +++++ 15 files changed, 2532 insertions(+), 100 deletions(-) create mode 100644 drivers/pinctrl/rockchip/Kconfig create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3036.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3128.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3188.c
Quoted 9 lines
create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk322x.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3288.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3328.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3368.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3399.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rockchip-core.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rockchip.h create mode 100644 drivers/pinctrl/rockchip/pinctrl-rv1108.c
PATCH v2 6/9 pinctrl: rockchip: Add common rockchip pinctrl driver
In reply to David WuQuoted 32 lines
Use this driver to fit all Rockchip SOCs and to support the desired pinctrl configuration via DTS.
Signed-off-by David Wu <[email protected]>Acked-by Heiko Stuebner <[email protected]>Reviewed-by Kever Yang <[email protected]>---
Changes in v2:
- Remove px30, rk2928, rk3066*.
- Split it to multiple files for the relevant per-SoC data structures.drivers/pinctrl/Kconfig | 91 +- drivers/pinctrl/Makefile | 2 +- drivers/pinctrl/rockchip/Kconfig | 17 + drivers/pinctrl/rockchip/Makefile | 19 +- drivers/pinctrl/rockchip/pinctrl-rk3036.c | 65 ++ drivers/pinctrl/rockchip/pinctrl-rk3128.c | 155 ++++ drivers/pinctrl/rockchip/pinctrl-rk3188.c | 82 ++ drivers/pinctrl/rockchip/pinctrl-rk322x.c | 215 +++++ drivers/pinctrl/rockchip/pinctrl-rk3288.c | 157 ++++ drivers/pinctrl/rockchip/pinctrl-rk3328.c | 227 +++++ drivers/pinctrl/rockchip/pinctrl-rk3368.c | 116 +++ drivers/pinctrl/rockchip/pinctrl-rk3399.c | 193 +++++ .../pinctrl/rockchip/pinctrl-rockchip-core.c | 788 ++++++++++++++++++ drivers/pinctrl/rockchip/pinctrl-rockchip.h | 302 +++++++ drivers/pinctrl/rockchip/pinctrl-rv1108.c | 203 +++++ 15 files changed, 2532 insertions(+), 100 deletions(-) create mode 100644 drivers/pinctrl/rockchip/Kconfig create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3036.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3128.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3188.c
Quoted 9 lines
create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk322x.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3288.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3328.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3368.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3399.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rockchip-core.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rockchip.h create mode 100644 drivers/pinctrl/rockchip/pinctrl-rv1108.c
Applied to u-boot-rockchip, thanks!
PATCH v2 7/9 rockchip: defconfig: Clean the unused pinctrl config
In reply to David WuIf we used the pinctrl-rockchip driver, these config is not needed, so remove them.
---
Changes in v2: None
configs/chromebit_mickey_defconfig | 2 -- configs/chromebook_jerry_defconfig | 2 -- configs/chromebook_minnie_defconfig | 2 -- configs/evb-px5_defconfig | 1 - configs/evb-rk3128_defconfig | 1 - configs/evb-rk3229_defconfig | 1 - configs/evb-rk3288_defconfig | 2 -- configs/evb-rk3399_defconfig | 1 - configs/evb-rv1108_defconfig | 1 - configs/fennec-rk3288_defconfig | 2 -- configs/firefly-rk3288_defconfig | 2 -- configs/firefly-rk3399_defconfig | 1 - configs/geekbox_defconfig | 1 - configs/kylin-rk3036_defconfig | 1 - configs/lion-rk3368_defconfig | 1 - configs/miqi-rk3288_defconfig | 2 -- configs/phycore-rk3288_defconfig | 2 -- configs/popmetal-rk3288_defconfig | 2 -- configs/puma-rk3399_defconfig | 1 - configs/rock2_defconfig | 2 -- configs/rock_defconfig | 1 - configs/sandbox_defconfig | 2 -- configs/sandbox_flattree_defconfig | 2 -- configs/sandbox_noblk_defconfig | 2 -- configs/sheep-rk3368_defconfig | 1 - configs/tinker-rk3288_defconfig | 2 -- configs/vyasa-rk3288_defconfig | 2 -- 27 files changed, 42 deletions(-)
configs/chromebit_mickey_defconfig +0 -2
@@ -61,8 +61,6 @@ CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set CONFIG_PMIC_RK8XX=y
configs/chromebook_jerry_defconfig +0 -2
@@ -63,8 +63,6 @@ CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set CONFIG_PMIC_RK8XX=y
configs/chromebook_minnie_defconfig +0 -2
@@ -62,8 +62,6 @@ CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set CONFIG_PMIC_RK8XX=y
configs/evb-px5_defconfig +0 -1
@@ -22,7 +22,6 @@ CONFIG_CLK=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PINCTRL=y -CONFIG_PINCTRL_ROCKCHIP_RK3368=y CONFIG_RAM=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_DEBUG_UART_ANNOUNCE=y
configs/evb-rk3128_defconfig +0 -1
@@ -31,7 +31,6 @@ CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PHY=y CONFIG_PINCTRL=y -CONFIG_PINCTRL_ROCKCHIP_RK3128=y CONFIG_REGULATOR_PWM=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_RAM=y
configs/evb-rk3229_defconfig +0 -1
@@ -44,7 +44,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PHY=y CONFIG_PINCTRL=y -CONFIG_PINCTRL_ROCKCHIP_RK322X=y CONFIG_RAM=y CONFIG_SPL_RAM=y CONFIG_BAUDRATE=1500000
configs/evb-rk3288_defconfig +0 -2
@@ -57,8 +57,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_DM_PMIC=y CONFIG_PMIC_ACT8846=y CONFIG_REGULATOR_ACT8846=y
configs/evb-rk3399_defconfig +0 -1
@@ -49,7 +49,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -CONFIG_PINCTRL_ROCKCHIP_RK3399=y CONFIG_DM_PMIC=y CONFIG_PMIC_RK8XX=y CONFIG_REGULATOR_PWM=y
configs/evb-rv1108_defconfig +0 -1
@@ -37,7 +37,6 @@ CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y -CONFIG_PINCTRL_ROCKCHIP_RV1108=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_BAUDRATE=1500000 # CONFIG_SPL_SERIAL_PRESENT is not set
configs/fennec-rk3288_defconfig +0 -2
@@ -56,8 +56,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_DM_PMIC=y CONFIG_PMIC_RK8XX=y CONFIG_DM_REGULATOR_FIXED=y
configs/firefly-rk3288_defconfig +0 -2
@@ -59,8 +59,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set CONFIG_PMIC_ACT8846=y
configs/firefly-rk3399_defconfig +0 -1
@@ -49,7 +49,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -CONFIG_PINCTRL_ROCKCHIP_RK3399=y CONFIG_DM_PMIC=y CONFIG_PMIC_RK8XX=y CONFIG_REGULATOR_PWM=y
configs/geekbox_defconfig +0 -1
@@ -16,7 +16,6 @@ CONFIG_REGMAP=y CONFIG_SYSCON=y CONFIG_CLK=y CONFIG_PINCTRL=y -CONFIG_PINCTRL_ROCKCHIP_RK3368=y CONFIG_RAM=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_DEBUG_UART_ANNOUNCE=y
configs/kylin-rk3036_defconfig +0 -1
@@ -41,7 +41,6 @@ CONFIG_LED=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PINCTRL=y -CONFIG_PINCTRL_ROCKCHIP_RK3036=y CONFIG_DM_REGULATOR_FIXED=y # CONFIG_SPL_DM_SERIAL is not set CONFIG_SYSRESET=y
configs/lion-rk3368_defconfig +0 -1
@@ -79,7 +79,6 @@ CONFIG_RGMII=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -CONFIG_PINCTRL_ROCKCHIP_RK3368=y CONFIG_DM_PMIC=y CONFIG_PMIC_RK8XX=y CONFIG_DM_REGULATOR_FIXED=y
configs/miqi-rk3288_defconfig +0 -2
@@ -56,8 +56,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_DM_PMIC=y CONFIG_PMIC_ACT8846=y CONFIG_REGULATOR_ACT8846=y
configs/phycore-rk3288_defconfig +0 -2
@@ -60,8 +60,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_DM_PMIC=y CONFIG_PMIC_RK8XX=y CONFIG_DM_REGULATOR_FIXED=y
configs/popmetal-rk3288_defconfig +0 -2
@@ -56,8 +56,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_DM_PMIC=y CONFIG_PMIC_RK8XX=y CONFIG_DM_REGULATOR_FIXED=y
configs/puma-rk3399_defconfig +0 -1
@@ -74,7 +74,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -CONFIG_PINCTRL_ROCKCHIP_RK3399=y CONFIG_DM_PMIC=y CONFIG_DM_PMIC_FAN53555=y CONFIG_PMIC_RK8XX=y
configs/rock2_defconfig +0 -2
@@ -56,8 +56,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set CONFIG_PMIC_ACT8846=y
configs/rock_defconfig +0 -1
@@ -41,7 +41,6 @@ CONFIG_LED=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PINCTRL=y -CONFIG_PINCTRL_ROCKCHIP_RK3188=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set CONFIG_PMIC_ACT8846=y
configs/sandbox_defconfig +0 -2
@@ -142,8 +142,6 @@ CONFIG_PHY=y CONFIG_PHY_SANDBOX=y CONFIG_PINCTRL=y CONFIG_PINCONF=y -CONFIG_PINCTRL_ROCKCHIP_RK3036=y -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_PINCTRL_SANDBOX=y CONFIG_POWER_DOMAIN=y CONFIG_SANDBOX_POWER_DOMAIN=y
configs/sandbox_flattree_defconfig +0 -2
@@ -119,8 +119,6 @@ CONFIG_PHY=y CONFIG_PHY_SANDBOX=y CONFIG_PINCTRL=y CONFIG_PINCONF=y -CONFIG_PINCTRL_ROCKCHIP_RK3036=y -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_PINCTRL_SANDBOX=y CONFIG_POWER_DOMAIN=y CONFIG_SANDBOX_POWER_DOMAIN=y
configs/sandbox_noblk_defconfig +0 -2
@@ -121,8 +121,6 @@ CONFIG_PHY=y CONFIG_PHY_SANDBOX=y CONFIG_PINCTRL=y CONFIG_PINCONF=y -CONFIG_PINCTRL_ROCKCHIP_RK3036=y -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_PINCTRL_SANDBOX=y CONFIG_DM_PMIC=y CONFIG_PMIC_ACT8846=y
configs/sheep-rk3368_defconfig +0 -1
@@ -20,7 +20,6 @@ CONFIG_CLK=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PINCTRL=y -CONFIG_PINCTRL_ROCKCHIP_RK3368=y CONFIG_RAM=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_DEBUG_UART_ANNOUNCE=y
configs/tinker-rk3288_defconfig +0 -2
@@ -59,8 +59,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_DM_PMIC=y CONFIG_PMIC_RK8XX=y CONFIG_DM_REGULATOR_FIXED=y
configs/vyasa-rk3288_defconfig +0 -2
@@ -54,8 +54,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set CONFIG_PMIC_RK8XX=y
Signature · 1 line
2.19.1
PATCH v2 7/9 rockchip: defconfig: Clean the unused pinctrl config
Quoted 4 lines · David Wu
If we used the pinctrl-rockchip driver, these config is not needed, so remove them.
Signed-off-by David Wu <[email protected]>
Thanks,
- Kever
Quoted 372 lines
---
Changes in v2: None
configs/chromebit_mickey_defconfig | 2 -- configs/chromebook_jerry_defconfig | 2 -- configs/chromebook_minnie_defconfig | 2 -- configs/evb-px5_defconfig | 1 - configs/evb-rk3128_defconfig | 1 - configs/evb-rk3229_defconfig | 1 - configs/evb-rk3288_defconfig | 2 -- configs/evb-rk3399_defconfig | 1 - configs/evb-rv1108_defconfig | 1 - configs/fennec-rk3288_defconfig | 2 -- configs/firefly-rk3288_defconfig | 2 -- configs/firefly-rk3399_defconfig | 1 - configs/geekbox_defconfig | 1 - configs/kylin-rk3036_defconfig | 1 - configs/lion-rk3368_defconfig | 1 - configs/miqi-rk3288_defconfig | 2 -- configs/phycore-rk3288_defconfig | 2 -- configs/popmetal-rk3288_defconfig | 2 -- configs/puma-rk3399_defconfig | 1 - configs/rock2_defconfig | 2 -- configs/rock_defconfig | 1 - configs/sandbox_defconfig | 2 -- configs/sandbox_flattree_defconfig | 2 -- configs/sandbox_noblk_defconfig | 2 -- configs/sheep-rk3368_defconfig | 1 - configs/tinker-rk3288_defconfig | 2 -- configs/vyasa-rk3288_defconfig | 2 -- 27 files changed, 42 deletions(-)configs/chromebit_mickey_defconfig +0
-2@@ -61,8 +61,6 @@ CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set CONFIG_PMIC_RK8XX=yconfigs/chromebook_jerry_defconfig +0
-2@@ -63,8 +63,6 @@ CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set CONFIG_PMIC_RK8XX=yconfigs/chromebook_minnie_defconfig +0
-2@@ -62,8 +62,6 @@ CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set CONFIG_PMIC_RK8XX=yconfigs/evb-px5_defconfig +0
-1@@ -22,7 +22,6 @@ CONFIG_CLK=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PINCTRL=y -CONFIG_PINCTRL_ROCKCHIP_RK3368=y CONFIG_RAM=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_DEBUG_UART_ANNOUNCE=yconfigs/evb-rk3128_defconfig +0
-1@@ -31,7 +31,6 @@ CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PHY=y CONFIG_PINCTRL=y -CONFIG_PINCTRL_ROCKCHIP_RK3128=y CONFIG_REGULATOR_PWM=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_RAM=yconfigs/evb-rk3229_defconfig +0
-1@@ -44,7 +44,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PHY=y CONFIG_PINCTRL=y -CONFIG_PINCTRL_ROCKCHIP_RK322X=y CONFIG_RAM=y CONFIG_SPL_RAM=y CONFIG_BAUDRATE=1500000configs/evb-rk3288_defconfig +0
-2@@ -57,8 +57,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_DM_PMIC=y CONFIG_PMIC_ACT8846=y CONFIG_REGULATOR_ACT8846=yconfigs/evb-rk3399_defconfig +0
-1@@ -49,7 +49,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -CONFIG_PINCTRL_ROCKCHIP_RK3399=y CONFIG_DM_PMIC=y CONFIG_PMIC_RK8XX=y CONFIG_REGULATOR_PWM=yconfigs/evb-rv1108_defconfig +0
-1@@ -37,7 +37,6 @@ CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y -CONFIG_PINCTRL_ROCKCHIP_RV1108=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_BAUDRATE=1500000 # CONFIG_SPL_SERIAL_PRESENT is not setconfigs/fennec-rk3288_defconfig +0
-2@@ -56,8 +56,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_DM_PMIC=y CONFIG_PMIC_RK8XX=y CONFIG_DM_REGULATOR_FIXED=yconfigs/firefly-rk3288_defconfig +0
-2@@ -59,8 +59,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set CONFIG_PMIC_ACT8846=yconfigs/firefly-rk3399_defconfig +0
-1@@ -49,7 +49,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -CONFIG_PINCTRL_ROCKCHIP_RK3399=y CONFIG_DM_PMIC=y CONFIG_PMIC_RK8XX=y CONFIG_REGULATOR_PWM=yconfigs/geekbox_defconfig +0
-1@@ -16,7 +16,6 @@ CONFIG_REGMAP=y CONFIG_SYSCON=y CONFIG_CLK=y CONFIG_PINCTRL=y -CONFIG_PINCTRL_ROCKCHIP_RK3368=y CONFIG_RAM=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_DEBUG_UART_ANNOUNCE=yconfigs/kylin-rk3036_defconfig +0
-1@@ -41,7 +41,6 @@ CONFIG_LED=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PINCTRL=y -CONFIG_PINCTRL_ROCKCHIP_RK3036=y CONFIG_DM_REGULATOR_FIXED=y # CONFIG_SPL_DM_SERIAL is not set CONFIG_SYSRESET=yconfigs/lion-rk3368_defconfig +0
-1@@ -79,7 +79,6 @@ CONFIG_RGMII=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -CONFIG_PINCTRL_ROCKCHIP_RK3368=y CONFIG_DM_PMIC=y CONFIG_PMIC_RK8XX=y CONFIG_DM_REGULATOR_FIXED=yconfigs/miqi-rk3288_defconfig +0
-2@@ -56,8 +56,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_DM_PMIC=y CONFIG_PMIC_ACT8846=y CONFIG_REGULATOR_ACT8846=yconfigs/phycore-rk3288_defconfig +0
-2@@ -60,8 +60,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_DM_PMIC=y CONFIG_PMIC_RK8XX=y CONFIG_DM_REGULATOR_FIXED=yconfigs/popmetal-rk3288_defconfig +0
-2@@ -56,8 +56,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_DM_PMIC=y CONFIG_PMIC_RK8XX=y CONFIG_DM_REGULATOR_FIXED=yconfigs/puma-rk3399_defconfig +0
-1@@ -74,7 +74,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -CONFIG_PINCTRL_ROCKCHIP_RK3399=y CONFIG_DM_PMIC=y CONFIG_DM_PMIC_FAN53555=y CONFIG_PMIC_RK8XX=yconfigs/rock2_defconfig +0
-2@@ -56,8 +56,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set CONFIG_PMIC_ACT8846=yconfigs/rock_defconfig +0
-1@@ -41,7 +41,6 @@ CONFIG_LED=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PINCTRL=y -CONFIG_PINCTRL_ROCKCHIP_RK3188=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set CONFIG_PMIC_ACT8846=yconfigs/sandbox_defconfig +0
-2@@ -142,8 +142,6 @@ CONFIG_PHY=y CONFIG_PHY_SANDBOX=y CONFIG_PINCTRL=y CONFIG_PINCONF=y -CONFIG_PINCTRL_ROCKCHIP_RK3036=y -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_PINCTRL_SANDBOX=y CONFIG_POWER_DOMAIN=y CONFIG_SANDBOX_POWER_DOMAIN=yconfigs/sandbox_flattree_defconfig +0
-2@@ -119,8 +119,6 @@ CONFIG_PHY=y CONFIG_PHY_SANDBOX=y CONFIG_PINCTRL=y CONFIG_PINCONF=y -CONFIG_PINCTRL_ROCKCHIP_RK3036=y -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_PINCTRL_SANDBOX=y CONFIG_POWER_DOMAIN=y CONFIG_SANDBOX_POWER_DOMAIN=yconfigs/sandbox_noblk_defconfig +0
-2@@ -121,8 +121,6 @@ CONFIG_PHY=y CONFIG_PHY_SANDBOX=y CONFIG_PINCTRL=y CONFIG_PINCONF=y -CONFIG_PINCTRL_ROCKCHIP_RK3036=y -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_PINCTRL_SANDBOX=y CONFIG_DM_PMIC=y CONFIG_PMIC_ACT8846=yconfigs/sheep-rk3368_defconfig +0
-1@@ -20,7 +20,6 @@ CONFIG_CLK=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PINCTRL=y -CONFIG_PINCTRL_ROCKCHIP_RK3368=y CONFIG_RAM=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_DEBUG_UART_ANNOUNCE=yconfigs/tinker-rk3288_defconfig +0
-2@@ -59,8 +59,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_DM_PMIC=y CONFIG_PMIC_RK8XX=y CONFIG_DM_REGULATOR_FIXED=yconfigs/vyasa-rk3288_defconfig +0
-2@@ -54,8 +54,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set CONFIG_PMIC_RK8XX=y
PATCH v2 7/9 rockchip: defconfig: Clean the unused pinctrl config
In reply to David WuQuoted 29 lines
If we used the pinctrl-rockchip driver, these config is not needed, so remove them.
Signed-off-by David Wu <[email protected]>Reviewed-by Kever Yang <[email protected]>---
Changes in v2: None
configs/chromebit_mickey_defconfig | 2 -- configs/chromebook_jerry_defconfig | 2 -- configs/chromebook_minnie_defconfig | 2 -- configs/evb-px5_defconfig | 1 - configs/evb-rk3128_defconfig | 1 - configs/evb-rk3229_defconfig | 1 - configs/evb-rk3288_defconfig | 2 -- configs/evb-rk3399_defconfig | 1 - configs/evb-rv1108_defconfig | 1 - configs/fennec-rk3288_defconfig | 2 -- configs/firefly-rk3288_defconfig | 2 -- configs/firefly-rk3399_defconfig | 1 - configs/geekbox_defconfig | 1 - configs/kylin-rk3036_defconfig | 1 - configs/lion-rk3368_defconfig | 1 - configs/miqi-rk3288_defconfig | 2 -- configs/phycore-rk3288_defconfig | 2 -- configs/popmetal-rk3288_defconfig | 2 -- configs/puma-rk3399_defconfig | 1 - configs/rock2_defconfig | 2 --
Quoted 9 lines
configs/rock_defconfig | 1 - configs/sandbox_defconfig | 2 -- configs/sandbox_flattree_defconfig | 2 -- configs/sandbox_noblk_defconfig | 2 -- configs/sheep-rk3368_defconfig | 1 - configs/tinker-rk3288_defconfig | 2 -- configs/vyasa-rk3288_defconfig | 2 -- 27 files changed, 42 deletions(-)
PATCH v2 7/9 rockchip: defconfig: Clean the unused pinctrl config
In reply to David WuQuoted 29 lines
If we used the pinctrl-rockchip driver, these config is not needed, so remove them.
Signed-off-by David Wu <[email protected]>Reviewed-by Kever Yang <[email protected]>---
Changes in v2: None
configs/chromebit_mickey_defconfig | 2 -- configs/chromebook_jerry_defconfig | 2 -- configs/chromebook_minnie_defconfig | 2 -- configs/evb-px5_defconfig | 1 - configs/evb-rk3128_defconfig | 1 - configs/evb-rk3229_defconfig | 1 - configs/evb-rk3288_defconfig | 2 -- configs/evb-rk3399_defconfig | 1 - configs/evb-rv1108_defconfig | 1 - configs/fennec-rk3288_defconfig | 2 -- configs/firefly-rk3288_defconfig | 2 -- configs/firefly-rk3399_defconfig | 1 - configs/geekbox_defconfig | 1 - configs/kylin-rk3036_defconfig | 1 - configs/lion-rk3368_defconfig | 1 - configs/miqi-rk3288_defconfig | 2 -- configs/phycore-rk3288_defconfig | 2 -- configs/popmetal-rk3288_defconfig | 2 -- configs/puma-rk3399_defconfig | 1 - configs/rock2_defconfig | 2 --
Quoted 9 lines
configs/rock_defconfig | 1 - configs/sandbox_defconfig | 2 -- configs/sandbox_flattree_defconfig | 2 -- configs/sandbox_noblk_defconfig | 2 -- configs/sheep-rk3368_defconfig | 1 - configs/tinker-rk3288_defconfig | 2 -- configs/vyasa-rk3288_defconfig | 2 -- 27 files changed, 42 deletions(-)
Applied to u-boot-rockchip, thanks!
PATCH v2 7/9 rockchip: defconfig: Clean the unused pinctrl config
Hi Philipp,
Quoted 39 lines · On Thu, 31 Jan 2019 22:12:36 +0100 Philipp Tomsich…
Quoted 29 lines
If we used the pinctrl-rockchip driver, these config is not needed, so remove them.
Signed-off-by David Wu <[email protected]>Reviewed-by Kever Yang <[email protected]>---
Changes in v2: None
configs/chromebit_mickey_defconfig | 2 -- configs/chromebook_jerry_defconfig | 2 -- configs/chromebook_minnie_defconfig | 2 -- configs/evb-px5_defconfig | 1 - configs/evb-rk3128_defconfig | 1 - configs/evb-rk3229_defconfig | 1 - configs/evb-rk3288_defconfig | 2 -- configs/evb-rk3399_defconfig | 1 - configs/evb-rv1108_defconfig | 1 - configs/fennec-rk3288_defconfig | 2 -- configs/firefly-rk3288_defconfig | 2 -- configs/firefly-rk3399_defconfig | 1 - configs/geekbox_defconfig | 1 - configs/kylin-rk3036_defconfig | 1 - configs/lion-rk3368_defconfig | 1 - configs/miqi-rk3288_defconfig | 2 -- configs/phycore-rk3288_defconfig | 2 -- configs/popmetal-rk3288_defconfig | 2 -- configs/puma-rk3399_defconfig | 1 - configs/rock2_defconfig | 2 --Quoted 9 lines
configs/rock_defconfig | 1 - configs/sandbox_defconfig | 2 -- configs/sandbox_flattree_defconfig | 2 -- configs/sandbox_noblk_defconfig | 2 -- configs/sheep-rk3368_defconfig | 1 - configs/tinker-rk3288_defconfig | 2 -- configs/vyasa-rk3288_defconfig | 2 -- 27 files changed, 42 deletions(-)
Quoted 1 line
Applied to u-boot-rockchip, thanks!
Looks like you also added some .rej files (see [1]).
This cause some problem each time we run make clean as it delete the
files etc ...
[1] :
http://git.denx.de/?p=u-boot.git;a=commit;h=2ec3d25f8faab51c2334174a582a96ad28d96344
Signature · 1 line
Emmanuel Vadot <[email protected]> <[email protected]>
PATCH v2 7/9 rockchip: defconfig: Clean the unused pinctrl config
Emmanuel,
Thanks for the heads-up.
The follow-on PR is already on the list (+ an additional patch to include these in .gitignore).
Thanks,
Phil.
Quoted 60 lines · Emmanuel Vadot
Hi Philipp,
Quoted 39 lines · On Thu, 31 Jan 2019 22:12:36 +0100 Philipp Tomsich…
Quoted 29 lines
If we used the pinctrl-rockchip driver, these config is not needed, so remove them.
Signed-off-by David Wu <[email protected]>Reviewed-by Kever Yang <[email protected]>---
Changes in v2: None
configs/chromebit_mickey_defconfig | 2 -- configs/chromebook_jerry_defconfig | 2 -- configs/chromebook_minnie_defconfig | 2 -- configs/evb-px5_defconfig | 1 - configs/evb-rk3128_defconfig | 1 - configs/evb-rk3229_defconfig | 1 - configs/evb-rk3288_defconfig | 2 -- configs/evb-rk3399_defconfig | 1 - configs/evb-rv1108_defconfig | 1 - configs/fennec-rk3288_defconfig | 2 -- configs/firefly-rk3288_defconfig | 2 -- configs/firefly-rk3399_defconfig | 1 - configs/geekbox_defconfig | 1 - configs/kylin-rk3036_defconfig | 1 - configs/lion-rk3368_defconfig | 1 - configs/miqi-rk3288_defconfig | 2 -- configs/phycore-rk3288_defconfig | 2 -- configs/popmetal-rk3288_defconfig | 2 -- configs/puma-rk3399_defconfig | 1 - configs/rock2_defconfig | 2 --Quoted 9 lines
configs/rock_defconfig | 1 - configs/sandbox_defconfig | 2 -- configs/sandbox_flattree_defconfig | 2 -- configs/sandbox_noblk_defconfig | 2 -- configs/sheep-rk3368_defconfig | 1 - configs/tinker-rk3288_defconfig | 2 -- configs/vyasa-rk3288_defconfig | 2 -- 27 files changed, 42 deletions(-)Quoted 1 line
Applied to u-boot-rockchip, thanks!
Looks like you also added some .rej files (see [1]).
This cause some problem each time we run make clean as it delete the files etc ...
[1] :
http://git.denx.de/?p=u-boot.git;a=commit;h=2ec3d25f8faab51c2334174a582a96ad28d96344Signature · 1 line
Emmanuel Vadot <[email protected]> <[email protected]>
PATCH v2 8/9 pinctrl: rockchip: Clean the unused rockchip pinctrl drivers
In reply to David WuIf we used the pinctrl-rockchip driver, these code is not needed, so remove them.
---
Changes in v2: None
drivers/pinctrl/rockchip/pinctrl_rk3036.c | 671 --------------- drivers/pinctrl/rockchip/pinctrl_rk3128.c | 186 ---- drivers/pinctrl/rockchip/pinctrl_rk3188.c | 989 ---------------------- drivers/pinctrl/rockchip/pinctrl_rk322x.c | 894 ------------------- drivers/pinctrl/rockchip/pinctrl_rk3288.c | 869 ------------------- drivers/pinctrl/rockchip/pinctrl_rk3328.c | 705 --------------- drivers/pinctrl/rockchip/pinctrl_rk3368.c | 739 ---------------- drivers/pinctrl/rockchip/pinctrl_rk3399.c | 503 ----------- drivers/pinctrl/rockchip/pinctrl_rv1108.c | 580 ------------- 9 files changed, 6136 deletions(-) delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3036.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3128.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3188.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk322x.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3288.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3328.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3368.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3399.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rv1108.c
drivers/pinctrl/rockchip/pinctrl_rk3036.c deleted +0 -671
@@ -1,671 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* -* Pinctrl driver for Rockchip 3036 SoCs -* (C) Copyright 2015 Rockchip Electronics Co., Ltd -*/ - -#include <common.h> -#include <dm.h> -#include <errno.h> -#include <syscon.h> -#include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/grf_rk3036.h> -#include <asm/arch/hardware.h> -#include <asm/arch/periph.h> -#include <dm/pinctrl.h> - -/* GRF_GPIO0A_IOMUX */ -enum { -GPIO0A3_SHIFT =6 , -GPIO0A3_MASK =1 <<GPIO0A3_SHIFT , -GPIO0A3_GPIO =0 , -GPIO0A3_I2C1_SDA , - -GPIO0A2_SHIFT =4 , -GPIO0A2_MASK =1 <<GPIO0A2_SHIFT , -GPIO0A2_GPIO =0 , -GPIO0A2_I2C1_SCL , - -GPIO0A1_SHIFT =2 , -GPIO0A1_MASK =3 <<GPIO0A1_SHIFT , -GPIO0A1_GPIO =0 , -GPIO0A1_I2C0_SDA , -GPIO0A1_PWM2 , - -GPIO0A0_SHIFT =0 , -GPIO0A0_MASK =3 <<GPIO0A0_SHIFT , -GPIO0A0_GPIO =0 , -GPIO0A0_I2C0_SCL , -GPIO0A0_PWM1 , -}; - -/* GRF_GPIO0B_IOMUX */ -enum { -GPIO0B6_SHIFT =12 , -GPIO0B6_MASK =3 <<GPIO0B6_SHIFT , -GPIO0B6_GPIO =0 , -GPIO0B6_MMC1_D3 , -GPIO0B6_I2S1_SCLK , - -GPIO0B5_SHIFT =10 , -GPIO0B5_MASK =3 <<GPIO0B5_SHIFT , -GPIO0B5_GPIO =0 , -GPIO0B5_MMC1_D2 , -GPIO0B5_I2S1_SDI , - -GPIO0B4_SHIFT =8 , -GPIO0B4_MASK =3 <<GPIO0B4_SHIFT , -GPIO0B4_GPIO =0 , -GPIO0B4_MMC1_D1 , -GPIO0B4_I2S1_LRCKTX , - -GPIO0B3_SHIFT =6 , -GPIO0B3_MASK =3 <<GPIO0B3_SHIFT , -GPIO0B3_GPIO =0 , -GPIO0B3_MMC1_D0 , -GPIO0B3_I2S1_LRCKRX , - -GPIO0B1_SHIFT =2 , -GPIO0B1_MASK =3 <<GPIO0B1_SHIFT , -GPIO0B1_GPIO =0 , -GPIO0B1_MMC1_CLKOUT , -GPIO0B1_I2S1_MCLK , - -GPIO0B0_SHIFT =0 , -GPIO0B0_MASK =3 , -GPIO0B0_GPIO =0 , -GPIO0B0_MMC1_CMD , -GPIO0B0_I2S1_SDO , -}; - -/* GRF_GPIO0C_IOMUX */ -enum { -GPIO0C4_SHIFT =8 , -GPIO0C4_MASK =1 <<GPIO0C4_SHIFT , -GPIO0C4_GPIO =0 , -GPIO0C4_DRIVE_VBUS , - -GPIO0C3_SHIFT =6 , -GPIO0C3_MASK =1 <<GPIO0C3_SHIFT , -GPIO0C3_GPIO =0 , -GPIO0C3_UART0_CTSN , - -GPIO0C2_SHIFT =4 , -GPIO0C2_MASK =1 <<GPIO0C2_SHIFT , -GPIO0C2_GPIO =0 , -GPIO0C2_UART0_RTSN , - -GPIO0C1_SHIFT =2 , -GPIO0C1_MASK =1 <<GPIO0C1_SHIFT , -GPIO0C1_GPIO =0 , -GPIO0C1_UART0_SIN , - - -GPIO0C0_SHIFT =0 , -GPIO0C0_MASK =1 <<GPIO0C0_SHIFT , -GPIO0C0_GPIO =0 , -GPIO0C0_UART0_SOUT , -}; - -/* GRF_GPIO0D_IOMUX */ -enum { -GPIO0D4_SHIFT =8 , -GPIO0D4_MASK =1 <<GPIO0D4_SHIFT , -GPIO0D4_GPIO =0 , -GPIO0D4_SPDIF , - -GPIO0D3_SHIFT =6 , -GPIO0D3_MASK =1 <<GPIO0D3_SHIFT , -GPIO0D3_GPIO =0 , -GPIO0D3_PWM3 , - -GPIO0D2_SHIFT =4 , -GPIO0D2_MASK =1 <<GPIO0D2_SHIFT , -GPIO0D2_GPIO =0 , -GPIO0D2_PWM0 , -}; - -/* GRF_GPIO1A_IOMUX */ -enum { -GPIO1A5_SHIFT =10 , -GPIO1A5_MASK =1 <<GPIO1A5_SHIFT , -GPIO1A5_GPIO =0 , -GPIO1A5_I2S_SDI , - -GPIO1A4_SHIFT =8 , -GPIO1A4_MASK =1 <<GPIO1A4_SHIFT , -GPIO1A4_GPIO =0 , -GPIO1A4_I2S_SD0 , - -GPIO1A3_SHIFT =6 , -GPIO1A3_MASK =1 <<GPIO1A3_SHIFT , -GPIO1A3_GPIO =0 , -GPIO1A3_I2S_LRCKTX , - -GPIO1A2_SHIFT =4 , -GPIO1A2_MASK =3 <<GPIO1A2_SHIFT , -GPIO1A2_GPIO =0 , -GPIO1A2_I2S_LRCKRX , -GPIO1A2_PWM1_0 , - -GPIO1A1_SHIFT =2 , -GPIO1A1_MASK =1 <<GPIO1A1_SHIFT , -GPIO1A1_GPIO =0 , -GPIO1A1_I2S_SCLK , - -GPIO1A0_SHIFT =0 , -GPIO1A0_MASK =1 <<GPIO1A0_SHIFT , -GPIO1A0_GPIO =0 , -GPIO1A0_I2S_MCLK , - -}; - -/* GRF_GPIO1B_IOMUX */ -enum { -GPIO1B7_SHIFT =14 , -GPIO1B7_MASK =1 <<GPIO1B7_SHIFT , -GPIO1B7_GPIO =0 , -GPIO1B7_MMC0_CMD , - -GPIO1B3_SHIFT =6 , -GPIO1B3_MASK =1 <<GPIO1B3_SHIFT , -GPIO1B3_GPIO =0 , -GPIO1B3_HDMI_HPD , - -GPIO1B2_SHIFT =4 , -GPIO1B2_MASK =1 <<GPIO1B2_SHIFT , -GPIO1B2_GPIO =0 , -GPIO1B2_HDMI_SCL , - -GPIO1B1_SHIFT =2 , -GPIO1B1_MASK =1 <<GPIO1B1_SHIFT , -GPIO1B1_GPIO =0 , -GPIO1B1_HDMI_SDA , - -GPIO1B0_SHIFT =0 , -GPIO1B0_MASK =1 <<GPIO1B0_SHIFT , -GPIO1B0_GPIO =0 , -GPIO1B0_HDMI_CEC , -}; - -/* GRF_GPIO1C_IOMUX */ -enum { -GPIO1C5_SHIFT =10 , -GPIO1C5_MASK =3 <<GPIO1C5_SHIFT , -GPIO1C5_GPIO =0 , -GPIO1C5_MMC0_D3 , -GPIO1C5_JTAG_TMS , - -GPIO1C4_SHIFT =8 , -GPIO1C4_MASK =3 <<GPIO1C4_SHIFT , -GPIO1C4_GPIO =0 , -GPIO1C4_MMC0_D2 , -GPIO1C4_JTAG_TCK , - -GPIO1C3_SHIFT =6 , -GPIO1C3_MASK =3 <<GPIO1C3_SHIFT , -GPIO1C3_GPIO =0 , -GPIO1C3_MMC0_D1 , -GPIO1C3_UART2_SOUT , - -GPIO1C2_SHIFT =4 , -GPIO1C2_MASK =3 <<GPIO1C2_SHIFT , -GPIO1C2_GPIO =0 , -GPIO1C2_MMC0_D0 , -GPIO1C2_UART2_SIN , - -GPIO1C1_SHIFT =2 , -GPIO1C1_MASK =1 <<GPIO1C1_SHIFT , -GPIO1C1_GPIO =0 , -GPIO1C1_MMC0_DETN , - -GPIO1C0_SHIFT =0 , -GPIO1C0_MASK =1 <<GPIO1C0_SHIFT , -GPIO1C0_GPIO =0 , -GPIO1C0_MMC0_CLKOUT , -}; - -/* GRF_GPIO1D_IOMUX */ -enum { -GPIO1D7_SHIFT =14 , -GPIO1D7_MASK =3 <<GPIO1D7_SHIFT , -GPIO1D7_GPIO =0 , -GPIO1D7_NAND_D7 , -GPIO1D7_EMMC_D7 , -GPIO1D7_SPI_CSN1 , - -GPIO1D6_SHIFT =12 , -GPIO1D6_MASK =3 <<GPIO1D6_SHIFT , -GPIO1D6_GPIO =0 , -GPIO1D6_NAND_D6 , -GPIO1D6_EMMC_D6 , -GPIO1D6_SPI_CSN0 , - -GPIO1D5_SHIFT =10 , -GPIO1D5_MASK =3 <<GPIO1D5_SHIFT , -GPIO1D5_GPIO =0 , -GPIO1D5_NAND_D5 , -GPIO1D5_EMMC_D5 , -GPIO1D5_SPI_TXD , - -GPIO1D4_SHIFT =8 , -GPIO1D4_MASK =3 <<GPIO1D4_SHIFT , -GPIO1D4_GPIO =0 , -GPIO1D4_NAND_D4 , -GPIO1D4_EMMC_D4 , -GPIO1D4_SPI_RXD , - -GPIO1D3_SHIFT =6 , -GPIO1D3_MASK =3 <<GPIO1D3_SHIFT , -GPIO1D3_GPIO =0 , -GPIO1D3_NAND_D3 , -GPIO1D3_EMMC_D3 , -GPIO1D3_SFC_SIO3 , - -GPIO1D2_SHIFT =4 , -GPIO1D2_MASK =3 <<GPIO1D2_SHIFT , -GPIO1D2_GPIO =0 , -GPIO1D2_NAND_D2 , -GPIO1D2_EMMC_D2 , -GPIO1D2_SFC_SIO2 , - -GPIO1D1_SHIFT =2 , -GPIO1D1_MASK =3 <<GPIO1D1_SHIFT , -GPIO1D1_GPIO =0 , -GPIO1D1_NAND_D1 , -GPIO1D1_EMMC_D1 , -GPIO1D1_SFC_SIO1 , - -GPIO1D0_SHIFT =0 , -GPIO1D0_MASK =3 <<GPIO1D0_SHIFT , -GPIO1D0_GPIO =0 , -GPIO1D0_NAND_D0 , -GPIO1D0_EMMC_D0 , -GPIO1D0_SFC_SIO0 , -}; - -/* GRF_GPIO2A_IOMUX */ -enum { -GPIO2A7_SHIFT =14 , -GPIO2A7_MASK =1 <<GPIO2A7_SHIFT , -GPIO2A7_GPIO =0 , -GPIO2A7_TESTCLK_OUT , - -GPIO2A6_SHIFT =12 , -GPIO2A6_MASK =1 <<GPIO2A6_SHIFT , -GPIO2A6_GPIO =0 , -GPIO2A6_NAND_CS0 , - -GPIO2A4_SHIFT =8 , -GPIO2A4_MASK =3 <<GPIO2A4_SHIFT , -GPIO2A4_GPIO =0 , -GPIO2A4_NAND_RDY , -GPIO2A4_EMMC_CMD , -GPIO2A3_SFC_CLK , - -GPIO2A3_SHIFT =6 , -GPIO2A3_MASK =3 <<GPIO2A3_SHIFT , -GPIO2A3_GPIO =0 , -GPIO2A3_NAND_RDN , -GPIO2A4_SFC_CSN1 , - -GPIO2A2_SHIFT =4 , -GPIO2A2_MASK =3 <<GPIO2A2_SHIFT , -GPIO2A2_GPIO =0 , -GPIO2A2_NAND_WRN , -GPIO2A4_SFC_CSN0 , - -GPIO2A1_SHIFT =2 , -GPIO2A1_MASK =3 <<GPIO2A1_SHIFT , -GPIO2A1_GPIO =0 , -GPIO2A1_NAND_CLE , -GPIO2A1_EMMC_CLKOUT , - -GPIO2A0_SHIFT =0 , -GPIO2A0_MASK =3 <<GPIO2A0_SHIFT , -GPIO2A0_GPIO =0 , -GPIO2A0_NAND_ALE , -GPIO2A0_SPI_CLK , -}; - -/* GRF_GPIO2B_IOMUX */ -enum { -GPIO2B7_SHIFT =14 , -GPIO2B7_MASK =1 <<GPIO2B7_SHIFT , -GPIO2B7_GPIO =0 , -GPIO2B7_MAC_RXER , - -GPIO2B6_SHIFT =12 , -GPIO2B6_MASK =3 <<GPIO2B6_SHIFT , -GPIO2B6_GPIO =0 , -GPIO2B6_MAC_CLKOUT , -GPIO2B6_MAC_CLKIN , - -GPIO2B5_SHIFT =10 , -GPIO2B5_MASK =1 <<GPIO2B5_SHIFT , -GPIO2B5_GPIO =0 , -GPIO2B5_MAC_TXEN , - -GPIO2B4_SHIFT =8 , -GPIO2B4_MASK =1 <<GPIO2B4_SHIFT , -GPIO2B4_GPIO =0 , -GPIO2B4_MAC_MDIO , - -GPIO2B2_SHIFT =4 , -GPIO2B2_MASK =1 <<GPIO2B2_SHIFT , -GPIO2B2_GPIO =0 , -GPIO2B2_MAC_CRS , -}; - -/* GRF_GPIO2C_IOMUX */ -enum { -GPIO2C7_SHIFT =14 , -GPIO2C7_MASK =3 <<GPIO2C7_SHIFT , -GPIO2C7_GPIO =0 , -GPIO2C7_UART1_SOUT , -GPIO2C7_TESTCLK_OUT1 , - -GPIO2C6_SHIFT =12 , -GPIO2C6_MASK =1 <<GPIO2C6_SHIFT , -GPIO2C6_GPIO =0 , -GPIO2C6_UART1_SIN , - -GPIO2C5_SHIFT =10 , -GPIO2C5_MASK =1 <<GPIO2C5_SHIFT , -GPIO2C5_GPIO =0 , -GPIO2C5_I2C2_SCL , - -GPIO2C4_SHIFT =8 , -GPIO2C4_MASK =1 <<GPIO2C4_SHIFT , -GPIO2C4_GPIO =0 , -GPIO2C4_I2C2_SDA , - -GPIO2C3_SHIFT =6 , -GPIO2C3_MASK =1 <<GPIO2C3_SHIFT , -GPIO2C3_GPIO =0 , -GPIO2C3_MAC_TXD0 , - -GPIO2C2_SHIFT =4 , -GPIO2C2_MASK =1 <<GPIO2C2_SHIFT , -GPIO2C2_GPIO =0 , -GPIO2C2_MAC_TXD1 , - -GPIO2C1_SHIFT =2 , -GPIO2C1_MASK =1 <<GPIO2C1_SHIFT , -GPIO2C1_GPIO =0 , -GPIO2C1_MAC_RXD0 , - -GPIO2C0_SHIFT =0 , -GPIO2C0_MASK =1 <<GPIO2C0_SHIFT , -GPIO2C0_GPIO =0 , -GPIO2C0_MAC_RXD1 , -}; - -/* GRF_GPIO2D_IOMUX */ -enum { -GPIO2D6_SHIFT =12 , -GPIO2D6_MASK =1 <<GPIO2D6_SHIFT , -GPIO2D6_GPIO =0 , -GPIO2D6_I2S_SDO1 , - -GPIO2D5_SHIFT =10 , -GPIO2D5_MASK =1 <<GPIO2D5_SHIFT , -GPIO2D5_GPIO =0 , -GPIO2D5_I2S_SDO2 , - -GPIO2D4_SHIFT =8 , -GPIO2D4_MASK =1 <<GPIO2D4_SHIFT , -GPIO2D4_GPIO =0 , -GPIO2D4_I2S_SDO3 , - -GPIO2D1_SHIFT =2 , -GPIO2D1_MASK =1 <<GPIO2D1_SHIFT , -GPIO2D1_GPIO =0 , -GPIO2D1_MAC_MDC , -}; - -struct rk3036_pinctrl_priv { -struct rk3036_grf *grf; -}; - -static void pinctrl_rk3036_pwm_config (struct rk3036_grf *grf,int pwm_id) -{ -switch (pwm_id) { -case PERIPH_ID_PWM0 : -rk_clrsetreg (&grf->gpio0d_iomux,GPIO0D2_MASK , -GPIO0D2_PWM0 <<GPIO0D2_SHIFT ); -break ; -case PERIPH_ID_PWM1 : -rk_clrsetreg (&grf->gpio0a_iomux,GPIO0A0_MASK , -GPIO0A0_PWM1 <<GPIO0A0_SHIFT ); -break ; -case PERIPH_ID_PWM2 : -rk_clrsetreg (&grf->gpio0a_iomux,GPIO0A1_MASK , -GPIO0A1_PWM2 <<GPIO0A1_SHIFT ); -break ; -case PERIPH_ID_PWM3 : -rk_clrsetreg (&grf->gpio0a_iomux,GPIO0D3_MASK , -GPIO0D3_PWM3 <<GPIO0D3_SHIFT ); -break ; -default : -debug ("pwm id = %d iomux error!\n" , pwm_id); -break ; - } -} - -static void pinctrl_rk3036_i2c_config (struct rk3036_grf *grf,int i2c_id) -{ -switch (i2c_id) { -case PERIPH_ID_I2C0 : -rk_clrsetreg (&grf->gpio0a_iomux, -GPIO0A1_MASK |GPIO0A0_MASK , -GPIO0A1_I2C0_SDA <<GPIO0A1_SHIFT | -GPIO0A0_I2C0_SCL <<GPIO0A0_SHIFT ); - -break ; -case PERIPH_ID_I2C1 : -rk_clrsetreg (&grf->gpio0a_iomux, -GPIO0A3_MASK |GPIO0A2_MASK , -GPIO0A3_I2C1_SDA <<GPIO0A3_SHIFT | -GPIO0A2_I2C1_SCL <<GPIO0A2_SHIFT ); -break ; -case PERIPH_ID_I2C2 : -rk_clrsetreg (&grf->gpio2c_iomux, -GPIO2C5_MASK |GPIO2C4_MASK , -GPIO2C5_I2C2_SCL <<GPIO2C5_SHIFT | -GPIO2C4_I2C2_SDA <<GPIO2C4_SHIFT ); - -break ; - } -} - -static void pinctrl_rk3036_spi_config (struct rk3036_grf *grf,int cs) -{ -switch (cs) { -case 0 : -rk_clrsetreg (&grf->gpio1d_iomux,GPIO1D6_MASK , -GPIO1D6_SPI_CSN0 <<GPIO1D6_SHIFT ); -break ; -case 1 : -rk_clrsetreg (&grf->gpio1d_iomux,GPIO1D7_MASK , -GPIO1D7_SPI_CSN1 <<GPIO1D7_SHIFT ); -break ; - } -rk_clrsetreg (&grf->gpio1d_iomux, -GPIO1D5_MASK |GPIO1D4_MASK , -GPIO1D5_SPI_TXD <<GPIO1D5_SHIFT | -GPIO1D4_SPI_RXD <<GPIO1D4_SHIFT ); - -rk_clrsetreg (&grf->gpio2a_iomux,GPIO2A0_MASK , -GPIO2A0_SPI_CLK <<GPIO2A0_SHIFT ); -} - -static void pinctrl_rk3036_uart_config (struct rk3036_grf *grf,int uart_id) -{ -switch (uart_id) { -case PERIPH_ID_UART0 : -rk_clrsetreg (&grf->gpio0c_iomux, -GPIO0C3_MASK |GPIO0C2_MASK | -GPIO0C1_MASK |GPIO0C0_MASK , -GPIO0C3_UART0_CTSN <<GPIO0C3_SHIFT | -GPIO0C2_UART0_RTSN <<GPIO0C2_SHIFT | -GPIO0C1_UART0_SIN <<GPIO0C1_SHIFT | -GPIO0C0_UART0_SOUT <<GPIO0C0_SHIFT ); -break ; -case PERIPH_ID_UART1 : -rk_clrsetreg (&grf->gpio2c_iomux, -GPIO2C7_MASK |GPIO2C6_MASK , -GPIO2C7_UART1_SOUT <<GPIO2C7_SHIFT | -GPIO2C6_UART1_SIN <<GPIO2C6_SHIFT ); -break ; -case PERIPH_ID_UART2 : -rk_clrsetreg (&grf->gpio1c_iomux, -GPIO1C3_MASK |GPIO1C2_MASK , -GPIO1C3_UART2_SOUT <<GPIO1C3_SHIFT | -GPIO1C2_UART2_SIN <<GPIO1C2_SHIFT ); -break ; - } -} - -static void pinctrl_rk3036_sdmmc_config (struct rk3036_grf *grf,int mmc_id) -{ -switch (mmc_id) { -case PERIPH_ID_EMMC : -rk_clrsetreg (&grf->gpio1d_iomux,0xffff , -GPIO1D7_EMMC_D7 <<GPIO1D7_SHIFT | -GPIO1D6_EMMC_D6 <<GPIO1D6_SHIFT | -GPIO1D5_EMMC_D5 <<GPIO1D5_SHIFT | -GPIO1D4_EMMC_D4 <<GPIO1D4_SHIFT | -GPIO1D3_EMMC_D3 <<GPIO1D3_SHIFT | -GPIO1D2_EMMC_D2 <<GPIO1D2_SHIFT | -GPIO1D1_EMMC_D1 <<GPIO1D1_SHIFT | -GPIO1D0_EMMC_D0 <<GPIO1D0_SHIFT ); -rk_clrsetreg (&grf->gpio2a_iomux, -GPIO2A4_MASK |GPIO2A1_MASK , -GPIO2A4_EMMC_CMD <<GPIO2A4_SHIFT | -GPIO2A1_EMMC_CLKOUT <<GPIO2A1_SHIFT ); -break ; -case PERIPH_ID_SDCARD : -rk_clrsetreg (&grf->gpio1c_iomux,0xffff , -GPIO1C5_MMC0_D3 <<GPIO1C5_SHIFT | -GPIO1C4_MMC0_D2 <<GPIO1C4_SHIFT | -GPIO1C3_MMC0_D1 <<GPIO1C3_SHIFT | -GPIO1C2_MMC0_D0 <<GPIO1C2_SHIFT | -GPIO1C1_MMC0_DETN <<GPIO1C1_SHIFT | -GPIO1C0_MMC0_CLKOUT <<GPIO1C0_SHIFT ); -break ; - } -} - -static int rk3036_pinctrl_request (struct udevice *dev,int func,int flags) -{ -struct rk3036_pinctrl_priv *priv =dev_get_priv (dev); - -debug ("%s: func=%x, flags=%x\n" , __func__, func, flags); -switch (func) { -case PERIPH_ID_PWM0 : -case PERIPH_ID_PWM1 : -case PERIPH_ID_PWM2 : -case PERIPH_ID_PWM3 : -pinctrl_rk3036_pwm_config (priv->grf, func); -break ; -case PERIPH_ID_I2C0 : -case PERIPH_ID_I2C1 : -case PERIPH_ID_I2C2 : -pinctrl_rk3036_i2c_config (priv->grf, func); -break ; -case PERIPH_ID_SPI0 : -pinctrl_rk3036_spi_config (priv->grf, flags); -break ; -case PERIPH_ID_UART0 : -case PERIPH_ID_UART1 : -case PERIPH_ID_UART2 : -pinctrl_rk3036_uart_config (priv->grf, func); -break ; -case PERIPH_ID_SDMMC0 : -case PERIPH_ID_SDMMC1 : -pinctrl_rk3036_sdmmc_config (priv->grf, func); -break ; -default : -return -EINVAL ; - } - -return 0 ; -} - -static int rk3036_pinctrl_get_periph_id (struct udevice *dev, -struct udevice *periph) -{ -u32 cell[3 ]; -int ret; - - ret =dev_read_u32_array (periph,"interrupts" , cell,ARRAY_SIZE (cell)); -if (ret <0 ) -return -EINVAL ; - -switch (cell[1 ]) { -case 14 : -return PERIPH_ID_SDCARD ; -case 16 : -return PERIPH_ID_EMMC ; -case 20 : -return PERIPH_ID_UART0 ; -case 21 : -return PERIPH_ID_UART1 ; -case 22 : -return PERIPH_ID_UART2 ; -case 23 : -return PERIPH_ID_SPI0 ; -case 24 : -return PERIPH_ID_I2C0 ; -case 25 : -return PERIPH_ID_I2C1 ; -case 26 : -return PERIPH_ID_I2C2 ; -case 30 : -return PERIPH_ID_PWM0 ; - } -return -ENOENT ; -} - -static int rk3036_pinctrl_set_state_simple (struct udevice *dev, -struct udevice *periph) -{ -int func; - - func =rk3036_pinctrl_get_periph_id (dev, periph); -if (func <0 ) -return func; -return rk3036_pinctrl_request (dev, func,0 ); -} - -static struct pinctrl_ops rk3036_pinctrl_ops = { - .set_state_simple = rk3036_pinctrl_set_state_simple, - .request = rk3036_pinctrl_request, - .get_periph_id = rk3036_pinctrl_get_periph_id, -}; - -static int rk3036_pinctrl_probe (struct udevice *dev) -{ -struct rk3036_pinctrl_priv *priv =dev_get_priv (dev); - - priv->grf =syscon_get_first_range (ROCKCHIP_SYSCON_GRF ); -debug ("%s: grf=%p\n" , __func__, priv->grf); -return 0 ; -} - -static const struct udevice_id rk3036_pinctrl_ids[] = { - { .compatible ="rockchip,rk3036-pinctrl" }, - { } -}; - -U_BOOT_DRIVER (pinctrl_rk3036) = { - .name ="pinctrl_rk3036" , - .id =UCLASS_PINCTRL , - .of_match = rk3036_pinctrl_ids, - .priv_auto_alloc_size =sizeof (struct rk3036_pinctrl_priv ), - .ops = &rk3036_pinctrl_ops, - .bind = dm_scan_fdt_dev, - .probe = rk3036_pinctrl_probe, -};
drivers/pinctrl/rockchip/pinctrl_rk3128.c deleted +0 -186
186 lines not on this page · raw message
drivers/pinctrl/rockchip/pinctrl_rk3188.c deleted +0 -989
989 lines not on this page · raw message
drivers/pinctrl/rockchip/pinctrl_rk322x.c deleted +0 -894
894 lines not on this page · raw message
drivers/pinctrl/rockchip/pinctrl_rk3288.c deleted +0 -869
260 lines not on this page · raw message
drivers/pinctrl/rockchip/pinctrl_rk3328.c deleted +0 -705
705 lines not on this page · raw message
drivers/pinctrl/rockchip/pinctrl_rk3368.c deleted +0 -739
739 lines not on this page · raw message
drivers/pinctrl/rockchip/pinctrl_rk3399.c deleted +0 -503
503 lines not on this page · raw message
drivers/pinctrl/rockchip/pinctrl_rv1108.c deleted +0 -580
580 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.19.1
Part of the diff is not shown here. View the raw message.
PATCH v2 8/9 pinctrl: rockchip: Clean the unused rockchip pinctrl drivers
Quoted 20 lines · David Wu
If we used the pinctrl-rockchip driver, these code is not needed, so remove them.
Signed-off-by David Wu <[email protected]>---
Changes in v2: None
drivers/pinctrl/rockchip/pinctrl_rk3036.c | 671 --------------- drivers/pinctrl/rockchip/pinctrl_rk3128.c | 186 ---- drivers/pinctrl/rockchip/pinctrl_rk3188.c | 989 ---------------------- drivers/pinctrl/rockchip/pinctrl_rk322x.c | 894 ------------------- drivers/pinctrl/rockchip/pinctrl_rk3288.c | 869 ------------------- drivers/pinctrl/rockchip/pinctrl_rk3328.c | 705 --------------- drivers/pinctrl/rockchip/pinctrl_rk3368.c | 739 ---------------- drivers/pinctrl/rockchip/pinctrl_rk3399.c | 503 ----------- drivers/pinctrl/rockchip/pinctrl_rv1108.c | 580 ------------- 9 files changed, 6136 deletions(-) delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3036.c
Quoted 8 lines
delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3128.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3188.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk322x.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3288.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3328.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3368.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3399.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rv1108.c
Tested on chromebook_bob:
PATCH v2 8/9 pinctrl: rockchip: Clean the unused rockchip pinctrl drivers
In reply to David WuQuoted 4 lines · David Wu
If we used the pinctrl-rockchip driver, these code is not needed, so remove them.
Signed-off-by David Wu <[email protected]>
Thanks,
- Kever
Quoted 6,214 lines
---
Changes in v2: None
drivers/pinctrl/rockchip/pinctrl_rk3036.c | 671 --------------- drivers/pinctrl/rockchip/pinctrl_rk3128.c | 186 ---- drivers/pinctrl/rockchip/pinctrl_rk3188.c | 989 ---------------------- drivers/pinctrl/rockchip/pinctrl_rk322x.c | 894 ------------------- drivers/pinctrl/rockchip/pinctrl_rk3288.c | 869 ------------------- drivers/pinctrl/rockchip/pinctrl_rk3328.c | 705 --------------- drivers/pinctrl/rockchip/pinctrl_rk3368.c | 739 ---------------- drivers/pinctrl/rockchip/pinctrl_rk3399.c | 503 ----------- drivers/pinctrl/rockchip/pinctrl_rv1108.c | 580 ------------- 9 files changed, 6136 deletions(-) delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3036.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3128.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3188.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk322x.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3288.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3328.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3368.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3399.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rv1108.cdrivers/pinctrl/rockchip/pinctrl_rk3036.c deleted +0
-671@@ -1,671 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* -* Pinctrl driver for Rockchip 3036 SoCs -* (C) Copyright 2015 Rockchip Electronics Co., Ltd -*/ - -#include <common.h> -#include <dm.h> -#include <errno.h> -#include <syscon.h> -#include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/grf_rk3036.h> -#include <asm/arch/hardware.h> -#include <asm/arch/periph.h> -#include <dm/pinctrl.h> - -/* GRF_GPIO0A_IOMUX */ -enum { -GPIO0A3_SHIFT =6 , -GPIO0A3_MASK =1 <<GPIO0A3_SHIFT , -GPIO0A3_GPIO =0 , -GPIO0A3_I2C1_SDA , - -GPIO0A2_SHIFT =4 , -GPIO0A2_MASK =1 <<GPIO0A2_SHIFT , -GPIO0A2_GPIO =0 , -GPIO0A2_I2C1_SCL , - -GPIO0A1_SHIFT =2 , -GPIO0A1_MASK =3 <<GPIO0A1_SHIFT , -GPIO0A1_GPIO =0 , -GPIO0A1_I2C0_SDA , -GPIO0A1_PWM2 , - -GPIO0A0_SHIFT =0 , -GPIO0A0_MASK =3 <<GPIO0A0_SHIFT , -GPIO0A0_GPIO =0 , -GPIO0A0_I2C0_SCL , -GPIO0A0_PWM1 , -}; - -/* GRF_GPIO0B_IOMUX */ -enum { -GPIO0B6_SHIFT =12 , -GPIO0B6_MASK =3 <<GPIO0B6_SHIFT , -GPIO0B6_GPIO =0 , -GPIO0B6_MMC1_D3 , -GPIO0B6_I2S1_SCLK , - -GPIO0B5_SHIFT =10 , -GPIO0B5_MASK =3 <<GPIO0B5_SHIFT , -GPIO0B5_GPIO =0 , -GPIO0B5_MMC1_D2 , -GPIO0B5_I2S1_SDI , - -GPIO0B4_SHIFT =8 , -GPIO0B4_MASK =3 <<GPIO0B4_SHIFT , -GPIO0B4_GPIO =0 , -GPIO0B4_MMC1_D1 , -GPIO0B4_I2S1_LRCKTX , - -GPIO0B3_SHIFT =6 , -GPIO0B3_MASK =3 <<GPIO0B3_SHIFT , -GPIO0B3_GPIO =0 , -GPIO0B3_MMC1_D0 , -GPIO0B3_I2S1_LRCKRX , - -GPIO0B1_SHIFT =2 , -GPIO0B1_MASK =3 <<GPIO0B1_SHIFT , -GPIO0B1_GPIO =0 , -GPIO0B1_MMC1_CLKOUT , -GPIO0B1_I2S1_MCLK , - -GPIO0B0_SHIFT =0 , -GPIO0B0_MASK =3 , -GPIO0B0_GPIO =0 , -GPIO0B0_MMC1_CMD , -GPIO0B0_I2S1_SDO , -}; - -/* GRF_GPIO0C_IOMUX */ -enum { -GPIO0C4_SHIFT =8 , -GPIO0C4_MASK =1 <<GPIO0C4_SHIFT , -GPIO0C4_GPIO =0 , -GPIO0C4_DRIVE_VBUS , - -GPIO0C3_SHIFT =6 , -GPIO0C3_MASK =1 <<GPIO0C3_SHIFT , -GPIO0C3_GPIO =0 , -GPIO0C3_UART0_CTSN , - -GPIO0C2_SHIFT =4 , -GPIO0C2_MASK =1 <<GPIO0C2_SHIFT , -GPIO0C2_GPIO =0 , -GPIO0C2_UART0_RTSN , - -GPIO0C1_SHIFT =2 , -GPIO0C1_MASK =1 <<GPIO0C1_SHIFT , -GPIO0C1_GPIO =0 , -GPIO0C1_UART0_SIN , - - -GPIO0C0_SHIFT =0 , -GPIO0C0_MASK =1 <<GPIO0C0_SHIFT , -GPIO0C0_GPIO =0 , -GPIO0C0_UART0_SOUT , -}; - -/* GRF_GPIO0D_IOMUX */ -enum { -GPIO0D4_SHIFT =8 , -GPIO0D4_MASK =1 <<GPIO0D4_SHIFT , -GPIO0D4_GPIO =0 , -GPIO0D4_SPDIF , - -GPIO0D3_SHIFT =6 , -GPIO0D3_MASK =1 <<GPIO0D3_SHIFT , -GPIO0D3_GPIO =0 , -GPIO0D3_PWM3 , - -GPIO0D2_SHIFT =4 , -GPIO0D2_MASK =1 <<GPIO0D2_SHIFT , -GPIO0D2_GPIO =0 , -GPIO0D2_PWM0 , -}; - -/* GRF_GPIO1A_IOMUX */ -enum { -GPIO1A5_SHIFT =10 , -GPIO1A5_MASK =1 <<GPIO1A5_SHIFT , -GPIO1A5_GPIO =0 , -GPIO1A5_I2S_SDI , - -GPIO1A4_SHIFT =8 , -GPIO1A4_MASK =1 <<GPIO1A4_SHIFT , -GPIO1A4_GPIO =0 , -GPIO1A4_I2S_SD0 , - -GPIO1A3_SHIFT =6 , -GPIO1A3_MASK =1 <<GPIO1A3_SHIFT , -GPIO1A3_GPIO =0 , -GPIO1A3_I2S_LRCKTX , - -GPIO1A2_SHIFT =4 , -GPIO1A2_MASK =3 <<GPIO1A2_SHIFT , -GPIO1A2_GPIO =0 , -GPIO1A2_I2S_LRCKRX , -GPIO1A2_PWM1_0 , - -GPIO1A1_SHIFT =2 , -GPIO1A1_MASK =1 <<GPIO1A1_SHIFT , -GPIO1A1_GPIO =0 , -GPIO1A1_I2S_SCLK , - -GPIO1A0_SHIFT =0 , -GPIO1A0_MASK =1 <<GPIO1A0_SHIFT , -GPIO1A0_GPIO =0 , -GPIO1A0_I2S_MCLK , - -}; - -/* GRF_GPIO1B_IOMUX */ -enum { -GPIO1B7_SHIFT =14 , -GPIO1B7_MASK =1 <<GPIO1B7_SHIFT , -GPIO1B7_GPIO =0 , -GPIO1B7_MMC0_CMD , - -GPIO1B3_SHIFT =6 , -GPIO1B3_MASK =1 <<GPIO1B3_SHIFT , -GPIO1B3_GPIO =0 , -GPIO1B3_HDMI_HPD , - -GPIO1B2_SHIFT =4 , -GPIO1B2_MASK =1 <<GPIO1B2_SHIFT , -GPIO1B2_GPIO =0 , -GPIO1B2_HDMI_SCL , - -GPIO1B1_SHIFT =2 , -GPIO1B1_MASK =1 <<GPIO1B1_SHIFT , -GPIO1B1_GPIO =0 , -GPIO1B1_HDMI_SDA , - -GPIO1B0_SHIFT =0 , -GPIO1B0_MASK =1 <<GPIO1B0_SHIFT , -GPIO1B0_GPIO =0 , -GPIO1B0_HDMI_CEC , -}; - -/* GRF_GPIO1C_IOMUX */ -enum { -GPIO1C5_SHIFT =10 , -GPIO1C5_MASK =3 <<GPIO1C5_SHIFT , -GPIO1C5_GPIO =0 , -GPIO1C5_MMC0_D3 , -GPIO1C5_JTAG_TMS , - -GPIO1C4_SHIFT =8 , -GPIO1C4_MASK =3 <<GPIO1C4_SHIFT , -GPIO1C4_GPIO =0 , -GPIO1C4_MMC0_D2 , -GPIO1C4_JTAG_TCK , - -GPIO1C3_SHIFT =6 , -GPIO1C3_MASK =3 <<GPIO1C3_SHIFT , -GPIO1C3_GPIO =0 , -GPIO1C3_MMC0_D1 , -GPIO1C3_UART2_SOUT , - -GPIO1C2_SHIFT =4 , -GPIO1C2_MASK =3 <<GPIO1C2_SHIFT , -GPIO1C2_GPIO =0 , -GPIO1C2_MMC0_D0 , -GPIO1C2_UART2_SIN , - -GPIO1C1_SHIFT =2 , -GPIO1C1_MASK =1 <<GPIO1C1_SHIFT , -GPIO1C1_GPIO =0 , -GPIO1C1_MMC0_DETN , - -GPIO1C0_SHIFT =0 , -GPIO1C0_MASK =1 <<GPIO1C0_SHIFT , -GPIO1C0_GPIO =0 , -GPIO1C0_MMC0_CLKOUT , -}; - -/* GRF_GPIO1D_IOMUX */ -enum { -GPIO1D7_SHIFT =14 , -GPIO1D7_MASK =3 <<GPIO1D7_SHIFT , -GPIO1D7_GPIO =0 , -GPIO1D7_NAND_D7 , -GPIO1D7_EMMC_D7 , -GPIO1D7_SPI_CSN1 , - -GPIO1D6_SHIFT =12 , -GPIO1D6_MASK =3 <<GPIO1D6_SHIFT , -GPIO1D6_GPIO =0 , -GPIO1D6_NAND_D6 , -GPIO1D6_EMMC_D6 , -GPIO1D6_SPI_CSN0 , - -GPIO1D5_SHIFT =10 , -GPIO1D5_MASK =3 <<GPIO1D5_SHIFT , -GPIO1D5_GPIO =0 , -GPIO1D5_NAND_D5 , -GPIO1D5_EMMC_D5 , -GPIO1D5_SPI_TXD , - -GPIO1D4_SHIFT =8 , -GPIO1D4_MASK =3 <<GPIO1D4_SHIFT , -GPIO1D4_GPIO =0 , -GPIO1D4_NAND_D4 , -GPIO1D4_EMMC_D4 , -GPIO1D4_SPI_RXD , - -GPIO1D3_SHIFT =6 , -GPIO1D3_MASK =3 <<GPIO1D3_SHIFT , -GPIO1D3_GPIO =0 , -GPIO1D3_NAND_D3 , -GPIO1D3_EMMC_D3 , -GPIO1D3_SFC_SIO3 , - -GPIO1D2_SHIFT =4 , -GPIO1D2_MASK =3 <<GPIO1D2_SHIFT , -GPIO1D2_GPIO =0 , -GPIO1D2_NAND_D2 , -GPIO1D2_EMMC_D2 , -GPIO1D2_SFC_SIO2 , - -GPIO1D1_SHIFT =2 , -GPIO1D1_MASK =3 <<GPIO1D1_SHIFT , -GPIO1D1_GPIO =0 , -GPIO1D1_NAND_D1 , -GPIO1D1_EMMC_D1 , -GPIO1D1_SFC_SIO1 , - -GPIO1D0_SHIFT =0 , -GPIO1D0_MASK =3 <<GPIO1D0_SHIFT , -GPIO1D0_GPIO =0 , -GPIO1D0_NAND_D0 , -GPIO1D0_EMMC_D0 , -GPIO1D0_SFC_SIO0 , -}; - -/* GRF_GPIO2A_IOMUX */ -enum { -GPIO2A7_SHIFT =14 , -GPIO2A7_MASK =1 <<GPIO2A7_SHIFT , -GPIO2A7_GPIO =0 , -GPIO2A7_TESTCLK_OUT , - -GPIO2A6_SHIFT =12 , -GPIO2A6_MASK =1 <<GPIO2A6_SHIFT , -GPIO2A6_GPIO =0 , -GPIO2A6_NAND_CS0 , - -GPIO2A4_SHIFT =8 , -GPIO2A4_MASK =3 <<GPIO2A4_SHIFT , -GPIO2A4_GPIO =0 , -GPIO2A4_NAND_RDY , -GPIO2A4_EMMC_CMD , -GPIO2A3_SFC_CLK , - -GPIO2A3_SHIFT =6 , -GPIO2A3_MASK =3 <<GPIO2A3_SHIFT , -GPIO2A3_GPIO =0 , -GPIO2A3_NAND_RDN , -GPIO2A4_SFC_CSN1 , - -GPIO2A2_SHIFT =4 , -GPIO2A2_MASK =3 <<GPIO2A2_SHIFT , -GPIO2A2_GPIO =0 , -GPIO2A2_NAND_WRN , -GPIO2A4_SFC_CSN0 , - -GPIO2A1_SHIFT =2 , -GPIO2A1_MASK =3 <<GPIO2A1_SHIFT , -GPIO2A1_GPIO =0 , -GPIO2A1_NAND_CLE , -GPIO2A1_EMMC_CLKOUT , - -GPIO2A0_SHIFT =0 , -GPIO2A0_MASK =3 <<GPIO2A0_SHIFT , -GPIO2A0_GPIO =0 , -GPIO2A0_NAND_ALE , -GPIO2A0_SPI_CLK , -}; - -/* GRF_GPIO2B_IOMUX */ -enum { -GPIO2B7_SHIFT =14 , -GPIO2B7_MASK =1 <<GPIO2B7_SHIFT , -GPIO2B7_GPIO =0 , -GPIO2B7_MAC_RXER , - -GPIO2B6_SHIFT =12 , -GPIO2B6_MASK =3 <<GPIO2B6_SHIFT , -GPIO2B6_GPIO =0 , -GPIO2B6_MAC_CLKOUT , -GPIO2B6_MAC_CLKIN , - -GPIO2B5_SHIFT =10 , -GPIO2B5_MASK =1 <<GPIO2B5_SHIFT , -GPIO2B5_GPIO =0 , -GPIO2B5_MAC_TXEN , - -GPIO2B4_SHIFT =8 , -GPIO2B4_MASK =1 <<GPIO2B4_SHIFT , -GPIO2B4_GPIO =0 , -GPIO2B4_MAC_MDIO , - -GPIO2B2_SHIFT =4 , -GPIO2B2_MASK =1 <<GPIO2B2_SHIFT , -GPIO2B2_GPIO =0 , -GPIO2B2_MAC_CRS , -}; - -/* GRF_GPIO2C_IOMUX */ -enum { -GPIO2C7_SHIFT =14 , -GPIO2C7_MASK =3 <<GPIO2C7_SHIFT , -GPIO2C7_GPIO =0 , -GPIO2C7_UART1_SOUT , -GPIO2C7_TESTCLK_OUT1 , - -GPIO2C6_SHIFT =12 , -GPIO2C6_MASK =1 <<GPIO2C6_SHIFT , -GPIO2C6_GPIO =0 , -GPIO2C6_UART1_SIN , - -GPIO2C5_SHIFT =10 , -GPIO2C5_MASK =1 <<GPIO2C5_SHIFT , -GPIO2C5_GPIO =0 , -GPIO2C5_I2C2_SCL , - -GPIO2C4_SHIFT =8 , -GPIO2C4_MASK =1 <<GPIO2C4_SHIFT , -GPIO2C4_GPIO =0 , -GPIO2C4_I2C2_SDA , - -GPIO2C3_SHIFT =6 , -GPIO2C3_MASK =1 <<GPIO2C3_SHIFT , -GPIO2C3_GPIO =0 , -GPIO2C3_MAC_TXD0 , - -GPIO2C2_SHIFT =4 , -GPIO2C2_MASK =1 <<GPIO2C2_SHIFT , -GPIO2C2_GPIO =0 , -GPIO2C2_MAC_TXD1 , - -GPIO2C1_SHIFT =2 , -GPIO2C1_MASK =1 <<GPIO2C1_SHIFT , -GPIO2C1_GPIO =0 , -GPIO2C1_MAC_RXD0 , - -GPIO2C0_SHIFT =0 , -GPIO2C0_MASK =1 <<GPIO2C0_SHIFT , -GPIO2C0_GPIO =0 , -GPIO2C0_MAC_RXD1 , -}; - -/* GRF_GPIO2D_IOMUX */ -enum { -GPIO2D6_SHIFT =12 , -GPIO2D6_MASK =1 <<GPIO2D6_SHIFT , -GPIO2D6_GPIO =0 , -GPIO2D6_I2S_SDO1 , - -GPIO2D5_SHIFT =10 , -GPIO2D5_MASK =1 <<GPIO2D5_SHIFT , -GPIO2D5_GPIO =0 , -GPIO2D5_I2S_SDO2 , - -GPIO2D4_SHIFT =8 , -GPIO2D4_MASK =1 <<GPIO2D4_SHIFT , -GPIO2D4_GPIO =0 , -GPIO2D4_I2S_SDO3 , - -GPIO2D1_SHIFT =2 , -GPIO2D1_MASK =1 <<GPIO2D1_SHIFT , -GPIO2D1_GPIO =0 , -GPIO2D1_MAC_MDC , -}; - -struct rk3036_pinctrl_priv { -struct rk3036_grf *grf; -}; - -static void pinctrl_rk3036_pwm_config (struct rk3036_grf *grf,int pwm_id) -{ -switch (pwm_id) { -case PERIPH_ID_PWM0 : -rk_clrsetreg (&grf->gpio0d_iomux,GPIO0D2_MASK , -GPIO0D2_PWM0 <<GPIO0D2_SHIFT ); -break ; -case PERIPH_ID_PWM1 : -rk_clrsetreg (&grf->gpio0a_iomux,GPIO0A0_MASK , -GPIO0A0_PWM1 <<GPIO0A0_SHIFT ); -break ; -case PERIPH_ID_PWM2 : -rk_clrsetreg (&grf->gpio0a_iomux,GPIO0A1_MASK , -GPIO0A1_PWM2 <<GPIO0A1_SHIFT ); -break ; -case PERIPH_ID_PWM3 : -rk_clrsetreg (&grf->gpio0a_iomux,GPIO0D3_MASK , -GPIO0D3_PWM3 <<GPIO0D3_SHIFT ); -break ; -default : -debug ("pwm id = %d iomux error!\n" , pwm_id); -break ; - } -} - -static void pinctrl_rk3036_i2c_config (struct rk3036_grf *grf,int i2c_id) -{ -switch (i2c_id) { -case PERIPH_ID_I2C0 : -rk_clrsetreg (&grf->gpio0a_iomux, -GPIO0A1_MASK |GPIO0A0_MASK , -GPIO0A1_I2C0_SDA <<GPIO0A1_SHIFT | -GPIO0A0_I2C0_SCL <<GPIO0A0_SHIFT ); - -break ; -case PERIPH_ID_I2C1 : -rk_clrsetreg (&grf->gpio0a_iomux, -GPIO0A3_MASK |GPIO0A2_MASK , -GPIO0A3_I2C1_SDA <<GPIO0A3_SHIFT | -GPIO0A2_I2C1_SCL <<GPIO0A2_SHIFT ); -break ; -case PERIPH_ID_I2C2 : -rk_clrsetreg (&grf->gpio2c_iomux, -GPIO2C5_MASK |GPIO2C4_MASK , -GPIO2C5_I2C2_SCL <<GPIO2C5_SHIFT | -GPIO2C4_I2C2_SDA <<GPIO2C4_SHIFT ); - -break ; - } -} - -static void pinctrl_rk3036_spi_config (struct rk3036_grf *grf,int cs) -{ -switch (cs) { -case 0 : -rk_clrsetreg (&grf->gpio1d_iomux,GPIO1D6_MASK , -GPIO1D6_SPI_CSN0 <<GPIO1D6_SHIFT ); -break ; -case 1 : -rk_clrsetreg (&grf->gpio1d_iomux,GPIO1D7_MASK , -GPIO1D7_SPI_CSN1 <<GPIO1D7_SHIFT ); -break ; - } -rk_clrsetreg (&grf->gpio1d_iomux, -GPIO1D5_MASK |GPIO1D4_MASK , -GPIO1D5_SPI_TXD <<GPIO1D5_SHIFT | -GPIO1D4_SPI_RXD <<GPIO1D4_SHIFT ); - -rk_clrsetreg (&grf->gpio2a_iomux,GPIO2A0_MASK , -GPIO2A0_SPI_CLK <<GPIO2A0_SHIFT ); -} - -static void pinctrl_rk3036_uart_config (struct rk3036_grf *grf,int uart_id) -{ -switch (uart_id) { -case PERIPH_ID_UART0 : -rk_clrsetreg (&grf->gpio0c_iomux, -GPIO0C3_MASK |GPIO0C2_MASK | -GPIO0C1_MASK |GPIO0C0_MASK , -GPIO0C3_UART0_CTSN <<GPIO0C3_SHIFT | -GPIO0C2_UART0_RTSN <<GPIO0C2_SHIFT | -GPIO0C1_UART0_SIN <<GPIO0C1_SHIFT | -GPIO0C0_UART0_SOUT <<GPIO0C0_SHIFT ); -break ; -case PERIPH_ID_UART1 : -rk_clrsetreg (&grf->gpio2c_iomux, -GPIO2C7_MASK |GPIO2C6_MASK , -GPIO2C7_UART1_SOUT <<GPIO2C7_SHIFT | -GPIO2C6_UART1_SIN <<GPIO2C6_SHIFT ); -break ; -case PERIPH_ID_UART2 : -rk_clrsetreg (&grf->gpio1c_iomux, -GPIO1C3_MASK |GPIO1C2_MASK , -GPIO1C3_UART2_SOUT <<GPIO1C3_SHIFT | -GPIO1C2_UART2_SIN <<GPIO1C2_SHIFT ); -break ; - } -} - -static void pinctrl_rk3036_sdmmc_config (struct rk3036_grf *grf,int mmc_id) -{ -switch (mmc_id) { -case PERIPH_ID_EMMC : -rk_clrsetreg (&grf->gpio1d_iomux,0xffff , -GPIO1D7_EMMC_D7 <<GPIO1D7_SHIFT | -GPIO1D6_EMMC_D6 <<GPIO1D6_SHIFT | -GPIO1D5_EMMC_D5 <<GPIO1D5_SHIFT | -GPIO1D4_EMMC_D4 <<GPIO1D4_SHIFT | -GPIO1D3_EMMC_D3 <<GPIO1D3_SHIFT | -GPIO1D2_EMMC_D2 <<GPIO1D2_SHIFT | -GPIO1D1_EMMC_D1 <<GPIO1D1_SHIFT | -GPIO1D0_EMMC_D0 <<GPIO1D0_SHIFT ); -rk_clrsetreg (&grf->gpio2a_iomux, -GPIO2A4_MASK |GPIO2A1_MASK , -GPIO2A4_EMMC_CMD <<GPIO2A4_SHIFT | -GPIO2A1_EMMC_CLKOUT <<GPIO2A1_SHIFT ); -break ; -case PERIPH_ID_SDCARD : -rk_clrsetreg (&grf->gpio1c_iomux,0xffff , -GPIO1C5_MMC0_D3 <<GPIO1C5_SHIFT | -GPIO1C4_MMC0_D2 <<GPIO1C4_SHIFT | -GPIO1C3_MMC0_D1 <<GPIO1C3_SHIFT | -GPIO1C2_MMC0_D0 <<GPIO1C2_SHIFT | -GPIO1C1_MMC0_DETN <<GPIO1C1_SHIFT | -GPIO1C0_MMC0_CLKOUT <<GPIO1C0_SHIFT ); -break ; - } -} - -static int rk3036_pinctrl_request (struct udevice *dev,int func,int flags) -{ -struct rk3036_pinctrl_priv *priv =dev_get_priv (dev); - -debug ("%s: func=%x, flags=%x\n" , __func__, func, flags); -switch (func) { -case PERIPH_ID_PWM0 : -case PERIPH_ID_PWM1 : -case PERIPH_ID_PWM2 : -case PERIPH_ID_PWM3 : -pinctrl_rk3036_pwm_config (priv->grf, func); -break ; -case PERIPH_ID_I2C0 : -case PERIPH_ID_I2C1 : -case PERIPH_ID_I2C2 : -pinctrl_rk3036_i2c_config (priv->grf, func); -break ; -case PERIPH_ID_SPI0 : -pinctrl_rk3036_spi_config (priv->grf, flags); -break ; -case PERIPH_ID_UART0 : -case PERIPH_ID_UART1 : -case PERIPH_ID_UART2 : -pinctrl_rk3036_uart_config (priv->grf, func); -break ; -case PERIPH_ID_SDMMC0 : -case PERIPH_ID_SDMMC1 : -pinctrl_rk3036_sdmmc_config (priv->grf, func); -break ; -default : -return -EINVAL ; - } - -return 0 ; -} - -static int rk3036_pinctrl_get_periph_id (struct udevice *dev, -struct udevice *periph) -{ -u32 cell[3 ]; -int ret; - - ret =dev_read_u32_array (periph,"interrupts" , cell,ARRAY_SIZE (cell)); -if (ret <0 ) -return -EINVAL ; - -switch (cell[1 ]) { -case 14 : -return PERIPH_ID_SDCARD ; -case 16 : -return PERIPH_ID_EMMC ; -case 20 : -return PERIPH_ID_UART0 ; -case 21 : -return PERIPH_ID_UART1 ; -case 22 : -return PERIPH_ID_UART2 ; -case 23 : -return PERIPH_ID_SPI0 ; -case 24 : -return PERIPH_ID_I2C0 ; -case 25 : -return PERIPH_ID_I2C1 ; -case 26 : -return PERIPH_ID_I2C2 ; -case 30 : -return PERIPH_ID_PWM0 ; - } -return -ENOENT ; -} - -static int rk3036_pinctrl_set_state_simple (struct udevice *dev, -struct udevice *periph) -{ -int func; - - func =rk3036_pinctrl_get_periph_id (dev, periph); -if (func <0 ) -return func; -return rk3036_pinctrl_request (dev, func,0 ); -} - -static struct pinctrl_ops rk3036_pinctrl_ops = { - .set_state_simple = rk3036_pinctrl_set_state_simple, - .request = rk3036_pinctrl_request, - .get_periph_id = rk3036_pinctrl_get_periph_id, -}; - -static int rk3036_pinctrl_probe (struct udevice *dev) -{ -struct rk3036_pinctrl_priv *priv =dev_get_priv (dev); - - priv->grf =syscon_get_first_range (ROCKCHIP_SYSCON_GRF ); -debug ("%s: grf=%p\n" , __func__, priv->grf); -return 0 ; -} - -static const struct udevice_id rk3036_pinctrl_ids[] = { - { .compatible ="rockchip,rk3036-pinctrl" }, - { } -}; - -U_BOOT_DRIVER (pinctrl_rk3036) = { - .name ="pinctrl_rk3036" , - .id =UCLASS_PINCTRL , - .of_match = rk3036_pinctrl_ids, - .priv_auto_alloc_size =sizeof (struct rk3036_pinctrl_priv ), - .ops = &rk3036_pinctrl_ops, - .bind = dm_scan_fdt_dev, - .probe = rk3036_pinctrl_probe, -};drivers/pinctrl/rockchip/pinctrl_rk3128.c deleted +0
-186@@ -1,186 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* -* Pinctrl driver for Rockchip 3128 SoCs -* (C) Copyright 2017 Rockchip Electronics Co., Ltd -*/ - -#include <common.h> -#include <dm.h> -#include <errno.h> -#include <syscon.h> -#include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/grf_rk3128.h> -#include <asm/arch/hardware.h> -#include <asm/arch/periph.h> -#include <dm/pinctrl.h> - -DECLARE_GLOBAL_DATA_PTR ; - -struct rk3128_pinctrl_priv { -struct rk3128_grf *grf; -}; - -static void pinctrl_rk3128_i2c_config (struct rk3128_grf *grf,int i2c_id) -{ -switch (i2c_id) { -case PERIPH_ID_I2C0 : -rk_clrsetreg (&grf->gpio0a_iomux, -GPIO0A1_MASK |GPIO0A0_MASK , -GPIO0A1_I2C0_SDA <<GPIO0A1_SHIFT | -GPIO0A0_I2C0_SCL <<GPIO0A0_SHIFT ); - -break ; -case PERIPH_ID_I2C1 : -rk_clrsetreg (&grf->gpio0a_iomux, -GPIO0A3_MASK |GPIO0A2_MASK , -GPIO0A3_I2C1_SDA <<GPIO0A3_SHIFT | -GPIO0A2_I2C1_SCL <<GPIO0A2_SHIFT ); -break ; -case PERIPH_ID_I2C2 : -rk_clrsetreg (&grf->gpio2c_iomux2, -GPIO2C5_MASK |GPIO2C4_MASK , -GPIO2C5_I2C2_SCL <<GPIO2C5_SHIFT | -GPIO2C4_I2C2_SDA <<GPIO2C4_SHIFT ); -break ; -case PERIPH_ID_I2C3 : -rk_clrsetreg (&grf->gpio0a_iomux, -GPIO0A7_MASK |GPIO0A6_MASK , -GPIO0A7_I2C3_SDA <<GPIO0A7_SHIFT | -GPIO0A6_I2C3_SCL <<GPIO0A6_SHIFT ); - -break ; - } -} - -static void pinctrl_rk3128_sdmmc_config (struct rk3128_grf *grf,int mmc_id) -{ -switch (mmc_id) { -case PERIPH_ID_EMMC : -rk_clrsetreg (&grf->gpio1d_iomux,0xffff , -GPIO1D7_EMMC_D7 <<GPIO1D7_SHIFT | -GPIO1D6_EMMC_D6 <<GPIO1D6_SHIFT | -GPIO1D5_EMMC_D5 <<GPIO1D5_SHIFT | -GPIO1D4_EMMC_D4 <<GPIO1D4_SHIFT | -GPIO1D3_EMMC_D3 <<GPIO1D3_SHIFT | -GPIO1D2_EMMC_D2 <<GPIO1D2_SHIFT | -GPIO1D1_EMMC_D1 <<GPIO1D1_SHIFT | -GPIO1D0_EMMC_D0 <<GPIO1D0_SHIFT ); -rk_clrsetreg (&grf->gpio2a_iomux, -GPIO2A5_MASK |GPIO2A7_MASK , -GPIO2A5_EMMC_PWREN <<GPIO2A5_SHIFT | -GPIO2A7_EMMC_CLKOUT <<GPIO2A7_SHIFT ); -break ; -case PERIPH_ID_SDCARD : -rk_clrsetreg (&grf->gpio1c_iomux,0x0fff , -GPIO1C5_MMC0_D3 <<GPIO1C5_SHIFT | -GPIO1C4_MMC0_D2 <<GPIO1C4_SHIFT | -GPIO1C3_MMC0_D1 <<GPIO1C3_SHIFT | -GPIO1C2_MMC0_D0 <<GPIO1C2_SHIFT | -GPIO1C1_MMC0_DETN <<GPIO1C1_SHIFT | -GPIO1C0_MMC0_CLKOUT <<GPIO1C0_SHIFT ); -break ; - } -} - -static int rk3128_pinctrl_request (struct udevice *dev,int func,int flags) -{ -struct rk3128_pinctrl_priv *priv =dev_get_priv (dev); - -debug ("%s: func=%x, flags=%x\n" , __func__, func, flags); -switch (func) { -case PERIPH_ID_I2C0 : -case PERIPH_ID_I2C1 : -case PERIPH_ID_I2C2 : -case PERIPH_ID_I2C3 : -pinctrl_rk3128_i2c_config (priv->grf, func); -break ; -case PERIPH_ID_SDMMC0 : -case PERIPH_ID_SDMMC1 : -pinctrl_rk3128_sdmmc_config (priv->grf, func); -break ; -default : -return -EINVAL ; - } - -return 0 ; -} - -static int rk3128_pinctrl_get_periph_id (struct udevice *dev, -struct udevice *periph) -{ -u32 cell[3 ]; -int ret; - - ret =fdtdec_get_int_array (gd->fdt_blob,dev_of_offset (periph), -"interrupts" , cell,ARRAY_SIZE (cell)); -if (ret <0 ) -return -EINVAL ; - -switch (cell[1 ]) { -case 14 : -return PERIPH_ID_SDCARD ; -case 16 : -return PERIPH_ID_EMMC ; -case 20 : -return PERIPH_ID_UART0 ; -case 21 : -return PERIPH_ID_UART1 ; -case 22 : -return PERIPH_ID_UART2 ; -case 23 : -return PERIPH_ID_SPI0 ; -case 24 : -return PERIPH_ID_I2C0 ; -case 25 : -return PERIPH_ID_I2C1 ; -case 26 : -return PERIPH_ID_I2C2 ; -case 27 : -return PERIPH_ID_I2C3 ; -case 30 : -return PERIPH_ID_PWM0 ; - } -return -ENOENT ; -} - -static int rk3128_pinctrl_set_state_simple (struct udevice *dev, -struct udevice *periph) -{ -int func; - - func =rk3128_pinctrl_get_periph_id (dev, periph); -if (func <0 ) -return func; -return rk3128_pinctrl_request (dev, func,0 ); -} - -static struct pinctrl_ops rk3128_pinctrl_ops = { - .set_state_simple = rk3128_pinctrl_set_state_simple, - .request = rk3128_pinctrl_request, - .get_periph_id = rk3128_pinctrl_get_periph_id, -}; - -static int rk3128_pinctrl_probe (struct udevice *dev) -{ -struct rk3128_pinctrl_priv *priv =dev_get_priv (dev); - - priv->grf =syscon_get_first_range (ROCKCHIP_SYSCON_GRF ); -debug ("%s: grf=%p\n" , __func__, priv->grf); -return 0 ; -} - -static const struct udevice_id rk3128_pinctrl_ids[] = { - { .compatible ="rockchip,rk3128-pinctrl" }, - { } -}; - -U_BOOT_DRIVER (pinctrl_rk3128) = { - .name ="pinctrl_rk3128" , - .id =UCLASS_PINCTRL , - .of_match = rk3128_pinctrl_ids, - .priv_auto_alloc_size =sizeof (struct rk3128_pinctrl_priv ), - .ops = &rk3128_pinctrl_ops, - .bind = dm_scan_fdt_dev, - .probe = rk3128_pinctrl_probe, -};drivers/pinctrl/rockchip/pinctrl_rk3188.c deleted +0
-989@@ -1,989 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* -* Pinctrl driver for Rockchip RK3188 SoCs -* Copyright (c) 2016 Heiko Stuebner <[email protected]> -*/ - -#include <common.h> -#include <dm.h> -#include <errno.h> -#include <syscon.h> -#include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/grf_rk3188.h> -#include <asm/arch/hardware.h> -#include <asm/arch/periph.h> -#include <asm/arch/pmu_rk3188.h> -#include <dm/pinctrl.h> -#include <dm/root.h> - -DECLARE_GLOBAL_DATA_PTR ; - -/* GRF_GPIO0D_IOMUX */ -enum { -GPIO0D7_SHIFT =14 , -GPIO0D7_MASK =1 , -GPIO0D7_GPIO =0 , -GPIO0D7_SPI1_CSN0 , - -GPIO0D6_SHIFT =12 , -GPIO0D6_MASK =1 , -GPIO0D6_GPIO =0 , -GPIO0D6_SPI1_CLK , - -GPIO0D5_SHIFT =10 , -GPIO0D5_MASK =1 , -GPIO0D5_GPIO =0 , -GPIO0D5_SPI1_TXD , - -GPIO0D4_SHIFT =8 , -GPIO0D4_MASK =1 , -GPIO0D4_GPIO =0 , -GPIO0D4_SPI0_RXD , - -GPIO0D3_SHIFT =6 , -GPIO0D3_MASK =3 , -GPIO0D3_GPIO =0 , -GPIO0D3_FLASH_CSN3 , -GPIO0D3_EMMC_RSTN_OUT , - -GPIO0D2_SHIFT =4 , -GPIO0D2_MASK =3 , -GPIO0D2_GPIO =0 , -GPIO0D2_FLASH_CSN2 , -GPIO0D2_EMMC_CMD , - -GPIO0D1_SHIFT =2 , -GPIO0D1_MASK =1 , -GPIO0D1_GPIO =0 , -GPIO0D1_FLASH_CSN1 , - -GPIO0D0_SHIFT =0 , -GPIO0D0_MASK =3 , -GPIO0D0_GPIO =0 , -GPIO0D0_FLASH_DQS , -GPIO0D0_EMMC_CLKOUT -}; - -/* GRF_GPIO1A_IOMUX */ -enum { -GPIO1A7_SHIFT =14 , -GPIO1A7_MASK =3 , -GPIO1A7_GPIO =0 , -GPIO1A7_UART1_RTS_N , -GPIO1A7_SPI0_CSN0 , - -GPIO1A6_SHIFT =12 , -GPIO1A6_MASK =3 , -GPIO1A6_GPIO =0 , -GPIO1A6_UART1_CTS_N , -GPIO1A6_SPI0_CLK , - -GPIO1A5_SHIFT =10 , -GPIO1A5_MASK =3 , -GPIO1A5_GPIO =0 , -GPIO1A5_UART1_SOUT , -GPIO1A5_SPI0_TXD , - -GPIO1A4_SHIFT =8 , -GPIO1A4_MASK =3 , -GPIO1A4_GPIO =0 , -GPIO1A4_UART1_SIN , -GPIO1A4_SPI0_RXD , - -GPIO1A3_SHIFT =6 , -GPIO1A3_MASK =1 , -GPIO1A3_GPIO =0 , -GPIO1A3_UART0_RTS_N , - -GPIO1A2_SHIFT =4 , -GPIO1A2_MASK =1 , -GPIO1A2_GPIO =0 , -GPIO1A2_UART0_CTS_N , - -GPIO1A1_SHIFT =2 , -GPIO1A1_MASK =1 , -GPIO1A1_GPIO =0 , -GPIO1A1_UART0_SOUT , - -GPIO1A0_SHIFT =0 , -GPIO1A0_MASK =1 , -GPIO1A0_GPIO =0 , -GPIO1A0_UART0_SIN , -}; - -/* GRF_GPIO1B_IOMUX */ -enum { -GPIO1B7_SHIFT =14 , -GPIO1B7_MASK =1 , -GPIO1B7_GPIO =0 , -GPIO1B7_SPI0_CSN1 , - -GPIO1B6_SHIFT =12 , -GPIO1B6_MASK =3 , -GPIO1B6_GPIO =0 , -GPIO1B6_SPDIF_TX , -GPIO1B6_SPI1_CSN1 , - -GPIO1B5_SHIFT =10 , -GPIO1B5_MASK =3 , -GPIO1B5_GPIO =0 , -GPIO1B5_UART3_RTS_N , -GPIO1B5_RESERVED , - -GPIO1B4_SHIFT =8 , -GPIO1B4_MASK =3 , -GPIO1B4_GPIO =0 , -GPIO1B4_UART3_CTS_N , -GPIO1B4_GPS_RFCLK , - -GPIO1B3_SHIFT =6 , -GPIO1B3_MASK =3 , -GPIO1B3_GPIO =0 , -GPIO1B3_UART3_SOUT , -GPIO1B3_GPS_SIG , - -GPIO1B2_SHIFT =4 , -GPIO1B2_MASK =3 , -GPIO1B2_GPIO =0 , -GPIO1B2_UART3_SIN , -GPIO1B2_GPS_MAG , - -GPIO1B1_SHIFT =2 , -GPIO1B1_MASK =3 , -GPIO1B1_GPIO =0 , -GPIO1B1_UART2_SOUT , -GPIO1B1_JTAG_TDO , - -GPIO1B0_SHIFT =0 , -GPIO1B0_MASK =3 , -GPIO1B0_GPIO =0 , -GPIO1B0_UART2_SIN , -GPIO1B0_JTAG_TDI , -}; - -/* GRF_GPIO1D_IOMUX */ -enum { -GPIO1D7_SHIFT =14 , -GPIO1D7_MASK =1 , -GPIO1D7_GPIO =0 , -GPIO1D7_I2C4_SCL , - -GPIO1D6_SHIFT =12 , -GPIO1D6_MASK =1 , -GPIO1D6_GPIO =0 , -GPIO1D6_I2C4_SDA , - -GPIO1D5_SHIFT =10 , -GPIO1D5_MASK =1 , -GPIO1D5_GPIO =0 , -GPIO1D5_I2C2_SCL , - -GPIO1D4_SHIFT =8 , -GPIO1D4_MASK =1 , -GPIO1D4_GPIO =0 , -GPIO1D4_I2C2_SDA , - -GPIO1D3_SHIFT =6 , -GPIO1D3_MASK =1 , -GPIO1D3_GPIO =0 , -GPIO1D3_I2C1_SCL , - -GPIO1D2_SHIFT =4 , -GPIO1D2_MASK =1 , -GPIO1D2_GPIO =0 , -GPIO1D2_I2C1_SDA , - -GPIO1D1_SHIFT =2 , -GPIO1D1_MASK =1 , -GPIO1D1_GPIO =0 , -GPIO1D1_I2C0_SCL , - -GPIO1D0_SHIFT =0 , -GPIO1D0_MASK =1 , -GPIO1D0_GPIO =0 , -GPIO1D0_I2C0_SDA , -}; - -/* GRF_GPIO3A_IOMUX */ -enum { -GPIO3A7_SHIFT =14 , -GPIO3A7_MASK =1 , -GPIO3A7_GPIO =0 , -GPIO3A7_SDMMC0_DATA3 , - -GPIO3A6_SHIFT =12 , -GPIO3A6_MASK =1 , -GPIO3A6_GPIO =0 , -GPIO3A6_SDMMC0_DATA2 , - -GPIO3A5_SHIFT =10 , -GPIO3A5_MASK =1 , -GPIO3A5_GPIO =0 , -GPIO3A5_SDMMC0_DATA1 , - -GPIO3A4_SHIFT =8 , -GPIO3A4_MASK =1 , -GPIO3A4_GPIO =0 , -GPIO3A4_SDMMC0_DATA0 , - -GPIO3A3_SHIFT =6 , -GPIO3A3_MASK =1 , -GPIO3A3_GPIO =0 , -GPIO3A3_SDMMC0_CMD , - -GPIO3A2_SHIFT =4 , -GPIO3A2_MASK =1 , -GPIO3A2_GPIO =0 , -GPIO3A2_SDMMC0_CLKOUT , - -GPIO3A1_SHIFT =2 , -GPIO3A1_MASK =1 , -GPIO3A1_GPIO =0 , -GPIO3A1_SDMMC0_PWREN , - -GPIO3A0_SHIFT =0 , -GPIO3A0_MASK =1 , -GPIO3A0_GPIO =0 , -GPIO3A0_SDMMC0_RSTN , -}; - -/* GRF_GPIO3B_IOMUX */ -enum { -GPIO3B7_SHIFT =14 , -GPIO3B7_MASK =3 , -GPIO3B7_GPIO =0 , -GPIO3B7_CIF_DATA11 , -GPIO3B7_I2C3_SCL , - -GPIO3B6_SHIFT =12 , -GPIO3B6_MASK =3 , -GPIO3B6_GPIO =0 , -GPIO3B6_CIF_DATA10 , -GPIO3B6_I2C3_SDA , - -GPIO3B5_SHIFT =10 , -GPIO3B5_MASK =3 , -GPIO3B5_GPIO =0 , -GPIO3B5_CIF_DATA1 , -GPIO3B5_HSADC_DATA9 , - -GPIO3B4_SHIFT =8 , -GPIO3B4_MASK =3 , -GPIO3B4_GPIO =0 , -GPIO3B4_CIF_DATA0 , -GPIO3B4_HSADC_DATA8 , - -GPIO3B3_SHIFT =6 , -GPIO3B3_MASK =1 , -GPIO3B3_GPIO =0 , -GPIO3B3_CIF_CLKOUT , - -GPIO3B2_SHIFT =4 , -GPIO3B2_MASK =1 , -GPIO3B2_GPIO =0 , -/* no muxes */ - -GPIO3B1_SHIFT =2 , -GPIO3B1_MASK =1 , -GPIO3B1_GPIO =0 , -GPIO3B1_SDMMC0_WRITE_PRT , - -GPIO3B0_SHIFT =0 , -GPIO3B0_MASK =1 , -GPIO3B0_GPIO =0 , -GPIO3B0_SDMMC_DETECT_N , -}; - -/* GRF_GPIO3C_IOMUX */ -enum { -GPIO3C7_SHIFT =14 , -GPIO3C7_MASK =3 , -GPIO3C7_GPIO =0 , -GPIO3C7_SDMMC1_WRITE_PRT , -GPIO3C7_RMII_CRS_DVALID , -GPIO3C7_RESERVED , - -GPIO3C6_SHIFT =12 , -GPIO3C6_MASK =3 , -GPIO3C6_GPIO =0 , -GPIO3C6_SDMMC1_DECTN , -GPIO3C6_RMII_RX_ERR , -GPIO3C6_RESERVED , - -GPIO3C5_SHIFT =10 , -GPIO3C5_MASK =3 , -GPIO3C5_GPIO =0 , -GPIO3C5_SDMMC1_CLKOUT , -GPIO3C5_RMII_CLKOUT , -GPIO3C5_RMII_CLKIN , - -GPIO3C4_SHIFT =8 , -GPIO3C4_MASK =3 , -GPIO3C4_GPIO =0 , -GPIO3C4_SDMMC1_DATA3 , -GPIO3C4_RMII_RXD1 , -GPIO3C4_RESERVED , - -GPIO3C3_SHIFT =6 , -GPIO3C3_MASK =3 , -GPIO3C3_GPIO =0 , -GPIO3C3_SDMMC1_DATA2 , -GPIO3C3_RMII_RXD0 , -GPIO3C3_RESERVED , - -GPIO3C2_SHIFT =4 , -GPIO3C2_MASK =3 , -GPIO3C2_GPIO =0 , -GPIO3C2_SDMMC1_DATA1 , -GPIO3C2_RMII_TXD0 , -GPIO3C2_RESERVED , - -GPIO3C1_SHIFT =2 , -GPIO3C1_MASK =3 , -GPIO3C1_GPIO =0 , -GPIO3C1_SDMMC1_DATA0 , -GPIO3C1_RMII_TXD1 , -GPIO3C1_RESERVED , - -GPIO3C0_SHIFT =0 , -GPIO3C0_MASK =3 , -GPIO3C0_GPIO =0 , -GPIO3C0_SDMMC1_CMD , -GPIO3C0_RMII_TX_EN , -GPIO3C0_RESERVED , -}; - -/* GRF_GPIO3D_IOMUX */ -enum { -GPIO3D6_SHIFT =12 , -GPIO3D6_MASK =3 , -GPIO3D6_GPIO =0 , -GPIO3D6_PWM_3 , -GPIO3D6_JTAG_TMS , -GPIO3D6_HOST_DRV_VBUS , - -GPIO3D5_SHIFT =10 , -GPIO3D5_MASK =3 , -GPIO3D5_GPIO =0 , -GPIO3D5_PWM_2 , -GPIO3D5_JTAG_TCK , -GPIO3D5_OTG_DRV_VBUS , - -GPIO3D4_SHIFT =8 , -GPIO3D4_MASK =3 , -GPIO3D4_GPIO =0 , -GPIO3D4_PWM_1 , -GPIO3D4_JTAG_TRSTN , - -GPIO3D3_SHIFT =6 , -GPIO3D3_MASK =3 , -GPIO3D3_GPIO =0 , -GPIO3D3_PWM_0 , - -GPIO3D2_SHIFT =4 , -GPIO3D2_MASK =3 , -GPIO3D2_GPIO =0 , -GPIO3D2_SDMMC1_INT_N , - -GPIO3D1_SHIFT =2 , -GPIO3D1_MASK =3 , -GPIO3D1_GPIO =0 , -GPIO3D1_SDMMC1_BACKEND_PWR , -GPIO3D1_MII_MDCLK , - -GPIO3D0_SHIFT =0 , -GPIO3D0_MASK =3 , -GPIO3D0_GPIO =0 , -GPIO3D0_SDMMC1_PWR_EN , -GPIO3D0_MII_MD , -}; - -struct rk3188_pinctrl_priv { -struct rk3188_grf *grf; -struct rk3188_pmu *pmu; -int num_banks; -}; - -/** -* Encode variants of iomux registers into a type variable -*/ -#define IOMUX_GPIO_ONLY BIT(0) - -/** -* @type: iomux variant using IOMUX_* constants -* @offset: if initialized to -1 it will be autocalculated, by specifying -* an initial offset value the relevant source offset can be reset -* to a new value for autocalculating the following iomux registers. -*/ -struct rockchip_iomux { -u8 type; -s16 offset; -}; - -/** -* @reg: register offset of the gpio bank -* @nr_pins: number of pins in this bank -* @bank_num: number of the bank, to account for holes -* @name: name of the bank -* @iomux: array describing the 4 iomux sources of the bank -*/ -struct rockchip_pin_bank { -u16 reg; -u8 nr_pins; -u8 bank_num; -char *name; -struct rockchip_iomux iomux[4 ]; -}; - -#define PIN_BANK (id, pins, label) \ - { \ - .bank_num = id, \ - .nr_pins = pins, \ - .name = label, \ - .iomux = { \ - { .offset = -1 }, \ - { .offset = -1 }, \ - { .offset = -1 }, \ - { .offset = -1 }, \ - }, \ - } - -#define PIN_BANK_IOMUX_FLAGS (id, pins, label, iom0, iom1, iom2, iom3) \ - { \ - .bank_num = id, \ - .nr_pins = pins, \ - .name = label, \ - .iomux = { \ - { .type = iom0, .offset = -1 }, \ - { .type = iom1, .offset = -1 }, \ - { .type = iom2, .offset = -1 }, \ - { .type = iom3, .offset = -1 }, \ - }, \ - } - -#ifndef CONFIG_SPL_BUILD -static struct rockchip_pin_bank rk3188_pin_banks[] = { -PIN_BANK_IOMUX_FLAGS (0 ,32 ,"gpio0" ,IOMUX_GPIO_ONLY ,0 ,0 ,0 ), -PIN_BANK (1 ,32 ,"gpio1" ), -PIN_BANK (2 ,32 ,"gpio2" ), -PIN_BANK (3 ,32 ,"gpio3" ), -}; -#endif - -static void pinctrl_rk3188_pwm_config (struct rk3188_grf *grf,int pwm_id) -{ -switch (pwm_id) { -case PERIPH_ID_PWM0 : -rk_clrsetreg (&grf->gpio3d_iomux,GPIO3D3_MASK <<GPIO3D3_SHIFT , -GPIO3D3_PWM_0 <<GPIO3D3_SHIFT ); -break ; -case PERIPH_ID_PWM1 : -rk_clrsetreg (&grf->gpio3d_iomux,GPIO3D4_MASK <<GPIO3D4_SHIFT , -GPIO3D4_PWM_1 <<GPIO3D4_SHIFT ); -break ; -case PERIPH_ID_PWM2 : -rk_clrsetreg (&grf->gpio3d_iomux,GPIO3D5_MASK <<GPIO3D5_SHIFT , -GPIO3D5_PWM_2 <<GPIO3D5_SHIFT ); -break ; -case PERIPH_ID_PWM3 : -rk_clrsetreg (&grf->gpio3d_iomux,GPIO3D6_MASK <<GPIO3D6_SHIFT , -GPIO3D6_PWM_3 <<GPIO3D6_SHIFT ); -break ; -default : -debug ("pwm id = %d iomux error!\n" , pwm_id); -break ; - } -} - -static void pinctrl_rk3188_i2c_config (struct rk3188_grf *grf, -struct rk3188_pmu *pmu,int i2c_id) -{ -switch (i2c_id) { -case PERIPH_ID_I2C0 : -rk_clrsetreg (&grf->gpio1d_iomux, -GPIO1D1_MASK <<GPIO1D1_SHIFT | -GPIO1D0_MASK <<GPIO1D0_SHIFT , -GPIO1D1_I2C0_SCL <<GPIO1D1_SHIFT | -GPIO1D0_I2C0_SDA <<GPIO1D0_SHIFT ); -/* enable new i2c controller */ -rk_clrsetreg (&grf->soc_con1,1 <<RKI2C0_SEL_SHIFT , -1 <<RKI2C0_SEL_SHIFT ); -break ; -case PERIPH_ID_I2C1 : -rk_clrsetreg (&grf->gpio1d_iomux, -GPIO1D3_MASK <<GPIO1D3_SHIFT | -GPIO1D2_MASK <<GPIO1D2_SHIFT , -GPIO1D3_I2C1_SCL <<GPIO1D2_SHIFT | -GPIO1D2_I2C1_SDA <<GPIO1D2_SHIFT ); -rk_clrsetreg (&grf->soc_con1,1 <<RKI2C1_SEL_SHIFT , -1 <<RKI2C1_SEL_SHIFT ); -break ; -case PERIPH_ID_I2C2 : -rk_clrsetreg (&grf->gpio1d_iomux, -GPIO1D5_MASK <<GPIO1D5_SHIFT | -GPIO1D4_MASK <<GPIO1D4_SHIFT , -GPIO1D5_I2C2_SCL <<GPIO1D5_SHIFT | -GPIO1D4_I2C2_SDA <<GPIO1D4_SHIFT ); -rk_clrsetreg (&grf->soc_con1,1 <<RKI2C2_SEL_SHIFT , -1 <<RKI2C2_SEL_SHIFT ); -break ; -case PERIPH_ID_I2C3 : -rk_clrsetreg (&grf->gpio3b_iomux, -GPIO3B7_MASK <<GPIO3B7_SHIFT | -GPIO3B6_MASK <<GPIO3B6_SHIFT , -GPIO3B7_I2C3_SCL <<GPIO3B7_SHIFT | -GPIO3B6_I2C3_SDA <<GPIO3B6_SHIFT ); -rk_clrsetreg (&grf->soc_con1,1 <<RKI2C3_SEL_SHIFT , -1 <<RKI2C3_SEL_SHIFT ); -break ; -case PERIPH_ID_I2C4 : -rk_clrsetreg (&grf->gpio1d_iomux, -GPIO1D7_MASK <<GPIO1D7_SHIFT | -GPIO1D6_MASK <<GPIO1D6_SHIFT , -GPIO1D7_I2C4_SCL <<GPIO1D7_SHIFT | -GPIO1D6_I2C4_SDA <<GPIO1D6_SHIFT ); -rk_clrsetreg (&grf->soc_con1,1 <<RKI2C4_SEL_SHIFT , -1 <<RKI2C4_SEL_SHIFT ); -break ; -default : -debug ("i2c id = %d iomux error!\n" , i2c_id); -break ; - } -} - -static int pinctrl_rk3188_spi_config (struct rk3188_grf *grf, -enum periph_id spi_id,int cs) -{ -switch (spi_id) { -case PERIPH_ID_SPI0 : -switch (cs) { -case 0 : -rk_clrsetreg (&grf->gpio1a_iomux, -GPIO1A7_MASK <<GPIO1A7_SHIFT , -GPIO1A7_SPI0_CSN0 <<GPIO1A7_SHIFT ); -break ; -case 1 : -rk_clrsetreg (&grf->gpio1b_iomux, -GPIO1B7_MASK <<GPIO1B7_SHIFT , -GPIO1B7_SPI0_CSN1 <<GPIO1B7_SHIFT ); -break ; -default : - goto err; - } -rk_clrsetreg (&grf->gpio1a_iomux, -GPIO1A4_MASK <<GPIO1A4_SHIFT | -GPIO1A5_MASK <<GPIO1A5_SHIFT | -GPIO1A6_MASK <<GPIO1A6_SHIFT , -GPIO1A4_SPI0_RXD <<GPIO1A4_SHIFT | -GPIO1A5_SPI0_TXD <<GPIO1A5_SHIFT | -GPIO1A6_SPI0_CLK <<GPIO1A6_SHIFT ); -break ; -case PERIPH_ID_SPI1 : -switch (cs) { -case 0 : -rk_clrsetreg (&grf->gpio0d_iomux, -GPIO0D7_MASK <<GPIO0D7_SHIFT , -GPIO0D7_SPI1_CSN0 <<GPIO0D7_SHIFT ); -break ; -case 1 : -rk_clrsetreg (&grf->gpio1b_iomux, -GPIO1B6_MASK <<GPIO1B6_SHIFT , -GPIO1B6_SPI1_CSN1 <<GPIO1B6_SHIFT ); -break ; -default : - goto err; - } -rk_clrsetreg (&grf->gpio0d_iomux, -GPIO0D4_MASK <<GPIO0D4_SHIFT | -GPIO0D5_MASK <<GPIO0D5_SHIFT | -GPIO0D6_MASK <<GPIO0D6_SHIFT , -GPIO0D4_SPI0_RXD <<GPIO0D4_SHIFT | -GPIO0D5_SPI1_TXD <<GPIO0D5_SHIFT | -GPIO0D6_SPI1_CLK <<GPIO0D6_SHIFT ); -break ; -default : - goto err; - } - -return 0 ; -err: -debug ("rkspi: periph%d cs=%d not supported" , spi_id, cs); -return -ENOENT ; -} - -static void pinctrl_rk3188_uart_config (struct rk3188_grf *grf,int uart_id) -{ -switch (uart_id) { -case PERIPH_ID_UART0 : -rk_clrsetreg (&grf->gpio1a_iomux, -GPIO1A3_MASK <<GPIO1A3_SHIFT | -GPIO1A2_MASK <<GPIO1A2_SHIFT | -GPIO1A1_MASK <<GPIO1A1_SHIFT | -GPIO1A0_MASK <<GPIO1A0_SHIFT , -GPIO1A3_UART0_RTS_N <<GPIO1A3_SHIFT | -GPIO1A2_UART0_CTS_N <<GPIO1A2_SHIFT | -GPIO1A1_UART0_SOUT <<GPIO1A1_SHIFT | -GPIO1A0_UART0_SIN <<GPIO1A0_SHIFT ); -break ; -case PERIPH_ID_UART1 : -rk_clrsetreg (&grf->gpio1a_iomux, -GPIO1A7_MASK <<GPIO1A7_SHIFT | -GPIO1A6_MASK <<GPIO1A6_SHIFT | -GPIO1A5_MASK <<GPIO1A5_SHIFT | -GPIO1A4_MASK <<GPIO1A4_SHIFT , -GPIO1A7_UART1_RTS_N <<GPIO1A7_SHIFT | -GPIO1A6_UART1_CTS_N <<GPIO1A6_SHIFT | -GPIO1A5_UART1_SOUT <<GPIO1A5_SHIFT | -GPIO1A4_UART1_SIN <<GPIO1A4_SHIFT ); -break ; -case PERIPH_ID_UART2 : -rk_clrsetreg (&grf->gpio1b_iomux, -GPIO1B1_MASK <<GPIO1B1_SHIFT | -GPIO1B0_MASK <<GPIO1B0_SHIFT , -GPIO1B1_UART2_SOUT <<GPIO1B1_SHIFT | -GPIO1B0_UART2_SIN <<GPIO1B0_SHIFT ); -break ; -case PERIPH_ID_UART3 : -rk_clrsetreg (&grf->gpio1b_iomux, -GPIO1B5_MASK <<GPIO1B5_SHIFT | -GPIO1B4_MASK <<GPIO1B4_SHIFT | -GPIO1B3_MASK <<GPIO1B3_SHIFT | -GPIO1B2_MASK <<GPIO1B2_SHIFT , -GPIO1B5_UART3_RTS_N <<GPIO1B5_SHIFT | -GPIO1B4_UART3_CTS_N <<GPIO1B4_SHIFT | -GPIO1B3_UART3_SOUT <<GPIO1B3_SHIFT | -GPIO1B2_UART3_SIN <<GPIO1B2_SHIFT ); -break ; -default : -debug ("uart id = %d iomux error!\n" , uart_id); -break ; - } -} - -static void pinctrl_rk3188_sdmmc_config (struct rk3188_grf *grf,int mmc_id) -{ -switch (mmc_id) { -case PERIPH_ID_EMMC : -rk_clrsetreg (&grf->soc_con0,1 <<EMMC_FLASH_SEL_SHIFT , -1 <<EMMC_FLASH_SEL_SHIFT ); -rk_clrsetreg (&grf->gpio0d_iomux, -GPIO0D2_MASK <<GPIO0D2_SHIFT | -GPIO0D0_MASK <<GPIO0D0_SHIFT , -GPIO0D2_EMMC_CMD <<GPIO0D2_SHIFT | -GPIO0D0_EMMC_CLKOUT <<GPIO0D0_SHIFT ); -break ; -case PERIPH_ID_SDCARD : -rk_clrsetreg (&grf->gpio3b_iomux, -GPIO3B0_MASK <<GPIO3B0_SHIFT , -GPIO3B0_SDMMC_DETECT_N <<GPIO3B0_SHIFT ); -rk_clrsetreg (&grf->gpio3a_iomux, -GPIO3A7_MASK <<GPIO3A7_SHIFT | -GPIO3A6_MASK <<GPIO3A6_SHIFT | -GPIO3A5_MASK <<GPIO3A5_SHIFT | -GPIO3A4_MASK <<GPIO3A4_SHIFT | -GPIO3A3_MASK <<GPIO3A3_SHIFT | -GPIO3A3_MASK <<GPIO3A2_SHIFT , -GPIO3A7_SDMMC0_DATA3 <<GPIO3A7_SHIFT | -GPIO3A6_SDMMC0_DATA2 <<GPIO3A6_SHIFT | -GPIO3A5_SDMMC0_DATA1 <<GPIO3A5_SHIFT | -GPIO3A4_SDMMC0_DATA0 <<GPIO3A4_SHIFT | -GPIO3A3_SDMMC0_CMD <<GPIO3A3_SHIFT | -GPIO3A2_SDMMC0_CLKOUT <<GPIO3A2_SHIFT ); -break ; -default : -debug ("mmc id = %d iomux error!\n" , mmc_id); -break ; - } -} - -static int rk3188_pinctrl_request (struct udevice *dev,int func,int flags) -{ -struct rk3188_pinctrl_priv *priv =dev_get_priv (dev); - -debug ("%s: func=%x, flags=%x\n" , __func__, func, flags); -switch (func) { -case PERIPH_ID_PWM0 : -case PERIPH_ID_PWM1 : -case PERIPH_ID_PWM2 : -case PERIPH_ID_PWM3 : -case PERIPH_ID_PWM4 : -pinctrl_rk3188_pwm_config (priv->grf, func); -break ; -case PERIPH_ID_I2C0 : -case PERIPH_ID_I2C1 : -case PERIPH_ID_I2C2 : -case PERIPH_ID_I2C3 : -case PERIPH_ID_I2C4 : -case PERIPH_ID_I2C5 : -pinctrl_rk3188_i2c_config (priv->grf, priv->pmu, func); -break ; -case PERIPH_ID_SPI0 : -case PERIPH_ID_SPI1 : -case PERIPH_ID_SPI2 : -pinctrl_rk3188_spi_config (priv->grf, func, flags); -break ; -case PERIPH_ID_UART0 : -case PERIPH_ID_UART1 : -case PERIPH_ID_UART2 : -case PERIPH_ID_UART3 : -case PERIPH_ID_UART4 : -pinctrl_rk3188_uart_config (priv->grf, func); -break ; -break ; -case PERIPH_ID_SDMMC0 : -case PERIPH_ID_SDMMC1 : -pinctrl_rk3188_sdmmc_config (priv->grf, func); -break ; -default : -return -EINVAL ; - } - -return 0 ; -} - -static int rk3188_pinctrl_get_periph_id (struct udevice *dev, -struct udevice *periph) -{ -#if !CONFIG_IS_ENABLED (OF_PLATDATA ) -u32 cell[3 ]; -int ret; - - ret =dev_read_u32_array (periph,"interrupts" , cell,ARRAY_SIZE (cell)); -if (ret <0 ) -return -EINVAL ; - -switch (cell[1 ]) { -case 44 : -return PERIPH_ID_SPI0 ; -case 45 : -return PERIPH_ID_SPI1 ; -case 46 : -return PERIPH_ID_SPI2 ; -case 60 : -return PERIPH_ID_I2C0 ; -case 62 :/* Note strange order */ -return PERIPH_ID_I2C1 ; -case 61 : -return PERIPH_ID_I2C2 ; -case 63 : -return PERIPH_ID_I2C3 ; -case 64 : -return PERIPH_ID_I2C4 ; -case 65 : -return PERIPH_ID_I2C5 ; - } -#endif - -return -ENOENT ; -} - -static int rk3188_pinctrl_set_state_simple (struct udevice *dev, -struct udevice *periph) -{ -int func; - - func =rk3188_pinctrl_get_periph_id (dev, periph); -if (func <0 ) -return func; -return rk3188_pinctrl_request (dev, func,0 ); -} - -#ifndef CONFIG_SPL_BUILD -int rk3188_pinctrl_get_pin_info (struct rk3188_pinctrl_priv *priv, -int banknum,int ind,u32 **addrp,uint *shiftp, -uint *maskp) -{ -struct rockchip_pin_bank *bank = &rk3188_pin_banks[banknum]; -uint muxnum; -u32 *addr; - -for (muxnum =0 ; muxnum <4 ; muxnum++) { -struct rockchip_iomux *mux = &bank->iomux[muxnum]; - -if (ind >=8 ) { - ind -=8 ; -continue ; - } - - addr = &priv->grf->gpio0c_iomux -2 ; - addr += mux->offset; - *shiftp = ind &7 ; - *maskp =3 ; - *shiftp *=2 ; - -debug ("%s: addr=%p, mask=%x, shift=%x\n" , __func__, addr, - *maskp, *shiftp); - *addrp = addr; -return 0 ; - } - -return -EINVAL ; -} - -static int rk3188_pinctrl_get_gpio_mux (struct udevice *dev,int banknum, -int index) -{ -struct rk3188_pinctrl_priv *priv =dev_get_priv (dev); -uint shift; -uint mask; -u32 *addr; -int ret; - - ret =rk3188_pinctrl_get_pin_info (priv, banknum, index, &addr, &shift, - &mask); -if (ret) -return ret; -return (readl (addr) & mask) >> shift; -} - -static int rk3188_pinctrl_set_pins (struct udevice *dev,int banknum,int index, -int muxval,int flags) -{ -struct rk3188_pinctrl_priv *priv =dev_get_priv (dev); -uint shift, ind = index; -uint mask; -u32 *addr; -int ret; - -debug ("%s: %x %x %x %x\n" , __func__, banknum, index, muxval, flags); - ret =rk3188_pinctrl_get_pin_info (priv, banknum, index, &addr, &shift, - &mask); -if (ret) -return ret; -rk_clrsetreg (addr, mask << shift, muxval << shift); - -/* Handle pullup/pulldown */ -if (flags) { -uint val =0 ; - -if (flags & (1 <<PIN_CONFIG_BIAS_PULL_UP )) - val =1 ; -else if (flags & (1 <<PIN_CONFIG_BIAS_PULL_DOWN )) - val =2 ; - - ind = index >>3 ; - -if (banknum ==0 && index <12 ) { - addr = &priv->pmu->gpio0_p[ind]; - shift = (index &7 ) *2 ; - }else if (banknum ==0 && index >=12 ) { - addr = &priv->grf->gpio0_p[ind -1 ]; -/* -* The bits in the grf-registers have an inverse -* ordering with the lowest pin being in bits 15:14 -* and the highest pin in bits 1:0 . -*/ - shift = (7 - (index &7 )) *2 ; - }else { - addr = &priv->grf->gpio1_p[banknum -1 ][ind]; - shift = (7 - (index &7 )) *2 ; - } -debug ("%s: addr=%p, val=%x, shift=%x\n" , __func__, addr, val, - shift); -rk_clrsetreg (addr,3 << shift, val << shift); - } - -return 0 ; -} - -static int rk3188_pinctrl_set_state (struct udevice *dev,struct udevice *config) -{ -const void *blob = gd->fdt_blob; -int pcfg_node, ret, flags, count, i; -u32 cell[60 ], *ptr; - -debug ("%s: %s %s\n" , __func__, dev->name, config->name); - ret =fdtdec_get_int_array_count (blob,dev_of_offset (config), -"rockchip,pins" , cell, -ARRAY_SIZE (cell)); -if (ret <0 ) { -debug ("%s: bad array %d\n" , __func__, ret); -return -EINVAL ; - } - count = ret; -for (i =0 , ptr = cell; i < count; i +=4 , ptr +=4 ) { - pcfg_node =fdt_node_offset_by_phandle (blob, ptr[3 ]); -if (pcfg_node <0 ) -return -EINVAL ; - flags =pinctrl_decode_pin_config (blob, pcfg_node); -if (flags <0 ) -return flags; - - ret =rk3188_pinctrl_set_pins (dev, ptr[0 ], ptr[1 ], ptr[2 ], - flags); -if (ret) -return ret; - } - -return 0 ; -} -#endif - -static struct pinctrl_ops rk3188_pinctrl_ops = { -#ifndef CONFIG_SPL_BUILD - .set_state = rk3188_pinctrl_set_state, - .get_gpio_mux = rk3188_pinctrl_get_gpio_mux, -#endif - .set_state_simple = rk3188_pinctrl_set_state_simple, - .request = rk3188_pinctrl_request, - .get_periph_id = rk3188_pinctrl_get_periph_id, -}; - -#ifndef CONFIG_SPL_BUILD -static int rk3188_pinctrl_parse_tables (struct rk3188_pinctrl_priv *priv, -struct rockchip_pin_bank *banks, -int count) -{ -struct rockchip_pin_bank *bank; -uint reg, muxnum, banknum; - - reg =0 ; -for (banknum =0 ; banknum < count; banknum++) { - bank = &banks[banknum]; - bank->reg = reg; -debug ("%s: bank %d, reg %x\n" , __func__, banknum, reg *4 ); -for (muxnum =0 ; muxnum <4 ; muxnum++) { -struct rockchip_iomux *mux = &bank->iomux[muxnum]; - - mux->offset = reg; - reg +=1 ; - } - } - -return 0 ; -} -#endif - -static int rk3188_pinctrl_probe (struct udevice *dev) -{ -struct rk3188_pinctrl_priv *priv =dev_get_priv (dev); -int ret =0 ; - - priv->grf =syscon_get_first_range (ROCKCHIP_SYSCON_GRF ); - priv->pmu =syscon_get_first_range (ROCKCHIP_SYSCON_PMU ); -debug ("%s: grf=%p, pmu=%p\n" , __func__, priv->grf, priv->pmu); -#ifndef CONFIG_SPL_BUILD - ret =rk3188_pinctrl_parse_tables (priv, rk3188_pin_banks, -ARRAY_SIZE (rk3188_pin_banks)); -#endif - -return ret; -} - -static const struct udevice_id rk3188_pinctrl_ids[] = { - { .compatible ="rockchip,rk3188-pinctrl" }, - { } -}; - -U_BOOT_DRIVER (pinctrl_rk3188) = { - .name ="rockchip_rk3188_pinctrl" , - .id =UCLASS_PINCTRL , - .of_match = rk3188_pinctrl_ids, - .priv_auto_alloc_size =sizeof (struct rk3188_pinctrl_priv ), - .ops = &rk3188_pinctrl_ops, -#if !CONFIG_IS_ENABLED(OF_PLATDATA) - .bind = dm_scan_fdt_dev, -#endif - .probe = rk3188_pinctrl_probe, -};drivers/pinctrl/rockchip/pinctrl_rk322x.c deleted +0
-894@@ -1,894 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* -* (C) Copyright 2017 Rockchip Electronics Co., Ltd. -*/ - -#include <common.h> -#include <dm.h> -#include <errno.h> -#include <syscon.h> -#include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/grf_rk322x.h> -#include <asm/arch/hardware.h> -#include <asm/arch/periph.h> -#include <dm/pinctrl.h> - -DECLARE_GLOBAL_DATA_PTR ; - -/* GRF_GPIO0A_IOMUX */ -enum { -GPIO0A7_SHIFT =14 , -GPIO0A7_MASK =3 <<GPIO0A7_SHIFT , -GPIO0A7_GPIO =0 , -GPIO0A7_I2C3_SDA , -GPIO0A7_HDMI_DDCSDA , - -GPIO0A6_SHIFT =12 , -GPIO0A6_MASK =3 <<GPIO0A6_SHIFT , -GPIO0A6_GPIO =0 , -GPIO0A6_I2C3_SCL , -GPIO0A6_HDMI_DDCSCL , - -GPIO0A3_SHIFT =6 , -GPIO0A3_MASK =3 <<GPIO0A3_SHIFT , -GPIO0A3_GPIO =0 , -GPIO0A3_I2C1_SDA , -GPIO0A3_SDIO_CMD , - -GPIO0A2_SHIFT =4 , -GPIO0A2_MASK =3 <<GPIO0A2_SHIFT , -GPIO0A2_GPIO =0 , -GPIO0A2_I2C1_SCL , - -GPIO0A1_SHIFT =2 , -GPIO0A1_MASK =3 <<GPIO0A1_SHIFT , -GPIO0A1_GPIO =0 , -GPIO0A1_I2C0_SDA , - -GPIO0A0_SHIFT =0 , -GPIO0A0_MASK =3 <<GPIO0A0_SHIFT , -GPIO0A0_GPIO =0 , -GPIO0A0_I2C0_SCL , -}; - -/* GRF_GPIO0B_IOMUX */ -enum { -GPIO0B7_SHIFT =14 , -GPIO0B7_MASK =3 <<GPIO0B7_SHIFT , -GPIO0B7_GPIO =0 , -GPIO0B7_HDMI_HDP , - -GPIO0B6_SHIFT =12 , -GPIO0B6_MASK =3 <<GPIO0B6_SHIFT , -GPIO0B6_GPIO =0 , -GPIO0B6_I2S_SDI , -GPIO0B6_SPI_CSN0 , - -GPIO0B5_SHIFT =10 , -GPIO0B5_MASK =3 <<GPIO0B5_SHIFT , -GPIO0B5_GPIO =0 , -GPIO0B5_I2S_SDO , -GPIO0B5_SPI_RXD , - -GPIO0B3_SHIFT =6 , -GPIO0B3_MASK =3 <<GPIO0B3_SHIFT , -GPIO0B3_GPIO =0 , -GPIO0B3_I2S1_LRCKRX , -GPIO0B3_SPI_TXD , - -GPIO0B1_SHIFT =2 , -GPIO0B1_MASK =3 <<GPIO0B1_SHIFT , -GPIO0B1_GPIO =0 , -GPIO0B1_I2S_SCLK , -GPIO0B1_SPI_CLK , - -GPIO0B0_SHIFT =0 , -GPIO0B0_MASK =3 , -GPIO0B0_GPIO =0 , -GPIO0B0_I2S_MCLK , -}; - -/* GRF_GPIO0C_IOMUX */ -enum { -GPIO0C4_SHIFT =8 , -GPIO0C4_MASK =3 <<GPIO0C4_SHIFT , -GPIO0C4_GPIO =0 , -GPIO0C4_HDMI_CECSDA , - -GPIO0C1_SHIFT =2 , -GPIO0C1_MASK =3 <<GPIO0C1_SHIFT , -GPIO0C1_GPIO =0 , -GPIO0C1_UART0_RSTN , -GPIO0C1_CLK_OUT1 , -}; - -/* GRF_GPIO0D_IOMUX */ -enum { -GPIO0D6_SHIFT =12 , -GPIO0D6_MASK =3 <<GPIO0D6_SHIFT , -GPIO0D6_GPIO =0 , -GPIO0D6_SDIO_PWREN , -GPIO0D6_PWM11 , - -GPIO0D4_SHIFT =8 , -GPIO0D4_MASK =3 <<GPIO0D4_SHIFT , -GPIO0D4_GPIO =0 , -GPIO0D4_PWM2 , - -GPIO0D3_SHIFT =6 , -GPIO0D3_MASK =3 <<GPIO0D3_SHIFT , -GPIO0D3_GPIO =0 , -GPIO0D3_PWM1 , - -GPIO0D2_SHIFT =4 , -GPIO0D2_MASK =3 <<GPIO0D2_SHIFT , -GPIO0D2_GPIO =0 , -GPIO0D2_PWM0 , -}; - -/* GRF_GPIO1A_IOMUX */ -enum { -GPIO1A7_SHIFT =14 , -GPIO1A7_MASK =1 , -GPIO1A7_GPIO =0 , -GPIO1A7_SDMMC_WRPRT , -}; - -/* GRF_GPIO1B_IOMUX */ -enum { -GPIO1B7_SHIFT =14 , -GPIO1B7_MASK =3 <<GPIO1B7_SHIFT , -GPIO1B7_GPIO =0 , -GPIO1B7_SDMMC_CMD , - -GPIO1B6_SHIFT =12 , -GPIO1B6_MASK =3 <<GPIO1B6_SHIFT , -GPIO1B6_GPIO =0 , -GPIO1B6_SDMMC_PWREN , - -GPIO1B4_SHIFT =8 , -GPIO1B4_MASK =3 <<GPIO1B4_SHIFT , -GPIO1B4_GPIO =0 , -GPIO1B4_SPI_CSN1 , -GPIO1B4_PWM12 , - -GPIO1B3_SHIFT =6 , -GPIO1B3_MASK =3 <<GPIO1B3_SHIFT , -GPIO1B3_GPIO =0 , -GPIO1B3_UART1_RSTN , -GPIO1B3_PWM13 , - -GPIO1B2_SHIFT =4 , -GPIO1B2_MASK =3 <<GPIO1B2_SHIFT , -GPIO1B2_GPIO =0 , -GPIO1B2_UART1_SIN , -GPIO1B2_UART21_SIN , - -GPIO1B1_SHIFT =2 , -GPIO1B1_MASK =3 <<GPIO1B1_SHIFT , -GPIO1B1_GPIO =0 , -GPIO1B1_UART1_SOUT , -GPIO1B1_UART21_SOUT , -}; - -/* GRF_GPIO1C_IOMUX */ -enum { -GPIO1C7_SHIFT =14 , -GPIO1C7_MASK =3 <<GPIO1C7_SHIFT , -GPIO1C7_GPIO =0 , -GPIO1C7_NAND_CS3 , -GPIO1C7_EMMC_RSTNOUT , - -GPIO1C6_SHIFT =12 , -GPIO1C6_MASK =3 <<GPIO1C6_SHIFT , -GPIO1C6_GPIO =0 , -GPIO1C6_NAND_CS2 , -GPIO1C6_EMMC_CMD , - -GPIO1C5_SHIFT =10 , -GPIO1C5_MASK =3 <<GPIO1C5_SHIFT , -GPIO1C5_GPIO =0 , -GPIO1C5_SDMMC_D3 , -GPIO1C5_JTAG_TMS , - -GPIO1C4_SHIFT =8 , -GPIO1C4_MASK =3 <<GPIO1C4_SHIFT , -GPIO1C4_GPIO =0 , -GPIO1C4_SDMMC_D2 , -GPIO1C4_JTAG_TCK , - -GPIO1C3_SHIFT =6 , -GPIO1C3_MASK =3 <<GPIO1C3_SHIFT , -GPIO1C3_GPIO =0 , -GPIO1C3_SDMMC_D1 , -GPIO1C3_UART2_SIN , - -GPIO1C2_SHIFT =4 , -GPIO1C2_MASK =3 <<GPIO1C2_SHIFT , -GPIO1C2_GPIO =0 , -GPIO1C2_SDMMC_D0 , -GPIO1C2_UART2_SOUT , - -GPIO1C1_SHIFT =2 , -GPIO1C1_MASK =3 <<GPIO1C1_SHIFT , -GPIO1C1_GPIO =0 , -GPIO1C1_SDMMC_DETN , - -GPIO1C0_SHIFT =0 , -GPIO1C0_MASK =3 <<GPIO1C0_SHIFT , -GPIO1C0_GPIO =0 , -GPIO1C0_SDMMC_CLKOUT , -}; - -/* GRF_GPIO1D_IOMUX */ -enum { -GPIO1D7_SHIFT =14 , -GPIO1D7_MASK =3 <<GPIO1D7_SHIFT , -GPIO1D7_GPIO =0 , -GPIO1D7_NAND_D7 , -GPIO1D7_EMMC_D7 , - -GPIO1D6_SHIFT =12 , -GPIO1D6_MASK =3 <<GPIO1D6_SHIFT , -GPIO1D6_GPIO =0 , -GPIO1D6_NAND_D6 , -GPIO1D6_EMMC_D6 , - -GPIO1D5_SHIFT =10 , -GPIO1D5_MASK =3 <<GPIO1D5_SHIFT , -GPIO1D5_GPIO =0 , -GPIO1D5_NAND_D5 , -GPIO1D5_EMMC_D5 , - -GPIO1D4_SHIFT =8 , -GPIO1D4_MASK =3 <<GPIO1D4_SHIFT , -GPIO1D4_GPIO =0 , -GPIO1D4_NAND_D4 , -GPIO1D4_EMMC_D4 , - -GPIO1D3_SHIFT =6 , -GPIO1D3_MASK =3 <<GPIO1D3_SHIFT , -GPIO1D3_GPIO =0 , -GPIO1D3_NAND_D3 , -GPIO1D3_EMMC_D3 , - -GPIO1D2_SHIFT =4 , -GPIO1D2_MASK =3 <<GPIO1D2_SHIFT , -GPIO1D2_GPIO =0 , -GPIO1D2_NAND_D2 , -GPIO1D2_EMMC_D2 , - -GPIO1D1_SHIFT =2 , -GPIO1D1_MASK =3 <<GPIO1D1_SHIFT , -GPIO1D1_GPIO =0 , -GPIO1D1_NAND_D1 , -GPIO1D1_EMMC_D1 , - -GPIO1D0_SHIFT =0 , -GPIO1D0_MASK =3 <<GPIO1D0_SHIFT , -GPIO1D0_GPIO =0 , -GPIO1D0_NAND_D0 , -GPIO1D0_EMMC_D0 , -}; - -/* GRF_GPIO2A_IOMUX */ -enum { -GPIO2A7_SHIFT =14 , -GPIO2A7_MASK =3 <<GPIO2A7_SHIFT , -GPIO2A7_GPIO =0 , -GPIO2A7_NAND_DQS , -GPIO2A7_EMMC_CLKOUT , - -GPIO2A5_SHIFT =10 , -GPIO2A5_MASK =3 <<GPIO2A5_SHIFT , -GPIO2A5_GPIO =0 , -GPIO2A5_NAND_WP , -GPIO2A5_EMMC_PWREN , - -GPIO2A4_SHIFT =8 , -GPIO2A4_MASK =3 <<GPIO2A4_SHIFT , -GPIO2A4_GPIO =0 , -GPIO2A4_NAND_RDY , -GPIO2A4_EMMC_CMD , - -GPIO2A3_SHIFT =6 , -GPIO2A3_MASK =3 <<GPIO2A3_SHIFT , -GPIO2A3_GPIO =0 , -GPIO2A3_NAND_RDN , -GPIO2A4_SPI1_CSN1 , - -GPIO2A2_SHIFT =4 , -GPIO2A2_MASK =3 <<GPIO2A2_SHIFT , -GPIO2A2_GPIO =0 , -GPIO2A2_NAND_WRN , -GPIO2A4_SPI1_CSN0 , - -GPIO2A1_SHIFT =2 , -GPIO2A1_MASK =3 <<GPIO2A1_SHIFT , -GPIO2A1_GPIO =0 , -GPIO2A1_NAND_CLE , -GPIO2A1_SPI1_TXD , - -GPIO2A0_SHIFT =0 , -GPIO2A0_MASK =3 <<GPIO2A0_SHIFT , -GPIO2A0_GPIO =0 , -GPIO2A0_NAND_ALE , -GPIO2A0_SPI1_RXD , -}; - -/* GRF_GPIO2B_IOMUX */ -enum { -GPIO2B7_SHIFT =14 , -GPIO2B7_MASK =3 <<GPIO2B7_SHIFT , -GPIO2B7_GPIO =0 , -GPIO2B7_GMAC_RXER , - -GPIO2B6_SHIFT =12 , -GPIO2B6_MASK =3 <<GPIO2B6_SHIFT , -GPIO2B6_GPIO =0 , -GPIO2B6_GMAC_CLK , -GPIO2B6_MAC_LINK , - -GPIO2B5_SHIFT =10 , -GPIO2B5_MASK =3 <<GPIO2B5_SHIFT , -GPIO2B5_GPIO =0 , -GPIO2B5_GMAC_TXEN , - -GPIO2B4_SHIFT =8 , -GPIO2B4_MASK =3 <<GPIO2B4_SHIFT , -GPIO2B4_GPIO =0 , -GPIO2B4_GMAC_MDIO , - -GPIO2B3_SHIFT =6 , -GPIO2B3_MASK =3 <<GPIO2B3_SHIFT , -GPIO2B3_GPIO =0 , -GPIO2B3_GMAC_RXCLK , - -GPIO2B2_SHIFT =4 , -GPIO2B2_MASK =3 <<GPIO2B2_SHIFT , -GPIO2B2_GPIO =0 , -GPIO2B2_GMAC_CRS , - -GPIO2B1_SHIFT =2 , -GPIO2B1_MASK =3 <<GPIO2B1_SHIFT , -GPIO2B1_GPIO =0 , -GPIO2B1_GMAC_TXCLK , - -GPIO2B0_SHIFT =0 , -GPIO2B0_MASK =3 <<GPIO2B0_SHIFT , -GPIO2B0_GPIO =0 , -GPIO2B0_GMAC_RXDV , -GPIO2B0_MAC_SPEED_IOUT , -}; - -/* GRF_GPIO2C_IOMUX */ -enum { -GPIO2C7_SHIFT =14 , -GPIO2C7_MASK =3 <<GPIO2C7_SHIFT , -GPIO2C7_GPIO =0 , -GPIO2C7_GMAC_TXD3 , - -GPIO2C6_SHIFT =12 , -GPIO2C6_MASK =3 <<GPIO2C6_SHIFT , -GPIO2C6_GPIO =0 , -GPIO2C6_GMAC_TXD2 , - -GPIO2C5_SHIFT =10 , -GPIO2C5_MASK =3 <<GPIO2C5_SHIFT , -GPIO2C5_GPIO =0 , -GPIO2C5_I2C2_SCL , -GPIO2C5_GMAC_RXD2 , - -GPIO2C4_SHIFT =8 , -GPIO2C4_MASK =3 <<GPIO2C4_SHIFT , -GPIO2C4_GPIO =0 , -GPIO2C4_I2C2_SDA , -GPIO2C4_GMAC_RXD3 , - -GPIO2C3_SHIFT =6 , -GPIO2C3_MASK =3 <<GPIO2C3_SHIFT , -GPIO2C3_GPIO =0 , -GPIO2C3_GMAC_TXD0 , - -GPIO2C2_SHIFT =4 , -GPIO2C2_MASK =3 <<GPIO2C2_SHIFT , -GPIO2C2_GPIO =0 , -GPIO2C2_GMAC_TXD1 , - -GPIO2C1_SHIFT =2 , -GPIO2C1_MASK =3 <<GPIO2C1_SHIFT , -GPIO2C1_GPIO =0 , -GPIO2C1_GMAC_RXD0 , - -GPIO2C0_SHIFT =0 , -GPIO2C0_MASK =3 <<GPIO2C0_SHIFT , -GPIO2C0_GPIO =0 , -GPIO2C0_GMAC_RXD1 , -}; - -/* GRF_GPIO2D_IOMUX */ -enum { -GPIO2D1_SHIFT =2 , -GPIO2D1_MASK =3 <<GPIO2D1_SHIFT , -GPIO2D1_GPIO =0 , -GPIO2D1_GMAC_MDC , - -GPIO2D0_SHIFT =0 , -GPIO2D0_MASK =3 , -GPIO2D0_GPIO =0 , -GPIO2D0_GMAC_COL , -}; - -/* GRF_GPIO3C_IOMUX */ -enum { -GPIO3C6_SHIFT =12 , -GPIO3C6_MASK =3 <<GPIO3C6_SHIFT , -GPIO3C6_GPIO =0 , -GPIO3C6_DRV_VBUS1 , - -GPIO3C5_SHIFT =10 , -GPIO3C5_MASK =3 <<GPIO3C5_SHIFT , -GPIO3C5_GPIO =0 , -GPIO3C5_PWM10 , - -GPIO3C1_SHIFT =2 , -GPIO3C1_MASK =3 <<GPIO3C1_SHIFT , -GPIO3C1_GPIO =0 , -GPIO3C1_DRV_VBUS , -}; - -/* GRF_GPIO3D_IOMUX */ -enum { -GPIO3D2_SHIFT =4 , -GPIO3D2_MASK =3 <<GPIO3D2_SHIFT , -GPIO3D2_GPIO =0 , -GPIO3D2_PWM3 , -}; - -/* GRF_CON_IOMUX */ -enum { -CON_IOMUX_GMACSEL_SHIFT =15 , -CON_IOMUX_GMACSEL_MASK =1 <<CON_IOMUX_GMACSEL_SHIFT , -CON_IOMUX_GMACSEL_1 =1 , -CON_IOMUX_UART1SEL_SHIFT =11 , -CON_IOMUX_UART1SEL_MASK =1 <<CON_IOMUX_UART1SEL_SHIFT , -CON_IOMUX_UART2SEL_SHIFT =8 , -CON_IOMUX_UART2SEL_MASK =1 <<CON_IOMUX_UART2SEL_SHIFT , -CON_IOMUX_UART2SEL_2 =0 , -CON_IOMUX_UART2SEL_21 , -CON_IOMUX_EMMCSEL_SHIFT =7 , -CON_IOMUX_EMMCSEL_MASK =1 <<CON_IOMUX_EMMCSEL_SHIFT , -CON_IOMUX_PWM3SEL_SHIFT =3 , -CON_IOMUX_PWM3SEL_MASK =1 <<CON_IOMUX_PWM3SEL_SHIFT , -CON_IOMUX_PWM2SEL_SHIFT =2 , -CON_IOMUX_PWM2SEL_MASK =1 <<CON_IOMUX_PWM2SEL_SHIFT , -CON_IOMUX_PWM1SEL_SHIFT =1 , -CON_IOMUX_PWM1SEL_MASK =1 <<CON_IOMUX_PWM1SEL_SHIFT , -CON_IOMUX_PWM0SEL_SHIFT =0 , -CON_IOMUX_PWM0SEL_MASK =1 <<CON_IOMUX_PWM0SEL_SHIFT , -}; - -/* GRF_GPIO2B_E */ -enum { -GRF_GPIO2B0_E_SHIFT =0 , -GRF_GPIO2B0_E_MASK =3 <<GRF_GPIO2B0_E_SHIFT , -GRF_GPIO2B1_E_SHIFT =2 , -GRF_GPIO2B1_E_MASK =3 <<GRF_GPIO2B1_E_SHIFT , -GRF_GPIO2B3_E_SHIFT =6 , -GRF_GPIO2B3_E_MASK =3 <<GRF_GPIO2B3_E_SHIFT , -GRF_GPIO2B4_E_SHIFT =8 , -GRF_GPIO2B4_E_MASK =3 <<GRF_GPIO2B4_E_SHIFT , -GRF_GPIO2B5_E_SHIFT =10 , -GRF_GPIO2B5_E_MASK =3 <<GRF_GPIO2B5_E_SHIFT , -GRF_GPIO2B6_E_SHIFT =12 , -GRF_GPIO2B6_E_MASK =3 <<GRF_GPIO2B6_E_SHIFT , -}; - -/* GRF_GPIO2C_E */ -enum { -GRF_GPIO2C0_E_SHIFT =0 , -GRF_GPIO2C0_E_MASK =3 <<GRF_GPIO2C0_E_SHIFT , -GRF_GPIO2C1_E_SHIFT =2 , -GRF_GPIO2C1_E_MASK =3 <<GRF_GPIO2C1_E_SHIFT , -GRF_GPIO2C2_E_SHIFT =4 , -GRF_GPIO2C2_E_MASK =3 <<GRF_GPIO2C2_E_SHIFT , -GRF_GPIO2C3_E_SHIFT =6 , -GRF_GPIO2C3_E_MASK =3 <<GRF_GPIO2C3_E_SHIFT , -GRF_GPIO2C4_E_SHIFT =8 , -GRF_GPIO2C4_E_MASK =3 <<GRF_GPIO2C4_E_SHIFT , -GRF_GPIO2C5_E_SHIFT =10 , -GRF_GPIO2C5_E_MASK =3 <<GRF_GPIO2C5_E_SHIFT , -GRF_GPIO2C6_E_SHIFT =12 , -GRF_GPIO2C6_E_MASK =3 <<GRF_GPIO2C6_E_SHIFT , -GRF_GPIO2C7_E_SHIFT =14 , -GRF_GPIO2C7_E_MASK =3 <<GRF_GPIO2C7_E_SHIFT , -}; - -/* GRF_GPIO2D_E */ -enum { -GRF_GPIO2D1_E_SHIFT =2 , -GRF_GPIO2D1_E_MASK =3 <<GRF_GPIO2D1_E_SHIFT , -}; - -/* GPIO Bias drive strength settings */ -enum GPIO_BIAS { -GPIO_BIAS_2MA =0 , -GPIO_BIAS_4MA , -GPIO_BIAS_8MA , -GPIO_BIAS_12MA , -}; - -struct rk322x_pinctrl_priv { -struct rk322x_grf *grf; -}; - -static void pinctrl_rk322x_pwm_config (struct rk322x_grf *grf,int pwm_id) -{ -u32 mux_con =readl (&grf->con_iomux); - -switch (pwm_id) { -case PERIPH_ID_PWM0 : -if (mux_con &CON_IOMUX_PWM0SEL_MASK ) -rk_clrsetreg (&grf->gpio3c_iomux,GPIO3C5_MASK , -GPIO3C5_PWM10 <<GPIO3C5_SHIFT ); -else -rk_clrsetreg (&grf->gpio0d_iomux,GPIO0D2_MASK , -GPIO0D2_PWM0 <<GPIO0D2_SHIFT ); -break ; -case PERIPH_ID_PWM1 : -if (mux_con &CON_IOMUX_PWM1SEL_MASK ) -rk_clrsetreg (&grf->gpio0d_iomux,GPIO0D6_MASK , -GPIO0D6_PWM11 <<GPIO0D6_SHIFT ); -else -rk_clrsetreg (&grf->gpio0d_iomux,GPIO0D3_MASK , -GPIO0D3_PWM1 <<GPIO0D3_SHIFT ); -break ; -case PERIPH_ID_PWM2 : -if (mux_con &CON_IOMUX_PWM2SEL_MASK ) -rk_clrsetreg (&grf->gpio1b_iomux,GPIO1B4_MASK , -GPIO1B4_PWM12 <<GPIO1B4_SHIFT ); -else -rk_clrsetreg (&grf->gpio0d_iomux,GPIO0D4_MASK , -GPIO0D4_PWM2 <<GPIO0D4_SHIFT ); -break ; -case PERIPH_ID_PWM3 : -if (mux_con &CON_IOMUX_PWM3SEL_MASK ) -rk_clrsetreg (&grf->gpio1b_iomux,GPIO1B3_MASK , -GPIO1B3_PWM13 <<GPIO1B3_SHIFT ); -else -rk_clrsetreg (&grf->gpio3d_iomux,GPIO3D2_MASK , -GPIO3D2_PWM3 <<GPIO3D2_SHIFT ); -break ; -default : -debug ("pwm id = %d iomux error!\n" , pwm_id); -break ; - } -} - -static void pinctrl_rk322x_i2c_config (struct rk322x_grf *grf,int i2c_id) -{ -switch (i2c_id) { -case PERIPH_ID_I2C0 : -rk_clrsetreg (&grf->gpio0a_iomux, -GPIO0A1_MASK |GPIO0A0_MASK , -GPIO0A1_I2C0_SDA <<GPIO0A1_SHIFT | -GPIO0A0_I2C0_SCL <<GPIO0A0_SHIFT ); - -break ; -case PERIPH_ID_I2C1 : -rk_clrsetreg (&grf->gpio0a_iomux, -GPIO0A3_MASK |GPIO0A2_MASK , -GPIO0A3_I2C1_SDA <<GPIO0A3_SHIFT | -GPIO0A2_I2C1_SCL <<GPIO0A2_SHIFT ); -break ; -case PERIPH_ID_I2C2 : -rk_clrsetreg (&grf->gpio2c_iomux, -GPIO2C5_MASK |GPIO2C4_MASK , -GPIO2C5_I2C2_SCL <<GPIO2C5_SHIFT | -GPIO2C4_I2C2_SDA <<GPIO2C4_SHIFT ); -break ; -case PERIPH_ID_I2C3 : -rk_clrsetreg (&grf->gpio0a_iomux, -GPIO0A7_MASK |GPIO0A6_MASK , -GPIO0A7_I2C3_SDA <<GPIO0A7_SHIFT | -GPIO0A6_I2C3_SCL <<GPIO0A6_SHIFT ); - -break ; - } -} - -static void pinctrl_rk322x_spi_config (struct rk322x_grf *grf,int cs) -{ -switch (cs) { -case 0 : -rk_clrsetreg (&grf->gpio0b_iomux,GPIO0B6_MASK , -GPIO0B6_SPI_CSN0 <<GPIO0B6_SHIFT ); -break ; -case 1 : -rk_clrsetreg (&grf->gpio1b_iomux,GPIO1B4_MASK , -GPIO1B4_SPI_CSN1 <<GPIO1B4_SHIFT ); -break ; - } -rk_clrsetreg (&grf->gpio0b_iomux, -GPIO0B1_MASK |GPIO0B3_MASK |GPIO0B5_MASK , -GPIO0B5_SPI_RXD <<GPIO0B5_SHIFT | -GPIO0B3_SPI_TXD <<GPIO0B3_SHIFT | -GPIO0B1_SPI_CLK <<GPIO0B1_SHIFT ); -} - -static void pinctrl_rk322x_uart_config (struct rk322x_grf *grf,int uart_id) -{ -u32 mux_con =readl (&grf->con_iomux); - -switch (uart_id) { -case PERIPH_ID_UART1 : -if (!(mux_con &CON_IOMUX_UART1SEL_MASK )) -rk_clrsetreg (&grf->gpio1b_iomux, -GPIO1B1_MASK |GPIO1B2_MASK , -GPIO1B1_UART1_SOUT <<GPIO1B1_SHIFT | -GPIO1B2_UART1_SIN <<GPIO1B2_SHIFT ); -break ; -case PERIPH_ID_UART2 : -if (mux_con &CON_IOMUX_UART2SEL_MASK ) -rk_clrsetreg (&grf->gpio1b_iomux, -GPIO1B1_MASK |GPIO1B2_MASK , -GPIO1B1_UART21_SOUT <<GPIO1B1_SHIFT | -GPIO1B2_UART21_SIN <<GPIO1B2_SHIFT ); -else -rk_clrsetreg (&grf->gpio1c_iomux, -GPIO1C3_MASK |GPIO1C2_MASK , -GPIO1C3_UART2_SIN <<GPIO1C3_SHIFT | -GPIO1C2_UART2_SOUT <<GPIO1C2_SHIFT ); -break ; - } -} - -static void pinctrl_rk322x_sdmmc_config (struct rk322x_grf *grf,int mmc_id) -{ -switch (mmc_id) { -case PERIPH_ID_EMMC : -rk_clrsetreg (&grf->gpio1d_iomux,0xffff , -GPIO1D7_EMMC_D7 <<GPIO1D7_SHIFT | -GPIO1D6_EMMC_D6 <<GPIO1D6_SHIFT | -GPIO1D5_EMMC_D5 <<GPIO1D5_SHIFT | -GPIO1D4_EMMC_D4 <<GPIO1D4_SHIFT | -GPIO1D3_EMMC_D3 <<GPIO1D3_SHIFT | -GPIO1D2_EMMC_D2 <<GPIO1D2_SHIFT | -GPIO1D1_EMMC_D1 <<GPIO1D1_SHIFT | -GPIO1D0_EMMC_D0 <<GPIO1D0_SHIFT ); -rk_clrsetreg (&grf->gpio2a_iomux, -GPIO2A5_MASK |GPIO2A7_MASK , -GPIO2A5_EMMC_PWREN <<GPIO2A5_SHIFT | -GPIO2A7_EMMC_CLKOUT <<GPIO2A7_SHIFT ); -rk_clrsetreg (&grf->gpio1c_iomux, -GPIO1C6_MASK |GPIO1C7_MASK , -GPIO1C6_EMMC_CMD <<GPIO1C6_SHIFT | -GPIO1C7_EMMC_RSTNOUT <<GPIO1C6_SHIFT ); -break ; -case PERIPH_ID_SDCARD : -rk_clrsetreg (&grf->gpio1b_iomux, -GPIO1B6_MASK |GPIO1B7_MASK , -GPIO1B6_SDMMC_PWREN <<GPIO1B6_SHIFT | -GPIO1B7_SDMMC_CMD <<GPIO1B7_SHIFT ); -rk_clrsetreg (&grf->gpio1c_iomux,0xfff , -GPIO1C5_SDMMC_D3 <<GPIO1C5_SHIFT | -GPIO1C4_SDMMC_D2 <<GPIO1C4_SHIFT | -GPIO1C3_SDMMC_D1 <<GPIO1C3_SHIFT | -GPIO1C2_SDMMC_D0 <<GPIO1C2_SHIFT | -GPIO1C1_SDMMC_DETN <<GPIO1C1_SHIFT | -GPIO1C0_SDMMC_CLKOUT <<GPIO1C0_SHIFT ); -break ; - } -} - -#if CONFIG_IS_ENABLED (GMAC_ROCKCHIP ) -static void pinctrl_rk322x_gmac_config (struct rk322x_grf *grf,int gmac_id) -{ -switch (gmac_id) { -case PERIPH_ID_GMAC : -/* set rgmii pins mux */ -rk_clrsetreg (&grf->gpio2b_iomux, -GPIO2B0_MASK | -GPIO2B1_MASK | -GPIO2B3_MASK | -GPIO2B4_MASK | -GPIO2B5_MASK | -GPIO2B6_MASK , -GPIO2B0_GMAC_RXDV <<GPIO2B0_SHIFT | -GPIO2B1_GMAC_TXCLK <<GPIO2B1_SHIFT | -GPIO2B3_GMAC_RXCLK <<GPIO2B3_SHIFT | -GPIO2B4_GMAC_MDIO <<GPIO2B4_SHIFT | -GPIO2B5_GMAC_TXEN <<GPIO2B5_SHIFT | -GPIO2B6_GMAC_CLK <<GPIO2B6_SHIFT ); - -rk_clrsetreg (&grf->gpio2c_iomux, -GPIO2C0_MASK | -GPIO2C1_MASK | -GPIO2C2_MASK | -GPIO2C3_MASK | -GPIO2C4_MASK | -GPIO2C5_MASK | -GPIO2C6_MASK | -GPIO2C7_MASK , -GPIO2C0_GMAC_RXD1 <<GPIO2C0_SHIFT | -GPIO2C1_GMAC_RXD0 <<GPIO2C1_SHIFT | -GPIO2C2_GMAC_TXD1 <<GPIO2C2_SHIFT | -GPIO2C3_GMAC_TXD0 <<GPIO2C3_SHIFT | -GPIO2C4_GMAC_RXD3 <<GPIO2C4_SHIFT | -GPIO2C5_GMAC_RXD2 <<GPIO2C5_SHIFT | -GPIO2C6_GMAC_TXD2 <<GPIO2C6_SHIFT | -GPIO2C7_GMAC_TXD3 <<GPIO2C7_SHIFT ); - -rk_clrsetreg (&grf->gpio2d_iomux, -GPIO2D1_MASK , -GPIO2D1_GMAC_MDC <<GPIO2D1_SHIFT ); - -/* -* set rgmii tx pins to 12ma drive-strength, -* clean others with 2ma. -*/ -rk_clrsetreg (&grf->gpio2_e[1 ], -GRF_GPIO2B0_E_MASK | -GRF_GPIO2B1_E_MASK | -GRF_GPIO2B3_E_MASK | -GRF_GPIO2B4_E_MASK | -GRF_GPIO2B5_E_MASK | -GRF_GPIO2B6_E_MASK , -GPIO_BIAS_2MA <<GRF_GPIO2B0_E_SHIFT | -GPIO_BIAS_12MA <<GRF_GPIO2B1_E_SHIFT | -GPIO_BIAS_2MA <<GRF_GPIO2B3_E_SHIFT | -GPIO_BIAS_2MA <<GRF_GPIO2B4_E_SHIFT | -GPIO_BIAS_12MA <<GRF_GPIO2B5_E_SHIFT | -GPIO_BIAS_2MA <<GRF_GPIO2B6_E_SHIFT ); - -rk_clrsetreg (&grf->gpio2_e[2 ], -GRF_GPIO2C0_E_MASK | -GRF_GPIO2C1_E_MASK | -GRF_GPIO2C2_E_MASK | -GRF_GPIO2C3_E_MASK | -GRF_GPIO2C4_E_MASK | -GRF_GPIO2C5_E_MASK | -GRF_GPIO2C6_E_MASK | -GRF_GPIO2C7_E_MASK , -GPIO_BIAS_2MA <<GRF_GPIO2C0_E_SHIFT | -GPIO_BIAS_2MA <<GRF_GPIO2C1_E_SHIFT | -GPIO_BIAS_12MA <<GRF_GPIO2C2_E_SHIFT | -GPIO_BIAS_12MA <<GRF_GPIO2C3_E_SHIFT | -GPIO_BIAS_2MA <<GRF_GPIO2C4_E_SHIFT | -GPIO_BIAS_2MA <<GRF_GPIO2C5_E_SHIFT | -GPIO_BIAS_12MA <<GRF_GPIO2C6_E_SHIFT | -GPIO_BIAS_12MA <<GRF_GPIO2C7_E_SHIFT ); - -rk_clrsetreg (&grf->gpio2_e[3 ], -GRF_GPIO2D1_E_MASK , -GPIO_BIAS_2MA <<GRF_GPIO2D1_E_SHIFT ); -break ; -default : -debug ("gmac id = %d iomux error!\n" , gmac_id); -break ; - } -} -#endif - -static int rk322x_pinctrl_request (struct udevice *dev,int func,int flags) -{ -struct rk322x_pinctrl_priv *priv =dev_get_priv (dev); - -debug ("%s: func=%x, flags=%x\n" , __func__, func, flags); -switch (func) { -case PERIPH_ID_PWM0 : -case PERIPH_ID_PWM1 : -case PERIPH_ID_PWM2 : -case PERIPH_ID_PWM3 : -pinctrl_rk322x_pwm_config (priv->grf, func); -break ; -case PERIPH_ID_I2C0 : -case PERIPH_ID_I2C1 : -case PERIPH_ID_I2C2 : -pinctrl_rk322x_i2c_config (priv->grf, func); -break ; -case PERIPH_ID_SPI0 : -pinctrl_rk322x_spi_config (priv->grf, flags); -break ; -case PERIPH_ID_UART0 : -case PERIPH_ID_UART1 : -case PERIPH_ID_UART2 : -pinctrl_rk322x_uart_config (priv->grf, func); -break ; -case PERIPH_ID_SDMMC0 : -case PERIPH_ID_SDMMC1 : -pinctrl_rk322x_sdmmc_config (priv->grf, func); -break ; -#if CONFIG_IS_ENABLED (GMAC_ROCKCHIP ) -case PERIPH_ID_GMAC : -pinctrl_rk322x_gmac_config (priv->grf, func); -break ; -#endif -default : -return -EINVAL ; - } - -return 0 ; -} - -static int rk322x_pinctrl_get_periph_id (struct udevice *dev, -struct udevice *periph) -{ -u32 cell[3 ]; -int ret; - - ret =fdtdec_get_int_array (gd->fdt_blob,dev_of_offset (periph), -"interrupts" , cell,ARRAY_SIZE (cell)); -if (ret <0 ) -return -EINVAL ; - -switch (cell[1 ]) { -case 12 : -return PERIPH_ID_SDCARD ; -case 14 : -return PERIPH_ID_EMMC ; -case 36 : -return PERIPH_ID_I2C0 ; -case 37 : -return PERIPH_ID_I2C1 ; -case 38 : -return PERIPH_ID_I2C2 ; -case 49 : -return PERIPH_ID_SPI0 ; -case 50 : -return PERIPH_ID_PWM0 ; -case 55 : -return PERIPH_ID_UART0 ; -case 56 : -return PERIPH_ID_UART1 ; -case 57 : -return PERIPH_ID_UART2 ; -#if CONFIG_IS_ENABLED (GMAC_ROCKCHIP ) -case 24 : -return PERIPH_ID_GMAC ; -#endif - } -return -ENOENT ; -} - -static int rk322x_pinctrl_set_state_simple (struct udevice *dev, -struct udevice *periph) -{ -int func; - - func =rk322x_pinctrl_get_periph_id (dev, periph); -if (func <0 ) -return func; -return rk322x_pinctrl_request (dev, func,0 ); -} - -static struct pinctrl_ops rk322x_pinctrl_ops = { - .set_state_simple = rk322x_pinctrl_set_state_simple, - .request = rk322x_pinctrl_request, - .get_periph_id = rk322x_pinctrl_get_periph_id, -}; - -static int rk322x_pinctrl_probe (struct udevice *dev) -{ -struct rk322x_pinctrl_priv *priv =dev_get_priv (dev); - - priv->grf =syscon_get_first_range (ROCKCHIP_SYSCON_GRF ); -debug ("%s: grf=%p\n" , __func__, priv->grf); -return 0 ; -} - -static const struct udevice_id rk322x_pinctrl_ids[] = { - { .compatible ="rockchip,rk3228-pinctrl" }, - { } -}; - -U_BOOT_DRIVER (pinctrl_rk3228) = { - .name ="pinctrl_rk3228" , - .id =UCLASS_PINCTRL , - .of_match = rk322x_pinctrl_ids, - .priv_auto_alloc_size =sizeof (struct rk322x_pinctrl_priv ), - .ops = &rk322x_pinctrl_ops, - .bind = dm_scan_fdt_dev, - .probe = rk322x_pinctrl_probe, -};drivers/pinctrl/rockchip/pinctrl_rk3288.c deleted +0
-869@@ -1,869 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* -* Pinctrl driver for Rockchip SoCs -* Copyright (c) 2015 Google, Inc -* Written by Simon Glass <[email protected]> -*/ - -#include <common.h> -#include <dm.h> -#include <errno.h> -#include <syscon.h> -#include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/grf_rk3288.h> -#include <asm/arch/hardware.h> -#include <asm/arch/periph.h> -#include <asm/arch/pmu_rk3288.h> -#include <dm/pinctrl.h> - -DECLARE_GLOBAL_DATA_PTR ; - -struct rk3288_pinctrl_priv { -struct rk3288_grf *grf; -struct rk3288_pmu *pmu; -int num_banks; -}; - -/** -* Encode variants of iomux registers into a type variable -*/ -#define IOMUX_GPIO_ONLY BIT(0) -#define IOMUX_WIDTH_4BIT BIT(1) -#define IOMUX_SOURCE_PMU BIT(2) -#define IOMUX_UNROUTED BIT(3) - -/** -* @type: iomux variant using IOMUX_* constants -* @offset: if initialized to -1 it will be autocalculated, by specifying -* an initial offset value the relevant source offset can be reset -* to a new value for autocalculating the following iomux registers. -*/ -struct rockchip_iomux { -u8 type; -s16 offset; -}; - -/** -* @reg: register offset of the gpio bank -* @nr_pins: number of pins in this bank -* @bank_num: number of the bank, to account for holes -* @name: name of the bank -* @iomux: array describing the 4 iomux sources of the bank -*/ -struct rockchip_pin_bank { -u16 reg; -u8 nr_pins; -u8 bank_num; -char *name; -struct rockchip_iomux iomux[4 ]; -}; - -#define PIN_BANK (id, pins, label) \ - { \ - .bank_num = id, \ - .nr_pins = pins, \ - .name = label, \ - .iomux = { \ - { .offset = -1 }, \ - { .offset = -1 }, \ - { .offset = -1 }, \ - { .offset = -1 }, \ - }, \ - } - -#define PIN_BANK_IOMUX_FLAGS (id, pins, label, iom0, iom1, iom2, iom3) \ - { \ - .bank_num = id, \ - .nr_pins = pins, \ - .name = label, \ - .iomux = { \ - { .type = iom0, .offset = -1 }, \ - { .type = iom1, .offset = -1 }, \ - { .type = iom2, .offset = -1 }, \ - { .type = iom3, .offset = -1 }, \ - }, \ - } - -#ifndef CONFIG_SPL_BUILD -static struct rockchip_pin_bank rk3288_pin_banks[] = { -PIN_BANK_IOMUX_FLAGS (0 ,24 ,"gpio0" ,IOMUX_SOURCE_PMU , -IOMUX_SOURCE_PMU , -IOMUX_SOURCE_PMU , -IOMUX_UNROUTED - ), -PIN_BANK_IOMUX_FLAGS (1 ,32 ,"gpio1" ,IOMUX_UNROUTED , -IOMUX_UNROUTED , -IOMUX_UNROUTED , -0 - ), -PIN_BANK_IOMUX_FLAGS (2 ,32 ,"gpio2" ,0 ,0 ,0 ,IOMUX_UNROUTED ), -PIN_BANK_IOMUX_FLAGS (3 ,32 ,"gpio3" ,0 ,0 ,0 ,IOMUX_WIDTH_4BIT ), -PIN_BANK_IOMUX_FLAGS (4 ,32 ,"gpio4" ,IOMUX_WIDTH_4BIT , -IOMUX_WIDTH_4BIT , -0 , -0 - ), -PIN_BANK_IOMUX_FLAGS (5 ,32 ,"gpio5" ,IOMUX_UNROUTED , -0 , -0 , -IOMUX_UNROUTED - ), -PIN_BANK_IOMUX_FLAGS (6 ,32 ,"gpio6" ,0 ,0 ,0 ,IOMUX_UNROUTED ), -PIN_BANK_IOMUX_FLAGS (7 ,32 ,"gpio7" ,0 , -0 , -IOMUX_WIDTH_4BIT , -IOMUX_UNROUTED - ), -PIN_BANK (8 ,16 ,"gpio8" ), -}; -#endif - -static void pinctrl_rk3288_pwm_config (struct rk3288_grf *grf,int pwm_id) -{ -switch (pwm_id) { -case PERIPH_ID_PWM0 : -rk_clrsetreg (&grf->gpio7a_iomux,GPIO7A0_MASK <<GPIO7A0_SHIFT , -GPIO7A0_PWM_0 <<GPIO7A0_SHIFT ); -break ; -case PERIPH_ID_PWM1 : -rk_clrsetreg (&grf->gpio7a_iomux,GPIO7A1_MASK <<GPIO7A1_SHIFT , -GPIO7A1_PWM_1 <<GPIO7A1_SHIFT ); -break ; -case PERIPH_ID_PWM2 : -rk_clrsetreg (&grf->gpio7a_iomux,GPIO7C6_MASK <<GPIO7C6_SHIFT , -GPIO7C6_PWM_2 <<GPIO7C6_SHIFT ); -break ; -case PERIPH_ID_PWM3 : -rk_clrsetreg (&grf->gpio7a_iomux,GPIO7C7_MASK <<GPIO7C6_SHIFT , -GPIO7C7_PWM_3 <<GPIO7C7_SHIFT ); -break ; -default : -debug ("pwm id = %d iomux error!\n" , pwm_id); -break ; - } -} - -static void pinctrl_rk3288_i2c_config (struct rk3288_grf *grf, -struct rk3288_pmu *pmu,int i2c_id) -{ -switch (i2c_id) { -case PERIPH_ID_I2C0 : -clrsetbits_le32 (&pmu->gpio0_iomux[PMU_GPIO0_B ], -GPIO0_B7_MASK <<GPIO0_B7_SHIFT , -GPIO0_B7_I2C0PMU_SDA <<GPIO0_B7_SHIFT ); -clrsetbits_le32 (&pmu->gpio0_iomux[PMU_GPIO0_C ], -GPIO0_C0_MASK <<GPIO0_C0_SHIFT , -GPIO0_C0_I2C0PMU_SCL <<GPIO0_C0_SHIFT ); -break ; -#ifndef CONFIG_SPL_BUILD -case PERIPH_ID_I2C1 : -rk_clrsetreg (&grf->gpio8a_iomux, -GPIO8A4_MASK <<GPIO8A4_SHIFT | -GPIO8A5_MASK <<GPIO8A5_SHIFT , -GPIO8A4_I2C2SENSOR_SDA <<GPIO8A4_SHIFT | -GPIO8A5_I2C2SENSOR_SCL <<GPIO8A5_SHIFT ); -break ; -case PERIPH_ID_I2C2 : -rk_clrsetreg (&grf->gpio6b_iomux, -GPIO6B1_MASK <<GPIO6B1_SHIFT | -GPIO6B2_MASK <<GPIO6B2_SHIFT , -GPIO6B1_I2C1AUDIO_SDA <<GPIO6B1_SHIFT | -GPIO6B2_I2C1AUDIO_SCL <<GPIO6B2_SHIFT ); -break ; -case PERIPH_ID_I2C3 : -rk_clrsetreg (&grf->gpio2c_iomux, -GPIO2C1_MASK <<GPIO2C1_SHIFT | -GPIO2C0_MASK <<GPIO2C0_SHIFT , -GPIO2C1_I2C3CAM_SDA <<GPIO2C1_SHIFT | -GPIO2C0_I2C3CAM_SCL <<GPIO2C0_SHIFT ); -break ; -case PERIPH_ID_I2C4 : -rk_clrsetreg (&grf->gpio7cl_iomux, -GPIO7C1_MASK <<GPIO7C1_SHIFT | -GPIO7C2_MASK <<GPIO7C2_SHIFT , -GPIO7C1_I2C4TP_SDA <<GPIO7C1_SHIFT | -GPIO7C2_I2C4TP_SCL <<GPIO7C2_SHIFT ); -break ; -case PERIPH_ID_I2C5 : -rk_clrsetreg (&grf->gpio7cl_iomux, -GPIO7C3_MASK <<GPIO7C3_SHIFT , -GPIO7C3_I2C5HDMI_SDA <<GPIO7C3_SHIFT ); -rk_clrsetreg (&grf->gpio7ch_iomux, -GPIO7C4_MASK <<GPIO7C4_SHIFT , -GPIO7C4_I2C5HDMI_SCL <<GPIO7C4_SHIFT ); -break ; -#endif -default : -debug ("i2c id = %d iomux error!\n" , i2c_id); -break ; - } -} - -#ifndef CONFIG_SPL_BUILD -static void pinctrl_rk3288_lcdc_config (struct rk3288_grf *grf,int lcd_id) -{ -switch (lcd_id) { -case PERIPH_ID_LCDC0 : -rk_clrsetreg (&grf->gpio1d_iomux, -GPIO1D3_MASK <<GPIO1D0_SHIFT | -GPIO1D2_MASK <<GPIO1D2_SHIFT | -GPIO1D1_MASK <<GPIO1D1_SHIFT | -GPIO1D0_MASK <<GPIO1D0_SHIFT , -GPIO1D3_LCDC0_DCLK <<GPIO1D3_SHIFT | -GPIO1D2_LCDC0_DEN <<GPIO1D2_SHIFT | -GPIO1D1_LCDC0_VSYNC <<GPIO1D1_SHIFT | -GPIO1D0_LCDC0_HSYNC <<GPIO1D0_SHIFT ); -break ; -default : -debug ("lcdc id = %d iomux error!\n" , lcd_id); -break ; - } -} -#endif - -static int pinctrl_rk3288_spi_config (struct rk3288_grf *grf, -enum periph_id spi_id,int cs) -{ -switch (spi_id) { -#ifndef CONFIG_SPL_BUILD -case PERIPH_ID_SPI0 : -switch (cs) { -case 0 : -rk_clrsetreg (&grf->gpio5b_iomux, -GPIO5B5_MASK <<GPIO5B5_SHIFT , -GPIO5B5_SPI0_CSN0 <<GPIO5B5_SHIFT ); -break ; -case 1 : -rk_clrsetreg (&grf->gpio5c_iomux, -GPIO5C0_MASK <<GPIO5C0_SHIFT , -GPIO5C0_SPI0_CSN1 <<GPIO5C0_SHIFT ); -break ; -default : - goto err; - } -rk_clrsetreg (&grf->gpio5b_iomux, -GPIO5B7_MASK <<GPIO5B7_SHIFT | -GPIO5B6_MASK <<GPIO5B6_SHIFT | -GPIO5B4_MASK <<GPIO5B4_SHIFT , -GPIO5B7_SPI0_RXD <<GPIO5B7_SHIFT | -GPIO5B6_SPI0_TXD <<GPIO5B6_SHIFT | -GPIO5B4_SPI0_CLK <<GPIO5B4_SHIFT ); -break ; -case PERIPH_ID_SPI1 : -if (cs !=0 ) - goto err; - rk_clrsetreg(&grf->gpio7b_iomux, - GPIO7B6_MASK << GPIO7B6_SHIFT | - GPIO7B7_MASK << GPIO7B7_SHIFT | - GPIO7B5_MASK << GPIO7B5_SHIFT | - GPIO7B4_MASK << GPIO7B4_SHIFT,Lines of this file are not shown. View the raw message.
drivers/pinctrl/rockchip/pinctrl_rk3328.c deleted +0
-705Lines of this file are not shown. View the raw message.
drivers/pinctrl/rockchip/pinctrl_rk3368.c deleted +0
-739Lines of this file are not shown. View the raw message.
drivers/pinctrl/rockchip/pinctrl_rk3399.c deleted +0
-503Lines of this file are not shown. View the raw message.
drivers/pinctrl/rockchip/pinctrl_rv1108.c deleted +0
-580Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
PATCH v2 8/9 pinctrl: rockchip: Clean the unused rockchip pinctrl drivers
In reply to David WuQuoted 22 lines
If we used the pinctrl-rockchip driver, these code is not needed, so remove them.
Signed-off-by David Wu <[email protected]>Reviewed-by Simon Glass <[email protected]>Tested-by Simon Glass <[email protected]>Reviewed-by Kever Yang <[email protected]>---
Changes in v2: None
drivers/pinctrl/rockchip/pinctrl_rk3036.c | 671 --------------- drivers/pinctrl/rockchip/pinctrl_rk3128.c | 186 ---- drivers/pinctrl/rockchip/pinctrl_rk3188.c | 989 ---------------------- drivers/pinctrl/rockchip/pinctrl_rk322x.c | 894 ------------------- drivers/pinctrl/rockchip/pinctrl_rk3288.c | 869 ------------------- drivers/pinctrl/rockchip/pinctrl_rk3328.c | 705 --------------- drivers/pinctrl/rockchip/pinctrl_rk3368.c | 739 ---------------- drivers/pinctrl/rockchip/pinctrl_rk3399.c | 503 ----------- drivers/pinctrl/rockchip/pinctrl_rv1108.c | 580 ------------- 9 files changed, 6136 deletions(-) delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3036.c
Quoted 9 lines
delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3128.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3188.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk322x.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3288.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3328.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3368.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3399.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rv1108.c
PATCH v2 8/9 pinctrl: rockchip: Clean the unused rockchip pinctrl drivers
In reply to David WuQuoted 22 lines
If we used the pinctrl-rockchip driver, these code is not needed, so remove them.
Signed-off-by David Wu <[email protected]>Reviewed-by Simon Glass <[email protected]>Tested-by Simon Glass <[email protected]>Reviewed-by Kever Yang <[email protected]>---
Changes in v2: None
drivers/pinctrl/rockchip/pinctrl_rk3036.c | 671 --------------- drivers/pinctrl/rockchip/pinctrl_rk3128.c | 186 ---- drivers/pinctrl/rockchip/pinctrl_rk3188.c | 989 ---------------------- drivers/pinctrl/rockchip/pinctrl_rk322x.c | 894 ------------------- drivers/pinctrl/rockchip/pinctrl_rk3288.c | 869 ------------------- drivers/pinctrl/rockchip/pinctrl_rk3328.c | 705 --------------- drivers/pinctrl/rockchip/pinctrl_rk3368.c | 739 ---------------- drivers/pinctrl/rockchip/pinctrl_rk3399.c | 503 ----------- drivers/pinctrl/rockchip/pinctrl_rv1108.c | 580 ------------- 9 files changed, 6136 deletions(-) delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3036.c
Quoted 9 lines
delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3128.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3188.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk322x.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3288.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3328.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3368.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3399.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rv1108.c
Applied to u-boot-rockchip, thanks!
PATCH v2 9/9 ARM: dts: rk322x: Correct the uart2 default pin configuration
In reply to David WuTo match the iomux setting of uart2 at SPL, correct the uart2 default pin configuration, if not changed, the evb-rk3229 can't output the log message.
---
Changes in v2: None
arch/arm/dts/rk322x.dtsi | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
arch/arm/dts/rk322x.dtsi +9 -2
@@ -206,7 +206,7 @@ clocks = <&cru SCLK_UART2>, <&cru PCLK_UART2>; clock-names = "baudclk", "apb_pclk"; pinctrl-names = "default"; - pinctrl-0 = <&uart2_xfer>; + pinctrl-0 = <&uart21_xfer>; reg-shift = <2>; reg-io-width = <4>; status = "disabled";
@@ -748,7 +748,7 @@ uart2 { uart2_xfer: uart2-xfer { - rockchip,pins = <1 RK_PC2 RK_FUNC_2 &pcfg_pull_none>, + rockchip,pins = <1 RK_PC2 RK_FUNC_2 &pcfg_pull_up>, <1 RK_PC3 RK_FUNC_2 &pcfg_pull_none>; };
@@ -760,6 +760,13 @@ rockchip,pins = <0 RK_PD0 RK_FUNC_1 &pcfg_pull_none>; }; }; + + uart2-1 { + uart21_xfer: uart21-xfer { + rockchip,pins = <1 10 RK_FUNC_2 &pcfg_pull_up>, + <1 9 RK_FUNC_2 &pcfg_pull_none>; + }; + }; }; dmc: dmc at 11200000 {
Signature · 1 line
2.19.1
PATCH v2 9/9 ARM: dts: rk322x: Correct the uart2 default pin configuration
Quoted 5 lines · David Wu
To match the iomux setting of uart2 at SPL, correct the uart2 default pin configuration, if not changed, the evb-rk3229 can't output the log message.
Signed-off-by David Wu <[email protected]>
Thanks,
- Kever
Quoted 43 lines
---
Changes in v2: None
arch/arm/dts/rk322x.dtsi | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)arch/arm/dts/rk322x.dtsi +9
-2@@ -206,7 +206,7 @@ clocks = <&cru SCLK_UART2>, <&cru PCLK_UART2>; clock-names = "baudclk", "apb_pclk"; pinctrl-names = "default"; - pinctrl-0 = <&uart2_xfer>; + pinctrl-0 = <&uart21_xfer>; reg-shift = <2>; reg-io-width = <4>; status = "disabled";@@ -748,7 +748,7 @@ uart2 { uart2_xfer: uart2-xfer { - rockchip,pins = <1 RK_PC2 RK_FUNC_2 &pcfg_pull_none>, + rockchip,pins = <1 RK_PC2 RK_FUNC_2 &pcfg_pull_up>, <1 RK_PC3 RK_FUNC_2 &pcfg_pull_none>; };@@ -760,6 +760,13 @@ rockchip,pins = <0 RK_PD0 RK_FUNC_1 &pcfg_pull_none>; }; }; + + uart2-1 { + uart21_xfer: uart21-xfer { + rockchip,pins = <1 10 RK_FUNC_2 &pcfg_pull_up>, + <1 9 RK_FUNC_2 &pcfg_pull_none>; + }; + }; }; dmc: dmc at 11200000 {
PATCH v2 9/9 ARM: dts: rk322x: Correct the uart2 default pin configuration
In reply to David WuQuoted 4 lines
To match the iomux setting of uart2 at SPL, correct the uart2 default pin configuration, if not changed, the evb-rk3229 can't output the log message.
Quoted 9 lines
Signed-off-by David Wu <[email protected]>Reviewed-by Kever Yang <[email protected]>---
Changes in v2: None
arch/arm/dts/rk322x.dtsi | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
PATCH v2 9/9 ARM: dts: rk322x: Correct the uart2 default pin configuration
In reply to David WuQuoted 4 lines
To match the iomux setting of uart2 at SPL, correct the uart2 default pin configuration, if not changed, the evb-rk3229 can't output the log message.
Quoted 9 lines
Signed-off-by David Wu <[email protected]>Reviewed-by Kever Yang <[email protected]>---
Changes in v2: None
arch/arm/dts/rk322x.dtsi | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
Applied to u-boot-rockchip, thanks!
v2 cover Add common pinctrl driver support for rockchip
In reply to David WuHi,
Quoted 97 lines · David Wu
The common pinctrl driver for rockchip Socs, it depends the
PINCTRL_FULLconfig. If use it, the default pinctrl setup from DTS could be configured at device probe.Changes in v2:
- Remove px30, rk2928, rk3066*.
- Split it to multiple files for the relevant per-SoC data structures.David Wu (9):
rockchip: rk3399-evb: defconfig: Enable FDT for new pinctrl driver
ARM: rockchip: rk3188: Remove the pinctrl setup and enable uart at SPL
ARM: rockchip:Kconfig: Remove theSPL_PINCTRLfor rk3188
ARM: rockchip: Remove the pinctrl request at rk3288-board-spl
rk3288: chrome: defconfig: Enable FDT for new pinctrl driver
pinctrl: rockchip: Add common rockchip pinctrl driver
rockchip: defconfig: Clean the unused pinctrl config
pinctrl: rockchip: Clean the unused rockchip pinctrl drivers
ARM: dts: rk322x: Correct the uart2 default pin configurationarch/arm/dts/rk322x.dtsi | 11 +- arch/arm/mach-rockchip/Kconfig | 1 - arch/arm/mach-rockchip/rk3188-board-spl.c | 41 +- arch/arm/mach-rockchip/rk3288-board-spl.c | 79 -- configs/chromebit_mickey_defconfig | 4 - configs/chromebook_jerry_defconfig | 4 - configs/chromebook_minnie_defconfig | 4 - configs/evb-px5_defconfig | 1 - configs/evb-rk3128_defconfig | 1 - configs/evb-rk3229_defconfig | 1 - configs/evb-rk3288_defconfig | 2 - configs/evb-rk3399_defconfig | 2 - configs/evb-rv1108_defconfig | 1 - configs/fennec-rk3288_defconfig | 2 - configs/firefly-rk3288_defconfig | 2 - configs/firefly-rk3399_defconfig | 1 - configs/geekbox_defconfig | 1 - configs/kylin-rk3036_defconfig | 1 - configs/lion-rk3368_defconfig | 1 - configs/miqi-rk3288_defconfig | 2 - configs/phycore-rk3288_defconfig | 2 - configs/popmetal-rk3288_defconfig | 2 - configs/puma-rk3399_defconfig | 1 - configs/rock2_defconfig | 2 - configs/rock_defconfig | 1 - configs/sandbox_defconfig | 2 - configs/sandbox_flattree_defconfig | 2 - configs/sandbox_noblk_defconfig | 2 - configs/sheep-rk3368_defconfig | 1 - configs/tinker-rk3288_defconfig | 2 - configs/vyasa-rk3288_defconfig | 2 - drivers/pinctrl/Kconfig | 91 +- drivers/pinctrl/Makefile | 2 +- drivers/pinctrl/rockchip/Kconfig | 17 + drivers/pinctrl/rockchip/Makefile | 19 +- drivers/pinctrl/rockchip/pinctrl-rk3036.c | 65 ++ drivers/pinctrl/rockchip/pinctrl-rk3128.c | 155 +++ drivers/pinctrl/rockchip/pinctrl-rk3188.c | 82 ++ drivers/pinctrl/rockchip/pinctrl-rk322x.c | 215 ++++ drivers/pinctrl/rockchip/pinctrl-rk3288.c | 157 +++ drivers/pinctrl/rockchip/pinctrl-rk3328.c | 227 ++++ drivers/pinctrl/rockchip/pinctrl-rk3368.c | 116 ++ drivers/pinctrl/rockchip/pinctrl-rk3399.c | 193 ++++ .../pinctrl/rockchip/pinctrl-rockchip-core.c | 788 ++++++++++++++ drivers/pinctrl/rockchip/pinctrl-rockchip.h | 302 ++++++ drivers/pinctrl/rockchip/pinctrl-rv1108.c | 203 ++++ drivers/pinctrl/rockchip/pinctrl_rk3036.c | 671 ------------ drivers/pinctrl/rockchip/pinctrl_rk3128.c | 186 ---- drivers/pinctrl/rockchip/pinctrl_rk3188.c | 989 ------------------ drivers/pinctrl/rockchip/pinctrl_rk322x.c | 894 ---------------- drivers/pinctrl/rockchip/pinctrl_rk3288.c | 869 --------------- drivers/pinctrl/rockchip/pinctrl_rk3328.c | 705 ------------- drivers/pinctrl/rockchip/pinctrl_rk3368.c | 739 ------------- drivers/pinctrl/rockchip/pinctrl_rk3399.c | 503 --------- drivers/pinctrl/rockchip/pinctrl_rv1108.c | 580 ---------- 55 files changed, 2543 insertions(+), 6406 deletions(-) create mode 100644 drivers/pinctrl/rockchip/Kconfig create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3036.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3128.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3188.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk322x.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3288.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3328.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3368.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3399.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rockchip-core.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rockchip.h create mode 100644 drivers/pinctrl/rockchip/pinctrl-rv1108.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3036.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3128.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3188.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk322x.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3288.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3328.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3368.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3399.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rv1108.c
Quoted 5 lines
--
2.19.1
What's the status of this series? I based my sound series on top of it and I'm just sending out v2.
Regards,
Simon
v2 cover Add common pinctrl driver support for rockchip
Ping Philipp...
Quoted 114 lines · Simon Glass
Hi,
Quoted 97 lines · David Wu
The common pinctrl driver for rockchip Socs, it depends the
PINCTRL_FULLconfig. If use it, the default pinctrl setup from DTS could be configured at device probe.Changes in v2:
- Remove px30, rk2928, rk3066*.
- Split it to multiple files for the relevant per-SoC data structures.David Wu (9):
rockchip: rk3399-evb: defconfig: Enable FDT for new pinctrl driver
ARM: rockchip: rk3188: Remove the pinctrl setup and enable uart at SPL
ARM: rockchip:Kconfig: Remove theSPL_PINCTRLfor rk3188
ARM: rockchip: Remove the pinctrl request at rk3288-board-spl
rk3288: chrome: defconfig: Enable FDT for new pinctrl driver
pinctrl: rockchip: Add common rockchip pinctrl driver
rockchip: defconfig: Clean the unused pinctrl config
pinctrl: rockchip: Clean the unused rockchip pinctrl drivers
ARM: dts: rk322x: Correct the uart2 default pin configurationarch/arm/dts/rk322x.dtsi | 11 +- arch/arm/mach-rockchip/Kconfig | 1 - arch/arm/mach-rockchip/rk3188-board-spl.c | 41 +- arch/arm/mach-rockchip/rk3288-board-spl.c | 79 -- configs/chromebit_mickey_defconfig | 4 - configs/chromebook_jerry_defconfig | 4 - configs/chromebook_minnie_defconfig | 4 - configs/evb-px5_defconfig | 1 - configs/evb-rk3128_defconfig | 1 - configs/evb-rk3229_defconfig | 1 - configs/evb-rk3288_defconfig | 2 - configs/evb-rk3399_defconfig | 2 - configs/evb-rv1108_defconfig | 1 - configs/fennec-rk3288_defconfig | 2 - configs/firefly-rk3288_defconfig | 2 - configs/firefly-rk3399_defconfig | 1 - configs/geekbox_defconfig | 1 - configs/kylin-rk3036_defconfig | 1 - configs/lion-rk3368_defconfig | 1 - configs/miqi-rk3288_defconfig | 2 - configs/phycore-rk3288_defconfig | 2 - configs/popmetal-rk3288_defconfig | 2 - configs/puma-rk3399_defconfig | 1 - configs/rock2_defconfig | 2 - configs/rock_defconfig | 1 - configs/sandbox_defconfig | 2 - configs/sandbox_flattree_defconfig | 2 - configs/sandbox_noblk_defconfig | 2 - configs/sheep-rk3368_defconfig | 1 - configs/tinker-rk3288_defconfig | 2 - configs/vyasa-rk3288_defconfig | 2 - drivers/pinctrl/Kconfig | 91 +- drivers/pinctrl/Makefile | 2 +- drivers/pinctrl/rockchip/Kconfig | 17 + drivers/pinctrl/rockchip/Makefile | 19 +- drivers/pinctrl/rockchip/pinctrl-rk3036.c | 65 ++ drivers/pinctrl/rockchip/pinctrl-rk3128.c | 155 +++ drivers/pinctrl/rockchip/pinctrl-rk3188.c | 82 ++ drivers/pinctrl/rockchip/pinctrl-rk322x.c | 215 ++++ drivers/pinctrl/rockchip/pinctrl-rk3288.c | 157 +++ drivers/pinctrl/rockchip/pinctrl-rk3328.c | 227 ++++ drivers/pinctrl/rockchip/pinctrl-rk3368.c | 116 ++ drivers/pinctrl/rockchip/pinctrl-rk3399.c | 193 ++++ .../pinctrl/rockchip/pinctrl-rockchip-core.c | 788 ++++++++++++++ drivers/pinctrl/rockchip/pinctrl-rockchip.h | 302 ++++++ drivers/pinctrl/rockchip/pinctrl-rv1108.c | 203 ++++ drivers/pinctrl/rockchip/pinctrl_rk3036.c | 671 ------------ drivers/pinctrl/rockchip/pinctrl_rk3128.c | 186 ---- drivers/pinctrl/rockchip/pinctrl_rk3188.c | 989 ------------------ drivers/pinctrl/rockchip/pinctrl_rk322x.c | 894 ---------------- drivers/pinctrl/rockchip/pinctrl_rk3288.c | 869 --------------- drivers/pinctrl/rockchip/pinctrl_rk3328.c | 705 ------------- drivers/pinctrl/rockchip/pinctrl_rk3368.c | 739 ------------- drivers/pinctrl/rockchip/pinctrl_rk3399.c | 503 --------- drivers/pinctrl/rockchip/pinctrl_rv1108.c | 580 ---------- 55 files changed, 2543 insertions(+), 6406 deletions(-)create mode 100644
drivers/pinctrl/rockchip/Kconfigcreate mode 100644drivers/pinctrl/rockchip/pinctrl-rk3036.ccreate mode 100644drivers/pinctrl/rockchip/pinctrl-rk3128.ccreate mode 100644drivers/pinctrl/rockchip/pinctrl-rk3188.ccreate mode 100644drivers/pinctrl/rockchip/pinctrl-rk322x.ccreate mode 100644drivers/pinctrl/rockchip/pinctrl-rk3288.ccreate mode 100644drivers/pinctrl/rockchip/pinctrl-rk3328.ccreate mode 100644drivers/pinctrl/rockchip/pinctrl-rk3368.ccreate mode 100644drivers/pinctrl/rockchip/pinctrl-rk3399.ccreate mode 100644drivers/pinctrl/rockchip/pinctrl-rockchip-core.ccreate mode 100644drivers/pinctrl/rockchip/pinctrl-rockchip.hcreate mode 100644drivers/pinctrl/rockchip/pinctrl-rv1108.cdelete mode 100644drivers/pinctrl/rockchip/pinctrl_rk3036.cdelete mode 100644drivers/pinctrl/rockchip/pinctrl_rk3128.cdelete mode 100644drivers/pinctrl/rockchip/pinctrl_rk3188.cdelete mode 100644drivers/pinctrl/rockchip/pinctrl_rk322x.cdelete mode 100644drivers/pinctrl/rockchip/pinctrl_rk3288.cdelete mode 100644drivers/pinctrl/rockchip/pinctrl_rk3328.cdelete mode 100644drivers/pinctrl/rockchip/pinctrl_rk3368.cdelete mode 100644drivers/pinctrl/rockchip/pinctrl_rk3399.cdelete mode 100644drivers/pinctrl/rockchip/pinctrl_rv1108.cQuoted 5 lines
--
2.19.1What's the status of this series? I based my sound series on top of it and I'm just sending out v2.
Regards,
Simon