Re: [PATCH 1/2] sunxi: Simplify MMC pinmux selection
On 9/16/21 5:42 AM, Andre Przywara wrote:
> On 12/09/2021 16:28, Samuel Holland wrote:
>> Only one board, Yones Toptech BD1078, actually uses a non-default MMC
>> pinmux. All other uses of these symbols select the default value or an
>> invalid value. To simplify things, remove support for the unused pinmux
>> options, and convert the remaining option to a Boolean.
>>
>> This allows the pinmux to be chosen by the preprocessor, instead of
>> having the code parse a string at runtime (for a build-time option!).
>> Not only does this reduce code size, but it also allows this Kconfig
>> option to be used in a table-driven DM pinctrl driver.
>
> That's a very nice cleanup, and I like the diffstat, so thanks very much.
>
> Actually it made me wonder if we can't go a step further, and replace
> all the #ifdef's with if (IS_ENABLED()). So I gave this a try and it
> seems to work - see below. I will double check that they are equivalent,
> but would be interested what you think and if that somehow clashes with
> your future plans.
I have no additional patches to this function, so your patch does not
conflict with anything.
My future plan is to require CONFIG_SPL_DM on RISC-V, and let the
mostly-existing #ifdefs take care of leaving out the non-DM setup code.
I also plan to get CONFIG_SPL_DM at least somewhat working on ARM, since
I can test things incrementally there, before I dive into SPL on RISC-V.
Cheers,
Samuel
> But we should take this patch as a step here anyway. I checked that the
> transformations are correct, so:
>
>> Signed-off-by: Samuel Holland
>
> Reviewed-by: Andre Przywara
>
> (on top of your patch)
>
> diff --git a/board/sunxi/board.c b/board/sunxi/board.c
> index f98d370342..45d40d7847 100644
> --- a/board/sunxi/board.c
> +++ b/board/sunxi/board.c
> @@ -411,166 +411,123 @@ void board_nand_init(void)
> #ifdef CONFIG_MMC
> static void mmc_pinmux_setup(int sdc)
> {
> - unsigned int pin;
> + unsigned int pin, start_pin = ~0, mux = ~0, num_pins = 6;
>
> switch (sdc) {
> - case 0:
> - /* SDC0: PF0-PF5 */
> - for (pin = SUNXI_GPF(0); pin <= SUNXI_GPF(5); pin++) {
> - sunxi_gpio_set_cfgpin(pin, SUNXI_GPF_SDC0);
> - sunxi_gpio_set_pull(pin, SUNXI_GPIO_PULL_UP);
> - sunxi_gpio_set_drv(pin, 2);
> - }
> + case 0: /* SDC0: PF0-PF5 */
> + start_pin = SUNXI_GPF(0);
> + mux = SUNXI_GPF_SDC0;
> break;
>
> case 1:
> -#if defined(CONFIG_MACH_SUN4I) || defined(CONFIG_MACH_SUN7I) || \
> - defined(CONFIG_MACH_SUN8I_R40)
> - if (IS_ENABLED(CONFIG_MMC1_PINS_PH)) {
> - /* SDC1: PH22-PH-27 */
> - for (pin = SUNXI_GPH(22); pin <= SUNXI_GPH(27); pin++) {
> - sunxi_gpio_set_cfgpin(pin, SUN4I_GPH_SDC1);
> - sunxi_gpio_set_pull(pin, SUNXI_GPIO_PULL_UP);
> - sunxi_gpio_set_drv(pin, 2);
> + if (IS_ENABLED(CONFIG_MACH_SUN4I) ||
> + IS_ENABLED(CONFIG_MACH_SUN7I) ||
> + IS_ENABLED(CONFIG_MACH_SUN8I_R40)) {
> + if (IS_ENABLED(CONFIG_MMC1_PINS_PH)) {
> + start_pin = SUNXI_GPH(22);
> + mux = SUN4I_GPH_SDC1;
> + } else {
> + start_pin = SUNXI_GPG(0);
> + mux = SUN4I_GPG_SDC1;
> }
> - } else {
> - /* SDC1: PG0-PG5 */
> - for (pin = SUNXI_GPG(0); pin <= SUNXI_GPG(5); pin++) {
> - sunxi_gpio_set_cfgpin(pin, SUN4I_GPG_SDC1);
> - sunxi_gpio_set_pull(pin, SUNXI_GPIO_PULL_UP);
> - sunxi_gpio_set_drv(pin, 2);
> - }
> - }
> -#elif defined(CONFIG_MACH_SUN5I)
> - /* SDC1: PG3-PG8 */
> - for (pin = SUNXI_GPG(3); pin <= SUNXI_GPG(8); pin++) {
> - sunxi_gpio_set_cfgpin(pin, SUN5I_GPG_SDC1);
> - sunxi_gpio_set_pull(pin, SUNXI_GPIO_PULL_UP);
> - sunxi_gpio_set_drv(pin, 2);
> - }
> -#elif defined(CONFIG_MACH_SUN6I)
> - /* SDC1: PG0-PG5 */
> - for (pin = SUNXI_GPG(0); pin <= SUNXI_GPG(5); pin++) {
> - sunxi_gpio_set_cfgpin(pin, SUN6I_GPG_SDC1);
> - sunxi_gpio_set_pull(pin, SUNXI_GPIO_PULL_UP);
> - sunxi_gpio_set_drv(pin, 2);
> + } else if (IS_ENABLED(CONFIG_MACH_SUN5I)) {
> + start_pin = SUNXI_GPG(3);
> + mux = SUN5I_GPG_SDC1;
> + } else if (IS_ENABLED(CONFIG_MACH_SUN6I)) {
> + start_pin = SUNXI_GPG(0);
> + mux = SUN6I_GPG_SDC1;
> + } else if (IS_ENABLED(CONFIG_MACH_SUN8I)) {
> + start_pin = SUNXI_GPG(0);
> + mux = SUN8I_GPG_SDC1;
> }
> -#elif defined(CONFIG_MACH_SUN8I)
> - /* SDC1: PG0-PG5 */
> - for (pin = SUNXI_GPG(0); pin <= SUNXI_GPG(5); pin++) {
> - sunxi_gpio_set_cfgpin(pin, SUN8I_GPG_SDC1);
> - sunxi_gpio_set_pull(pin, SUNXI_GPIO_PULL_UP);
> - sunxi_gpio_set_drv(pin, 2);
> - }
> -#endif
> break;
>
Re: [PATCH 1/2] sunxi: Simplify MMC pinmux selection
On 12/09/2021 16:28, Samuel Holland wrote:
Only one board, Yones Toptech BD1078, actually uses a non-default MMC
pinmux. All other uses of these symbols select the default value or an
invalid value. To simplify things, remove support for the unused pinmux
options, and convert the remaining option to a Boolean.
This allows the pinmux to be chosen by the preprocessor, instead of
having the code parse a string at runtime (for a build-time option!).
Not only does this reduce code size, but it also allows this Kconfig
option to be used in a table-driven DM pinctrl driver.
That's a very nice cleanup, and I like the diffstat, so thanks very much.
Actually it made me wonder if we can't go a step further, and replace
all the #ifdef's with if (IS_ENABLED()). So I gave this a try and it
seems to work - see below. I will double check that they are equivalent,
but would be interested what you think and if that somehow clashes with
your future plans.
But we should take this patch as a step here anyway. I checked that the
transformations are correct, so:
Signed-off-by: Samuel Holland
Reviewed-by: Andre Przywara
(on top of your patch)
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index f98d370342..45d40d7847 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -411,166 +411,123 @@ void board_nand_init(void)
#ifdef CONFIG_MMC
static void mmc_pinmux_setup(int sdc)
{
- unsigned int pin;
+ unsigned int pin, start_pin = ~0, mux = ~0, num_pins = 6;
switch (sdc) {
- case 0:
- /* SDC0: PF0-PF5 */
- for (pin = SUNXI_GPF(0); pin <= SUNXI_GPF(5); pin++) {
- sunxi_gpio_set_cfgpin(pin, SUNXI_GPF_SDC0);
- sunxi_gpio_set_pull(pin, SUNXI_GPIO_PULL_UP);
- sunxi_gpio_set_drv(pin, 2);
- }
+ case 0: /* SDC0: PF0-PF5 */
+ start_pin = SUNXI_GPF(0);
+ mux = SUNXI_GPF_SDC0;
break;
case 1:
-#if defined(CONFIG_MACH_SUN4I) || defined(CONFIG_MACH_SUN7I) || \
-defined(CONFIG_MACH_SUN8I_R40)
- if (IS_ENABLED(CONFIG_MMC1_PINS_PH)) {
- /* SDC1: PH22-PH-27 */
- for (pin = SUNXI_GPH(22); pin <= SUNXI_GPH(27); pin++) {
- sunxi_gpio_set_cfgpin(pin, SUN4I_GPH_SDC1);
- sunxi_gpio_set_pull(pin, SUNXI_GPIO_PULL_UP);
- sunxi_gpio_set_drv(pin, 2);
+ if (IS_ENABLED(CONFIG_MACH_SUN4I) ||
+ IS_ENABLED(CONFIG_MACH_SUN7I) ||
+ IS_ENABLED(CONFIG_MACH_SUN8I_R40)) {
+ if (IS_ENABLED(CONFIG_MMC1_PINS_PH)) {
+ start_pin = SUNXI_GPH(22);
+ mux = SUN4I_GPH_SDC1;
+ } else {
+ start_pin = SUNXI_GPG(0);
+ mux = SUN4I_GPG_SDC1;
}
- } else {
- /* SDC1: PG0-PG5 */
- for (pin = SUNXI_GPG(0); pin <= SUNXI_GPG(5); pin++) {
- sunxi_gpio_set_cfgpin(pin, SUN4I_GPG_SDC1);
- sunxi_gpio_set_pull(pin, SUNXI_GPIO_PULL_UP);
- sunxi_gpio_set_drv(pin, 2);
- }
- }
-#elif defined(CONFIG_MACH_SUN5I)
- /* SDC1: PG3-PG8 */
- for (pin = SUNXI_GPG(3); pin <= SUNXI_GPG(8); pin++) {
- sunxi_gpio_set_cfgpin(pin, SUN5I_GPG_SDC1);
- sunxi_gpio_set_pull(pin, SUNXI_GPIO_PULL_UP);
- sunxi_gpio_set_drv(pin, 2);
- }
-#elif defined(CONFIG_MACH_SUN6I)
- /* SDC1: PG0-PG5 */
- for (pin = SUNXI_GPG(0); pin <= SUNXI_GPG(5); pin++) {
- sunxi_gpio_set_cfgpin(pin, SUN6I_GPG_SDC1);
- sunxi_gpio_set_pull(pin, SUNXI_GPIO_PULL_UP);
- sunxi_gpio_set_drv(pin, 2);
+ } else if (IS_ENABLED(CONFIG_MACH_SUN5I)) {
+ start_pin = SUNXI_GPG(3);
+ mux = SUN5I_GPG_SDC1;
+ } else if (IS_ENABLED(CONFIG_MACH_SUN6I)) {
+ start_pin = SUNXI_GPG(0);
+ mux = SUN6I_GPG_SDC1;
+ } else if (IS_ENABLED(CONFIG_MACH_SUN8I)) {
+ start_pin = SUNXI_GPG(0);
+ mux = SUN8I_GPG_SDC1;
}
-#elif defined(CONFIG_MACH_SUN8I)
- /* SDC1: PG0-PG5 */
- for (pin = SUNXI_GPG(0); pin <= SUNXI_GPG(5); pin++) {
- sunxi_gpio_set_cfgpin(pin, SUN8I_GPG_SDC1);
- sunxi_gpio_set_pull(pin, SUNXI_GPIO_PULL_UP);
- sunxi_gpio_set_drv(pin, 2);
- }
-#endif
break;
case 2:
-#if
[PATCH 1/2] sunxi: Simplify MMC pinmux selection
Only one board, Yones Toptech BD1078, actually uses a non-default MMC
pinmux. All other uses of these symbols select the default value or an
invalid value. To simplify things, remove support for the unused pinmux
options, and convert the remaining option to a Boolean.
This allows the pinmux to be chosen by the preprocessor, instead of
having the code parse a string at runtime (for a build-time option!).
Not only does this reduce code size, but it also allows this Kconfig
option to be used in a table-driven DM pinctrl driver.
Signed-off-by: Samuel Holland
---
arch/arm/include/asm/arch-sunxi/gpio.h | 4 -
arch/arm/mach-sunxi/Kconfig| 21 +
board/sunxi/board.c| 101 +++--
configs/A20-Olimex-SOM-EVB_defconfig | 1 -
configs/Sinlinx_SinA31s_defconfig | 1 -
configs/Yones_Toptech_BD1078_defconfig | 2 +-
configs/parrot_r16_defconfig | 1 -
7 files changed, 34 insertions(+), 97 deletions(-)
diff --git a/arch/arm/include/asm/arch-sunxi/gpio.h
b/arch/arm/include/asm/arch-sunxi/gpio.h
index 2969a530ae1..43b1b97391a 100644
--- a/arch/arm/include/asm/arch-sunxi/gpio.h
+++ b/arch/arm/include/asm/arch-sunxi/gpio.h
@@ -148,8 +148,6 @@ enum sunxi_gpio_number {
#define SUNXI_GPA_EMAC 2
#define SUN6I_GPA_GMAC 2
#define SUN7I_GPA_GMAC 5
-#define SUN6I_GPA_SDC2 5
-#define SUN6I_GPA_SDC3 4
#define SUN8I_H3_GPA_UART0 2
#define SUN4I_GPB_PWM 2
@@ -173,12 +171,10 @@ enum sunxi_gpio_number {
#define SUN6I_GPC_SDC3 4
#define SUN50I_GPC_SPI04
-#define SUN8I_GPD_SDC1 3
#define SUNXI_GPD_LCD0 2
#define SUNXI_GPD_LVDS03
#define SUNXI_GPD_PWM 2
-#define SUN5I_GPE_SDC2 3
#define SUN8I_GPE_TWI2 3
#define SUN50I_GPE_TWI23
diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
index 1d4a4fdd0c5..7308f977a59 100644
--- a/arch/arm/mach-sunxi/Kconfig
+++ b/arch/arm/mach-sunxi/Kconfig
@@ -677,24 +677,11 @@ config MMC3_CD_PIN
---help---
See MMC0_CD_PIN help text.
-config MMC1_PINS
- string "Pins for mmc1"
- default ""
- ---help---
- Set the pins used for mmc1, when applicable. This takes a string in the
- format understood by sunxi_name_to_gpio_bank, e.g. PH for port H.
-
-config MMC2_PINS
- string "Pins for mmc2"
- default ""
- ---help---
- See MMC1_PINS help text.
-
-config MMC3_PINS
- string "Pins for mmc3"
- default ""
+config MMC1_PINS_PH
+ bool "Pins for mmc1 are on Port H"
+ depends on MACH_SUN4I || MACH_SUN7I || MACH_SUN8I_R40
---help---
- See MMC1_PINS help text.
+ Select this option for boards where mmc1 uses the Port H pinmux.
config MMC_SUNXI_SLOT_EXTRA
int "mmc extra slot number"
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index 2b7d655678d..418dc0ce756 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -413,7 +413,6 @@ void board_nand_init(void)
static void mmc_pinmux_setup(int sdc)
{
unsigned int pin;
- __maybe_unused int pins;
switch (sdc) {
case 0:
@@ -426,11 +425,9 @@ static void mmc_pinmux_setup(int sdc)
break;
case 1:
- pins = sunxi_name_to_gpio_bank(CONFIG_MMC1_PINS);
-
#if defined(CONFIG_MACH_SUN4I) || defined(CONFIG_MACH_SUN7I) || \
defined(CONFIG_MACH_SUN8I_R40)
- if (pins == SUNXI_GPIO_H) {
+ if (IS_ENABLED(CONFIG_MMC1_PINS_PH)) {
/* SDC1: PH22-PH-27 */
for (pin = SUNXI_GPH(22); pin <= SUNXI_GPH(27); pin++) {
sunxi_gpio_set_cfgpin(pin, SUN4I_GPH_SDC1);
@@ -460,27 +457,16 @@ static void mmc_pinmux_setup(int sdc)
sunxi_gpio_set_drv(pin, 2);
}
#elif defined(CONFIG_MACH_SUN8I)
- if (pins == SUNXI_GPIO_D) {
- /* SDC1: PD2-PD7 */
- for (pin = SUNXI_GPD(2); pin <= SUNXI_GPD(7); pin++) {
- sunxi_gpio_set_cfgpin(pin, SUN8I_GPD_SDC1);
- sunxi_gpio_set_pull(pin, SUNXI_GPIO_PULL_UP);
- sunxi_gpio_set_drv(pin, 2);
- }
- } else {
- /* SDC1: PG0-PG5 */
- for (pin = SUNXI_GPG(0); pin <= SUNXI_GPG(5); pin++) {
- sunxi_gpio_set_cfgpin(pin, SUN8I_GPG_SDC1);
- sunxi_gpio_set_pull(pin, SUNXI_GPIO_PULL_UP);
- sunxi_gpio_set_drv(pin, 2);
- }
+ /* SDC1: PG0-PG5 */
+ for (pin = SUNXI_GPG(0); pin <= SUNXI_GPG(5); pin++) {
+ sunxi_gpio_set_cfgpin(pin, SUN8I_GPG_SDC1);
+ sunxi_gpio_set_pull(pin,
