[U-Boot,2/9] cosmetic: rockchip: rk3036: pinctrl: fix config symbol naming
diff mbox

Message ID 1468621041-11487-3-git-send-email-heiko@sntech.de
State Accepted
Commit 23c3042b106f6f5f92f4b5ec11b3d07eaf35bc06
Delegated to: Simon Glass
Headers show

Commit Message

Heiko Stuebner July 15, 2016, 10:17 p.m. UTC
Rockchip socs are always named rkxxxx in all places, as also shown
by the naming of the rk3036 pinctrl file itself.
Therefore also name the config symbol according to this scheme.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 configs/evb-rk3036_defconfig      | 2 +-
 configs/kylin-rk3036_defconfig    | 2 +-
 configs/sandbox_defconfig         | 2 +-
 configs/sandbox_noblk_defconfig   | 2 +-
 drivers/pinctrl/Kconfig           | 2 +-
 drivers/pinctrl/rockchip/Makefile | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

Comments

Simon Glass July 17, 2016, 2:13 p.m. UTC | #1
On 15 July 2016 at 16:17, Heiko Stuebner <heiko@sntech.de> wrote:
> Rockchip socs are always named rkxxxx in all places, as also shown
> by the naming of the rk3036 pinctrl file itself.
> Therefore also name the config symbol according to this scheme.
>
> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
> ---
>  configs/evb-rk3036_defconfig      | 2 +-
>  configs/kylin-rk3036_defconfig    | 2 +-
>  configs/sandbox_defconfig         | 2 +-
>  configs/sandbox_noblk_defconfig   | 2 +-
>  drivers/pinctrl/Kconfig           | 2 +-
>  drivers/pinctrl/rockchip/Makefile | 2 +-
>  6 files changed, 6 insertions(+), 6 deletions(-)

Acked-by: Simon Glass <sjg@chromium.org>
Simon Glass July 18, 2016, 12:16 p.m. UTC | #2
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:
>> Rockchip socs are always named rkxxxx in all places, as also shown
>> by the naming of the rk3036 pinctrl file itself.
>> Therefore also name the config symbol according to this scheme.
>>
>> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
>> ---
>>  configs/evb-rk3036_defconfig      | 2 +-
>>  configs/kylin-rk3036_defconfig    | 2 +-
>>  configs/sandbox_defconfig         | 2 +-
>>  configs/sandbox_noblk_defconfig   | 2 +-
>>  drivers/pinctrl/Kconfig           | 2 +-
>>  drivers/pinctrl/rockchip/Makefile | 2 +-
>>  6 files changed, 6 insertions(+), 6 deletions(-)
>
> Acked-by: Simon Glass <sjg@chromium.org>

Applied to u-boot-rockchip, thanks!

Patch
diff mbox

diff --git a/configs/evb-rk3036_defconfig b/configs/evb-rk3036_defconfig
index 9894fff..2d5e5e0 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 0ff6c6b..51196aa 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 a5bb759..7ea9d31 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -120,7 +120,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 2928da4..503845b 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 85dddd3..951a922 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 6a84961..0b2e95e 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