diff options
| -rw-r--r-- | configs/evb-rk3036_defconfig | 2 | ||||
| -rw-r--r-- | configs/kylin-rk3036_defconfig | 2 | ||||
| -rw-r--r-- | configs/sandbox_defconfig | 2 | ||||
| -rw-r--r-- | configs/sandbox_noblk_defconfig | 2 | ||||
| -rw-r--r-- | drivers/pinctrl/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/pinctrl/rockchip/Makefile | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/configs/evb-rk3036_defconfig b/configs/evb-rk3036_defconfig index 9894fffcca2..2d5e5e053ff 100644 --- a/configs/evb-rk3036_defconfig +++ b/configs/evb-rk3036_defconfig @@ -32,7 +32,7 @@ CONFIG_SYSRESET=y CONFIG_DM_MMC=y CONFIG_ROCKCHIP_DWMMC=y CONFIG_PINCTRL=y -CONFIG_ROCKCHIP_3036_PINCTRL=y +CONFIG_ROCKCHIP_RK3036_PINCTRL=y CONFIG_RAM=y # CONFIG_SPL_SERIAL_PRESENT is not set CONFIG_DEBUG_UART=y diff --git a/configs/kylin-rk3036_defconfig b/configs/kylin-rk3036_defconfig index 0ff6c6b9a4a..51196aa0897 100644 --- a/configs/kylin-rk3036_defconfig +++ b/configs/kylin-rk3036_defconfig @@ -32,7 +32,7 @@ CONFIG_SYSRESET=y CONFIG_DM_MMC=y CONFIG_ROCKCHIP_DWMMC=y CONFIG_PINCTRL=y -CONFIG_ROCKCHIP_3036_PINCTRL=y +CONFIG_ROCKCHIP_RK3036_PINCTRL=y CONFIG_RAM=y CONFIG_USE_PRIVATE_LIBGCC=y CONFIG_CMD_DHRYSTONE=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 2067f87ccab..29e6d85bd4c 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -121,7 +121,7 @@ CONFIG_PCI_SANDBOX=y CONFIG_PINCTRL=y CONFIG_PINCONF=y CONFIG_ROCKCHIP_RK3288_PINCTRL=y -CONFIG_ROCKCHIP_3036_PINCTRL=y +CONFIG_ROCKCHIP_RK3036_PINCTRL=y CONFIG_PINCTRL_SANDBOX=y CONFIG_DM_PMIC=y CONFIG_PMIC_ACT8846=y diff --git a/configs/sandbox_noblk_defconfig b/configs/sandbox_noblk_defconfig index 2928da4af03..503845bb007 100644 --- a/configs/sandbox_noblk_defconfig +++ b/configs/sandbox_noblk_defconfig @@ -113,7 +113,7 @@ CONFIG_PCI_SANDBOX=y CONFIG_PINCTRL=y CONFIG_PINCONF=y CONFIG_ROCKCHIP_RK3288_PINCTRL=y -CONFIG_ROCKCHIP_3036_PINCTRL=y +CONFIG_ROCKCHIP_RK3036_PINCTRL=y CONFIG_PINCTRL_SANDBOX=y CONFIG_DM_PMIC=y CONFIG_PMIC_ACT8846=y diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index 85dddd36a8d..951a922f255 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig @@ -132,7 +132,7 @@ config ROCKCHIP_RK3288_PINCTRL definitions and pin control functions for each available multiplex function. -config ROCKCHIP_3036_PINCTRL +config ROCKCHIP_RK3036_PINCTRL bool "Rockchip rk3036 pin control driver" depends on DM help diff --git a/drivers/pinctrl/rockchip/Makefile b/drivers/pinctrl/rockchip/Makefile index 6a84961ac06..0b2e95e912d 100644 --- a/drivers/pinctrl/rockchip/Makefile +++ b/drivers/pinctrl/rockchip/Makefile @@ -6,4 +6,4 @@ # obj-$(CONFIG_ROCKCHIP_RK3288_PINCTRL) += pinctrl_rk3288.o -obj-$(CONFIG_ROCKCHIP_3036_PINCTRL) += pinctrl_rk3036.o +obj-$(CONFIG_ROCKCHIP_RK3036_PINCTRL) += pinctrl_rk3036.o |