V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

cosmetic: rockchip: rk3288: pinctrl: fix config symbol naming 

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>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Heiko Stübner 2016-07-16 00:17:13 +02:00 committed by Simon Glass
parent 266c8fad51
commit 9f862ec717
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs/chromebook_jerry_defconfig
View File

@ -53,7 +53,7 @@ CONFIG_ROCKCHIP_DWMMC=y
CONFIG_PINCTRL=y CONFIG_PINCTRL=y
CONFIG_SPL_PINCTRL=y CONFIG_SPL_PINCTRL=y
# CONFIG_SPL_PINCTRL_FULL is not set # CONFIG_SPL_PINCTRL_FULL is not set
CONFIG_ROCKCHIP_PINCTRL=y CONFIG_ROCKCHIP_RK3288_PINCTRL=y
CONFIG_DM_PMIC=y CONFIG_DM_PMIC=y
# CONFIG_SPL_PMIC_CHILDREN is not set # CONFIG_SPL_PMIC_CHILDREN is not set
CONFIG_PMIC_RK808=y CONFIG_PMIC_RK808=y

2
configs/firefly-rk3288_defconfig
View File

@ -46,7 +46,7 @@ CONFIG_ROCKCHIP_DWMMC=y
CONFIG_PINCTRL=y CONFIG_PINCTRL=y
CONFIG_SPL_PINCTRL=y CONFIG_SPL_PINCTRL=y
# CONFIG_SPL_PINCTRL_FULL is not set # CONFIG_SPL_PINCTRL_FULL is not set
CONFIG_ROCKCHIP_PINCTRL=y CONFIG_ROCKCHIP_RK3288_PINCTRL=y
CONFIG_DM_PMIC=y CONFIG_DM_PMIC=y
# CONFIG_SPL_PMIC_CHILDREN is not set # CONFIG_SPL_PMIC_CHILDREN is not set
CONFIG_PMIC_ACT8846=y CONFIG_PMIC_ACT8846=y

2
configs/rock2_defconfig
View File

@ -44,7 +44,7 @@ CONFIG_ROCKCHIP_DWMMC=y
CONFIG_PINCTRL=y CONFIG_PINCTRL=y
CONFIG_SPL_PINCTRL=y CONFIG_SPL_PINCTRL=y
# CONFIG_SPL_PINCTRL_FULL is not set # CONFIG_SPL_PINCTRL_FULL is not set
CONFIG_ROCKCHIP_PINCTRL=y CONFIG_ROCKCHIP_RK3288_PINCTRL=y
CONFIG_DM_PMIC=y CONFIG_DM_PMIC=y
# CONFIG_SPL_PMIC_CHILDREN is not set # CONFIG_SPL_PMIC_CHILDREN is not set
CONFIG_PMIC_ACT8846=y CONFIG_PMIC_ACT8846=y

2
configs/sandbox_defconfig
View File

@ -120,7 +120,7 @@ CONFIG_DM_PCI_COMPAT=y
CONFIG_PCI_SANDBOX=y CONFIG_PCI_SANDBOX=y
CONFIG_PINCTRL=y CONFIG_PINCTRL=y
CONFIG_PINCONF=y CONFIG_PINCONF=y
CONFIG_ROCKCHIP_PINCTRL=y CONFIG_ROCKCHIP_RK3288_PINCTRL=y
CONFIG_ROCKCHIP_3036_PINCTRL=y CONFIG_ROCKCHIP_3036_PINCTRL=y
CONFIG_PINCTRL_SANDBOX=y CONFIG_PINCTRL_SANDBOX=y
CONFIG_DM_PMIC=y CONFIG_DM_PMIC=y

2
configs/sandbox_noblk_defconfig
View File

@ -112,7 +112,7 @@ CONFIG_DM_PCI_COMPAT=y
CONFIG_PCI_SANDBOX=y CONFIG_PCI_SANDBOX=y
CONFIG_PINCTRL=y CONFIG_PINCTRL=y
CONFIG_PINCONF=y CONFIG_PINCONF=y
CONFIG_ROCKCHIP_PINCTRL=y CONFIG_ROCKCHIP_RK3288_PINCTRL=y
CONFIG_ROCKCHIP_3036_PINCTRL=y CONFIG_ROCKCHIP_3036_PINCTRL=y
CONFIG_PINCTRL_SANDBOX=y CONFIG_PINCTRL_SANDBOX=y
CONFIG_DM_PMIC=y CONFIG_DM_PMIC=y

6
drivers/pinctrl/Kconfig
View File

@ -123,12 +123,12 @@ config QCA953X_PINCTRL
both the GPIO definitions and pin control functions for each both the GPIO definitions and pin control functions for each
available multiplex function. available multiplex function.
config ROCKCHIP_PINCTRL config ROCKCHIP_RK3288_PINCTRL
bool "Rockchip pin control driver" bool "Rockchip pin control driver"
depends on DM depends on DM
help help
Support pin multiplexing control on Rockchip SoCs. The driver is Support pin multiplexing control on Rockchip rk3288 SoCs. The driver
controlled by a device tree node which contains both the GPIO is controlled by a device tree node which contains both the GPIO
definitions and pin control functions for each available multiplex definitions and pin control functions for each available multiplex
function. function.

2
drivers/pinctrl/rockchip/Makefile
View File

@ -5,5 +5,5 @@
# SPDX-License-Identifier: GPL-2.0+ # 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 obj-$(CONFIG_ROCKCHIP_3036_PINCTRL) += pinctrl_rk3036.o