Eric Lee / smarc-uboot

Download as
Browse Code »

Commit 23c3042b106f6f5f92f4b5ec11b3d07eaf35bc06

Authored by Heiko Stübner
Committed by Simon Glass
1 parent 9f862ec717
Exists in v2017.01-smarct4x and in 25 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, v2017.01-smarct3x, v2017.01-smarct3x-emmc

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

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>
Acked-by: Simon Glass <sjg@chromium.org>

Showing 6 changed files with 6 additions and 6 deletions Side-by-side Diff

configs/evb-rk3036_defconfig
Diff comments   View file @ 23c3042
... ... @@ -32,7 +32,7 @@
32 32 CONFIG_DM_MMC=y
33 33 CONFIG_ROCKCHIP_DWMMC=y
34 34 CONFIG_PINCTRL=y
35   -CONFIG_ROCKCHIP_3036_PINCTRL=y
  35 +CONFIG_ROCKCHIP_RK3036_PINCTRL=y
36 36 CONFIG_RAM=y
37 37 # CONFIG_SPL_SERIAL_PRESENT is not set
38 38 CONFIG_DEBUG_UART=y
configs/kylin-rk3036_defconfig
Diff comments   View file @ 23c3042
... ... @@ -32,7 +32,7 @@
32 32 CONFIG_DM_MMC=y
33 33 CONFIG_ROCKCHIP_DWMMC=y
34 34 CONFIG_PINCTRL=y
35   -CONFIG_ROCKCHIP_3036_PINCTRL=y
  35 +CONFIG_ROCKCHIP_RK3036_PINCTRL=y
36 36 CONFIG_RAM=y
37 37 CONFIG_USE_PRIVATE_LIBGCC=y
38 38 CONFIG_CMD_DHRYSTONE=y
configs/sandbox_defconfig
Diff comments   View file @ 23c3042
... ... @@ -121,7 +121,7 @@
121 121 CONFIG_PINCTRL=y
122 122 CONFIG_PINCONF=y
123 123 CONFIG_ROCKCHIP_RK3288_PINCTRL=y
124   -CONFIG_ROCKCHIP_3036_PINCTRL=y
  124 +CONFIG_ROCKCHIP_RK3036_PINCTRL=y
125 125 CONFIG_PINCTRL_SANDBOX=y
126 126 CONFIG_DM_PMIC=y
127 127 CONFIG_PMIC_ACT8846=y
configs/sandbox_noblk_defconfig
Diff comments   View file @ 23c3042
... ... @@ -113,7 +113,7 @@
113 113 CONFIG_PINCTRL=y
114 114 CONFIG_PINCONF=y
115 115 CONFIG_ROCKCHIP_RK3288_PINCTRL=y
116   -CONFIG_ROCKCHIP_3036_PINCTRL=y
  116 +CONFIG_ROCKCHIP_RK3036_PINCTRL=y
117 117 CONFIG_PINCTRL_SANDBOX=y
118 118 CONFIG_DM_PMIC=y
119 119 CONFIG_PMIC_ACT8846=y
drivers/pinctrl/Kconfig
Diff comments   View file @ 23c3042
... ... @@ -132,7 +132,7 @@
132 132 definitions and pin control functions for each available multiplex
133 133 function.
134 134  
135   -config ROCKCHIP_3036_PINCTRL
  135 +config ROCKCHIP_RK3036_PINCTRL
136 136 bool "Rockchip rk3036 pin control driver"
137 137 depends on DM
138 138 help
drivers/pinctrl/rockchip/Makefile
Diff comments   View file @ 23c3042
... ... @@ -6,5 +6,5 @@
6 6 #
7 7  
8 8 obj-$(CONFIG_ROCKCHIP_RK3288_PINCTRL) += pinctrl_rk3288.o
9   -obj-$(CONFIG_ROCKCHIP_3036_PINCTRL) += pinctrl_rk3036.o
  9 +obj-$(CONFIG_ROCKCHIP_RK3036_PINCTRL) += pinctrl_rk3036.o