| Message ID | 1468621041-11487-2-git-send-email-heiko@sntech.de |
|---|---|
| State | Accepted |
| Commit | 9f862ec717dd1087c8ccc282d231a3b3bcd608e2 |
| Delegated to: | Simon Glass |
| Headers | show |
On 15 July 2016 at 16:17, Heiko Stuebner <heiko@sntech.de> wrote: > The rk3288 pinctrl is very specific to this soc, so should > not hog the generic rockchip naming. > > Signed-off-by: Heiko Stuebner <heiko@sntech.de> > --- > configs/chromebook_jerry_defconfig | 2 +- > configs/firefly-rk3288_defconfig | 2 +- > configs/rock2_defconfig | 2 +- > configs/sandbox_defconfig | 2 +- > configs/sandbox_noblk_defconfig | 2 +- > drivers/pinctrl/Kconfig | 6 +++--- > drivers/pinctrl/rockchip/Makefile | 2 +- > 7 files changed, 9 insertions(+), 9 deletions(-) Acked-by: Simon Glass <sjg@chromium.org>
On 17 July 2016 at 08:13, Simon Glass <sjg@chromium.org> wrote: > On 15 July 2016 at 16:17, Heiko Stuebner <heiko@sntech.de> wrote: >> The rk3288 pinctrl is very specific to this soc, so should >> not hog the generic rockchip naming. >> >> Signed-off-by: Heiko Stuebner <heiko@sntech.de> >> --- >> configs/chromebook_jerry_defconfig | 2 +- >> configs/firefly-rk3288_defconfig | 2 +- >> configs/rock2_defconfig | 2 +- >> configs/sandbox_defconfig | 2 +- >> configs/sandbox_noblk_defconfig | 2 +- >> drivers/pinctrl/Kconfig | 6 +++--- >> drivers/pinctrl/rockchip/Makefile | 2 +- >> 7 files changed, 9 insertions(+), 9 deletions(-) > > Acked-by: Simon Glass <sjg@chromium.org> Applied to u-boot-rockchip, thanks!
diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig index d5bc515..fd5314a 100644 --- a/configs/chromebook_jerry_defconfig +++ b/configs/chromebook_jerry_defconfig @@ -53,7 +53,7 @@ CONFIG_ROCKCHIP_DWMMC=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y # CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_ROCKCHIP_PINCTRL=y +CONFIG_ROCKCHIP_RK3288_PINCTRL=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set CONFIG_PMIC_RK808=y diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig index bdafc71..4122000 100644 --- a/configs/firefly-rk3288_defconfig +++ b/configs/firefly-rk3288_defconfig @@ -46,7 +46,7 @@ CONFIG_ROCKCHIP_DWMMC=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y # CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_ROCKCHIP_PINCTRL=y +CONFIG_ROCKCHIP_RK3288_PINCTRL=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set CONFIG_PMIC_ACT8846=y diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig index 3e16b80..3b6d7d9 100644 --- a/configs/rock2_defconfig +++ b/configs/rock2_defconfig @@ -44,7 +44,7 @@ CONFIG_ROCKCHIP_DWMMC=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y # CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_ROCKCHIP_PINCTRL=y +CONFIG_ROCKCHIP_RK3288_PINCTRL=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set CONFIG_PMIC_ACT8846=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 6a1874a..a5bb759 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -119,7 +119,7 @@ CONFIG_DM_PCI_COMPAT=y CONFIG_PCI_SANDBOX=y CONFIG_PINCTRL=y CONFIG_PINCONF=y -CONFIG_ROCKCHIP_PINCTRL=y +CONFIG_ROCKCHIP_RK3288_PINCTRL=y CONFIG_ROCKCHIP_3036_PINCTRL=y CONFIG_PINCTRL_SANDBOX=y CONFIG_DM_PMIC=y diff --git a/configs/sandbox_noblk_defconfig b/configs/sandbox_noblk_defconfig index 60c7339..2928da4 100644 --- a/configs/sandbox_noblk_defconfig +++ b/configs/sandbox_noblk_defconfig @@ -112,7 +112,7 @@ CONFIG_DM_PCI_COMPAT=y CONFIG_PCI_SANDBOX=y CONFIG_PINCTRL=y CONFIG_PINCONF=y -CONFIG_ROCKCHIP_PINCTRL=y +CONFIG_ROCKCHIP_RK3288_PINCTRL=y CONFIG_ROCKCHIP_3036_PINCTRL=y CONFIG_PINCTRL_SANDBOX=y CONFIG_DM_PMIC=y diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index 1785e3b..85dddd3 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig @@ -123,12 +123,12 @@ config QCA953X_PINCTRL both the GPIO definitions and pin control functions for each available multiplex function. -config ROCKCHIP_PINCTRL +config ROCKCHIP_RK3288_PINCTRL bool "Rockchip pin control driver" depends on DM help - Support pin multiplexing control on Rockchip SoCs. The driver is - controlled by a device tree node which contains both the GPIO + 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. diff --git a/drivers/pinctrl/rockchip/Makefile b/drivers/pinctrl/rockchip/Makefile index 6fa7d00..6a84961 100644 --- a/drivers/pinctrl/rockchip/Makefile +++ b/drivers/pinctrl/rockchip/Makefile @@ -5,5 +5,5 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-$(CONFIG_ROCKCHIP_PINCTRL) += pinctrl_rk3288.o +obj-$(CONFIG_ROCKCHIP_RK3288_PINCTRL) += pinctrl_rk3288.o obj-$(CONFIG_ROCKCHIP_3036_PINCTRL) += pinctrl_rk3036.o
The rk3288 pinctrl is very specific to this soc, so should not hog the generic rockchip naming. Signed-off-by: Heiko Stuebner <heiko@sntech.de> --- configs/chromebook_jerry_defconfig | 2 +- configs/firefly-rk3288_defconfig | 2 +- configs/rock2_defconfig | 2 +- configs/sandbox_defconfig | 2 +- configs/sandbox_noblk_defconfig | 2 +- drivers/pinctrl/Kconfig | 6 +++--- drivers/pinctrl/rockchip/Makefile | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-)