From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0167ECE588 for ; Tue, 15 Oct 2019 14:13:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5525D20650 for ; Tue, 15 Oct 2019 14:13:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="FhR2ket7" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732539AbfJOONi (ORCPT ); Tue, 15 Oct 2019 10:13:38 -0400 Received: from mail-vs1-f65.google.com ([209.85.217.65]:45021 "EHLO mail-vs1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732514AbfJOONh (ORCPT ); Tue, 15 Oct 2019 10:13:37 -0400 Received: by mail-vs1-f65.google.com with SMTP id w195so13216342vsw.11 for ; Tue, 15 Oct 2019 07:13:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=w/RCY4GLlbWydxXCB+Mw3Ptt0w5yAq9AlkuwapJwfpg=; b=FhR2ket7J/xpKMufg1DK6Q92neuymC1xiLnKbkOzfn57QCU1qO6s+ici/6gyu28d8B l0VSMzzs6E0hSN8Y3iNUaKiMBvj6FOfMmJM3lbNh4QFy7gGF83qfFzbzu+g1P8Z4bfjV EarCWIoV76WnmTpS1OSsQ/kEXJL6axKE0ibdMl2CvdRdqQsVgPz8DiTp+U5j0901aViW ES1+D+3gNwdYv6NyXU/zzZOF0HpU683yfKwFOEJ5AfDZZrRRqnQXv9k66h4BvdV9yqM6 jWy29bFe6izjuSVS7n73KLAIU6Um9phtknYV80OROCydbgzWxgAL6wXTc+BxRvkgimYD gL+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=w/RCY4GLlbWydxXCB+Mw3Ptt0w5yAq9AlkuwapJwfpg=; b=jSCVmBluYT6Ao34U0t/SXKXZ/osuY4bh9RDrqDgM5E9d7pl55TdQO3nNsjhizZqdmv ygtM4fTwFTNCyaTSC2Y+zwE37eYb5ixXusyY5SSxNf/4QqkCTnJnxehRCNZK2bAi47Ji syRJLgBdaPmxDFN5J/Rxs0iwglhijSsgl8cWe8Fcn/u6djGO1piPfyl1dvhnoWjY6qI5 vh3CCdVi3VgxJ9YlQITezxu9o1ME7/nj5W7cUC7dBiCTjI8nOiNuep0Oyq+eTiQFly53 BQLyzrvM6Uvj6rZLlAQfyl73y7hu5eE+dVDclS0WweUn1y35USKLMaEBkde6dOy5wxiU Yj2w== X-Gm-Message-State: APjAAAXm8cyUr4QUC4hafdVG3gtrQQoVDGTV5m6dFAInBoQjxSRRsesd WFQtWGVcPbyuSkX9j/YnrkWak1Y7BuaUdk1KuMVPwg== X-Google-Smtp-Source: APXvYqzZXcCuaO9tik5LsFinEq3ogWhV9MFtqOVWRSJuuJUwjFJdFJp3+ZM53BbrqxgTkSx+7op8ey4r/q8+CTUy7TY= X-Received: by 2002:a67:8bc4:: with SMTP id n187mr4858829vsd.35.1571148814878; Tue, 15 Oct 2019 07:13:34 -0700 (PDT) MIME-Version: 1.0 References: <20191010202802.1132272-1-arnd@arndb.de> <20191010203043.1241612-1-arnd@arndb.de> <20191010203043.1241612-23-arnd@arndb.de> In-Reply-To: <20191010203043.1241612-23-arnd@arndb.de> From: Ulf Hansson Date: Tue, 15 Oct 2019 16:12:58 +0200 Message-ID: Subject: Re: [PATCH 23/36] ARM: s3c: move s3cmci pinctrl handling into board files To: Arnd Bergmann Cc: Kukjin Kim , Krzysztof Kozlowski , Ben Dooks , linux-samsung-soc , Linux ARM , Linus Walleij , Linux Kernel Mailing List , "linux-mmc@vger.kernel.org" Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 10 Oct 2019 at 22:47, Arnd Bergmann wrote: > > Rather than call the internal s3c_gpio_cfgall_range() function > through a platform header, move the code into the set_power > callback that is already exported by the board, and add > a default implementation. > > In DT mode, the code already does not set the pin config, > so nothing changes there. > > Signed-off-by: Arnd Bergmann This looks good to me! Acked-by: Ulf Hansson Kind regards Uffe > --- > arch/arm/mach-s3c24xx/include/mach/pm-core.h | 1 + > arch/arm/mach-s3c24xx/mach-amlm5900.c | 15 +++++ > arch/arm/mach-s3c24xx/mach-at2440evb.c | 10 ++- > arch/arm/mach-s3c24xx/mach-gta02.c | 15 +++++ > arch/arm/mach-s3c24xx/mach-h1940.c | 8 +++ > arch/arm/mach-s3c24xx/mach-mini2440.c | 9 ++- > arch/arm/mach-s3c24xx/mach-n30.c | 9 +++ > arch/arm/mach-s3c24xx/mach-qt2410.c | 15 +++++ > arch/arm/mach-s3c24xx/mach-rx1950.c | 9 +++ > arch/arm/mach-s3c24xx/mach-tct_hammer.c | 15 +++++ > arch/arm/plat-samsung/devs.c | 29 ++++++++ > drivers/mmc/host/s3cmci.c | 69 +++++--------------- > include/linux/platform_data/mmc-s3cmci.h | 2 + > 13 files changed, 152 insertions(+), 54 deletions(-) > > diff --git a/arch/arm/mach-s3c24xx/include/mach/pm-core.h b/arch/arm/mach-s3c24xx/include/mach/pm-core.h > index 8f87606c4cdc..a22b4a37ee57 100644 > --- a/arch/arm/mach-s3c24xx/include/mach/pm-core.h > +++ b/arch/arm/mach-s3c24xx/include/mach/pm-core.h > @@ -12,6 +12,7 @@ > > #include "regs-clock.h" > #include "regs-irq.h" > +#include > > static inline void s3c_pm_debug_init_uart(void) > { > diff --git a/arch/arm/mach-s3c24xx/mach-amlm5900.c b/arch/arm/mach-s3c24xx/mach-amlm5900.c > index 9a9daf526d0c..40ad23b52bc0 100644 > --- a/arch/arm/mach-s3c24xx/mach-amlm5900.c > +++ b/arch/arm/mach-s3c24xx/mach-amlm5900.c > @@ -13,6 +13,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -124,6 +125,19 @@ static struct s3c2410_uartcfg amlm5900_uartcfgs[] = { > } > }; > > +static struct gpiod_lookup_table amlm5900_mmc_gpio_table = { > + .dev_id = "s3c2410-sdi", > + .table = { > + /* bus pins */ > + GPIO_LOOKUP_IDX("GPIOE", 5, "bus", 0, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 6, "bus", 1, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 7, "bus", 2, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 8, "bus", 3, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 9, "bus", 4, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 10, "bus", 5, GPIO_ACTIVE_HIGH), > + { }, > + }, > +}; > > static struct platform_device *amlm5900_devices[] __initdata = { > #ifdef CONFIG_FB_S3C2410 > @@ -219,6 +233,7 @@ static void __init amlm5900_init(void) > s3c24xx_fb_set_platdata(&amlm5900_fb_info); > #endif > s3c_i2c0_set_platdata(NULL); > + gpiod_add_lookup_table(&amlm5900_mmc_gpio_table); > platform_add_devices(amlm5900_devices, ARRAY_SIZE(amlm5900_devices)); > } > > diff --git a/arch/arm/mach-s3c24xx/mach-at2440evb.c b/arch/arm/mach-s3c24xx/mach-at2440evb.c > index 58c5ef3cf1d7..3a793aaf2cba 100644 > --- a/arch/arm/mach-s3c24xx/mach-at2440evb.c > +++ b/arch/arm/mach-s3c24xx/mach-at2440evb.c > @@ -136,7 +136,7 @@ static struct platform_device at2440evb_device_eth = { > }; > > static struct s3c24xx_mci_pdata at2440evb_mci_pdata __initdata = { > - /* Intentionally left blank */ > + .set_power = s3c24xx_mci_def_set_power, > }; > > static struct gpiod_lookup_table at2440evb_mci_gpio_table = { > @@ -144,10 +144,18 @@ static struct gpiod_lookup_table at2440evb_mci_gpio_table = { > .table = { > /* Card detect S3C2410_GPG(10) */ > GPIO_LOOKUP("GPG", 10, "cd", GPIO_ACTIVE_LOW), > + /* bus pins */ > + GPIO_LOOKUP_IDX("GPIOE", 5, "bus", 0, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 6, "bus", 1, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 7, "bus", 2, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 8, "bus", 3, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 9, "bus", 4, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 10, "bus", 5, GPIO_ACTIVE_HIGH), > { }, > }, > }; > > + > /* 7" LCD panel */ > > static struct s3c2410fb_display at2440evb_lcd_cfg __initdata = { > diff --git a/arch/arm/mach-s3c24xx/mach-gta02.c b/arch/arm/mach-s3c24xx/mach-gta02.c > index 1ca0460d82f4..61b8c6badeb8 100644 > --- a/arch/arm/mach-s3c24xx/mach-gta02.c > +++ b/arch/arm/mach-s3c24xx/mach-gta02.c > @@ -489,6 +489,20 @@ static struct platform_device gta02_audio = { > .id = -1, > }; > > +static struct gpiod_lookup_table gta02_mmc_gpio_table = { > + .dev_id = "s3c2410-sdi", > + .table = { > + /* bus pins */ > + GPIO_LOOKUP_IDX("GPIOE", 5, "bus", 0, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 6, "bus", 1, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 7, "bus", 2, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 8, "bus", 3, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 9, "bus", 4, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 10, "bus", 5, GPIO_ACTIVE_HIGH), > + { }, > + }, > +}; > + > static void __init gta02_map_io(void) > { > s3c24xx_init_io(gta02_iodesc, ARRAY_SIZE(gta02_iodesc)); > @@ -545,6 +559,7 @@ static void __init gta02_machine_init(void) > S3C_GPIO_PULL_NONE); > > gpiod_add_lookup_table(>a02_audio_gpio_table); > + gpiod_add_lookup_table(>a02_mmc_gpio_table); > platform_add_devices(gta02_devices, ARRAY_SIZE(gta02_devices)); > pm_power_off = gta02_poweroff; > > diff --git a/arch/arm/mach-s3c24xx/mach-h1940.c b/arch/arm/mach-s3c24xx/mach-h1940.c > index 11f705fb5e32..24f785da7659 100644 > --- a/arch/arm/mach-s3c24xx/mach-h1940.c > +++ b/arch/arm/mach-s3c24xx/mach-h1940.c > @@ -462,6 +462,7 @@ static void h1940_set_mmc_power(unsigned char power_mode, unsigned short vdd) > static struct s3c24xx_mci_pdata h1940_mmc_cfg __initdata = { > .set_power = h1940_set_mmc_power, > .ocr_avail = MMC_VDD_32_33, > + .set_power = s3c24xx_mci_def_set_power, > }; > > static struct gpiod_lookup_table h1940_mmc_gpio_table = { > @@ -471,6 +472,13 @@ static struct gpiod_lookup_table h1940_mmc_gpio_table = { > GPIO_LOOKUP("GPF", 5, "cd", GPIO_ACTIVE_LOW), > /* Write protect S3C2410_GPH(8) */ > GPIO_LOOKUP("GPH", 8, "wp", GPIO_ACTIVE_LOW), > + /* bus pins */ > + GPIO_LOOKUP_IDX("GPIOE", 5, "bus", 0, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 6, "bus", 1, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 7, "bus", 2, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 8, "bus", 3, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 9, "bus", 4, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 10, "bus", 5, GPIO_ACTIVE_HIGH), > { }, > }, > }; > diff --git a/arch/arm/mach-s3c24xx/mach-mini2440.c b/arch/arm/mach-s3c24xx/mach-mini2440.c > index 894d43ff94f1..5c000efdf0e8 100644 > --- a/arch/arm/mach-s3c24xx/mach-mini2440.c > +++ b/arch/arm/mach-s3c24xx/mach-mini2440.c > @@ -236,7 +236,7 @@ static struct s3c2410fb_mach_info mini2440_fb_info __initdata = { > > static struct s3c24xx_mci_pdata mini2440_mmc_cfg __initdata = { > .wprotect_invert = 1, > - .set_power = NULL, > + .set_power = s3c24xx_mci_def_set_power, > .ocr_avail = MMC_VDD_32_33|MMC_VDD_33_34, > }; > > @@ -247,6 +247,13 @@ static struct gpiod_lookup_table mini2440_mmc_gpio_table = { > GPIO_LOOKUP("GPG", 8, "cd", GPIO_ACTIVE_LOW), > /* Write protect S3C2410_GPH(8) */ > GPIO_LOOKUP("GPH", 8, "wp", GPIO_ACTIVE_HIGH), > + /* bus pins */ > + GPIO_LOOKUP_IDX("GPIOE", 5, "bus", 0, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 6, "bus", 1, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 7, "bus", 2, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 8, "bus", 3, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 9, "bus", 4, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 10, "bus", 5, GPIO_ACTIVE_HIGH), > { }, > }, > }; > diff --git a/arch/arm/mach-s3c24xx/mach-n30.c b/arch/arm/mach-s3c24xx/mach-n30.c > index 5f5ca4b7015c..8d7ad61e9930 100644 > --- a/arch/arm/mach-s3c24xx/mach-n30.c > +++ b/arch/arm/mach-s3c24xx/mach-n30.c > @@ -339,6 +339,8 @@ static struct s3c2410fb_mach_info n30_fb_info __initdata = { > > static void n30_sdi_set_power(unsigned char power_mode, unsigned short vdd) > { > + s3c24xx_mci_def_set_power(power_mode, vdd); > + > switch (power_mode) { > case MMC_POWER_ON: > case MMC_POWER_UP: > @@ -364,6 +366,13 @@ static struct gpiod_lookup_table n30_mci_gpio_table = { > /* Write protect S3C2410_GPG(10) */ > GPIO_LOOKUP("GPG", 10, "wp", GPIO_ACTIVE_LOW), > { }, > + /* bus pins */ > + GPIO_LOOKUP_IDX("GPIOE", 5, "bus", 0, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 6, "bus", 1, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 7, "bus", 2, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 8, "bus", 3, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 9, "bus", 4, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 10, "bus", 5, GPIO_ACTIVE_HIGH), > }, > }; > > diff --git a/arch/arm/mach-s3c24xx/mach-qt2410.c b/arch/arm/mach-s3c24xx/mach-qt2410.c > index 6686f02a3f4f..9b47b8434f10 100644 > --- a/arch/arm/mach-s3c24xx/mach-qt2410.c > +++ b/arch/arm/mach-s3c24xx/mach-qt2410.c > @@ -219,6 +219,20 @@ static struct gpiod_lookup_table qt2410_spi_gpiod_table = { > }, > }; > > +static struct gpiod_lookup_table qt2410_mmc_gpiod_table = { > + .dev_id = "s3c2410-sdi", > + .table = { > + /* bus pins */ > + GPIO_LOOKUP_IDX("GPIOE", 5, "bus", 0, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 6, "bus", 1, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 7, "bus", 2, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 8, "bus", 3, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 9, "bus", 4, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 10, "bus", 5, GPIO_ACTIVE_HIGH), > + { }, > + }, > +}; > + > /* Board devices */ > > static struct platform_device *qt2410_devices[] __initdata = { > @@ -342,6 +356,7 @@ static void __init qt2410_machine_init(void) > s3c_gpio_cfgall_range(S3C2410_GPE(0), 5, S3C_GPIO_SFN(2), > S3C_GPIO_PULL_NONE); > gpiod_add_lookup_table(&qt2410_spi_gpiod_table); > + gpiod_add_lookup_table(&qt2410_mmc_gpiod_table); > platform_add_devices(qt2410_devices, ARRAY_SIZE(qt2410_devices)); > s3c_pm_init(); > } > diff --git a/arch/arm/mach-s3c24xx/mach-rx1950.c b/arch/arm/mach-s3c24xx/mach-rx1950.c > index 4eeede398775..820e626f5129 100644 > --- a/arch/arm/mach-s3c24xx/mach-rx1950.c > +++ b/arch/arm/mach-s3c24xx/mach-rx1950.c > @@ -545,6 +545,8 @@ static struct platform_device rx1950_backlight = { > > static void rx1950_set_mmc_power(unsigned char power_mode, unsigned short vdd) > { > + s3c24xx_mci_def_set_power(power_mode, vdd); > + > switch (power_mode) { > case MMC_POWER_OFF: > gpio_direction_output(S3C2410_GPJ(1), 0); > @@ -570,6 +572,13 @@ static struct gpiod_lookup_table rx1950_mmc_gpio_table = { > GPIO_LOOKUP("GPF", 5, "cd", GPIO_ACTIVE_LOW), > /* Write protect S3C2410_GPH(8) */ > GPIO_LOOKUP("GPH", 8, "wp", GPIO_ACTIVE_LOW), > + /* bus pins */ > + GPIO_LOOKUP_IDX("GPIOE", 5, "bus", 0, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 6, "bus", 1, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 7, "bus", 2, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 8, "bus", 3, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 9, "bus", 4, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 10, "bus", 5, GPIO_ACTIVE_HIGH), > { }, > }, > }; > diff --git a/arch/arm/mach-s3c24xx/mach-tct_hammer.c b/arch/arm/mach-s3c24xx/mach-tct_hammer.c > index 8d8ddd6ea305..d6dbbe6759bc 100644 > --- a/arch/arm/mach-s3c24xx/mach-tct_hammer.c > +++ b/arch/arm/mach-s3c24xx/mach-tct_hammer.c > @@ -7,6 +7,7 @@ > // derived from linux/arch/arm/mach-s3c2410/mach-bast.c, written by > // Ben Dooks > > +#include > #include > #include > #include > @@ -103,6 +104,19 @@ static struct s3c2410_uartcfg tct_hammer_uartcfgs[] = { > } > }; > > +static struct gpiod_lookup_table tct_hammer_mmc_gpio_table = { > + .dev_id = "s3c2410-sdi", > + .table = { > + /* bus pins */ > + GPIO_LOOKUP_IDX("GPIOE", 5, "bus", 0, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 6, "bus", 1, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 7, "bus", 2, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 8, "bus", 3, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 9, "bus", 4, GPIO_ACTIVE_HIGH), > + GPIO_LOOKUP_IDX("GPIOE", 10, "bus", 5, GPIO_ACTIVE_HIGH), > + { }, > + }, > +}; > > static struct platform_device *tct_hammer_devices[] __initdata = { > &s3c_device_adc, > @@ -131,6 +145,7 @@ static void __init tct_hammer_init_time(void) > static void __init tct_hammer_init(void) > { > s3c_i2c0_set_platdata(NULL); > + gpiod_add_lookup_table(&tct_hammer_mmc_gpio_table); > platform_add_devices(tct_hammer_devices, ARRAY_SIZE(tct_hammer_devices)); > } > > diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c > index ddd90f0bb380..c0739bda060b 100644 > --- a/arch/arm/plat-samsung/devs.c > +++ b/arch/arm/plat-samsung/devs.c > @@ -5,6 +5,7 @@ > // > // Base SAMSUNG platform device definitions > > +#include > #include > #include > #include > @@ -40,6 +41,8 @@ > #include > #include > #include > +#include > +#include > #include > > #include > @@ -833,16 +836,42 @@ struct platform_device s3c_device_rtc = { > /* SDI */ > > #ifdef CONFIG_PLAT_S3C24XX > +void s3c24xx_mci_def_set_power(unsigned char power_mode, unsigned short vdd) > +{ > + switch (power_mode) { > + case MMC_POWER_ON: > + case MMC_POWER_UP: > + /* Configure GPE5...GPE10 pins in SD mode */ > + s3c_gpio_cfgall_range(S3C2410_GPE(5), 6, S3C_GPIO_SFN(2), > + S3C_GPIO_PULL_NONE); > + break; > + > + case MMC_POWER_OFF: > + default: > + gpio_direction_output(S3C2410_GPE(5), 0); > + break; > + } > +} > + > static struct resource s3c_sdi_resource[] = { > [0] = DEFINE_RES_MEM(S3C24XX_PA_SDI, S3C24XX_SZ_SDI), > [1] = DEFINE_RES_IRQ(IRQ_SDI), > }; > > +static struct s3c24xx_mci_pdata s3cmci_def_pdata = { > + /* This is currently here to avoid a number of if (host->pdata) > + * checks. Any zero fields to ensure reasonable defaults are picked. */ > + .no_wprotect = 1, > + .no_detect = 1, > + .set_power = s3c24xx_mci_def_set_power, > +}; > + > struct platform_device s3c_device_sdi = { > .name = "s3c2410-sdi", > .id = -1, > .num_resources = ARRAY_SIZE(s3c_sdi_resource), > .resource = s3c_sdi_resource, > + .dev.platform_data = &s3cmci_def_pdata, > }; > > void __init s3c24xx_mci_set_platdata(struct s3c24xx_mci_pdata *pdata) > diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c > index bce9c33bc4b5..c2b46640a78b 100644 > --- a/drivers/mmc/host/s3cmci.c > +++ b/drivers/mmc/host/s3cmci.c > @@ -25,9 +25,7 @@ > #include > #include > > -#include > #include > -#include > > #include > > @@ -307,7 +305,8 @@ static inline void clear_imask(struct s3cmci_host *host) > static void s3cmci_check_sdio_irq(struct s3cmci_host *host) > { > if (host->sdio_irqen) { > - if (gpio_get_value(S3C2410_GPE(8)) == 0) { > + if (host->pdata->bus[3] && > + gpiod_get_value(host->pdata->bus[3]) == 0) { > pr_debug("%s: signalling irq\n", __func__); > mmc_signal_sdio_irq(host->mmc); > } > @@ -1213,33 +1212,20 @@ static void s3cmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) > switch (ios->power_mode) { > case MMC_POWER_ON: > case MMC_POWER_UP: > - /* Configure GPE5...GPE10 pins in SD mode */ > - if (!host->pdev->dev.of_node) > - s3c_gpio_cfgall_range(S3C2410_GPE(5), 6, S3C_GPIO_SFN(2), > - S3C_GPIO_PULL_NONE); > - > - if (host->pdata->set_power) > - host->pdata->set_power(ios->power_mode, ios->vdd); > - > if (!host->is2440) > mci_con |= S3C2410_SDICON_FIFORESET; > - > break; > > case MMC_POWER_OFF: > default: > - if (!host->pdev->dev.of_node) > - gpio_direction_output(S3C2410_GPE(5), 0); > - > if (host->is2440) > mci_con |= S3C2440_SDICON_SDRESET; > - > - if (host->pdata->set_power) > - host->pdata->set_power(ios->power_mode, ios->vdd); > - > break; > } > > + if (host->pdata->set_power) > + host->pdata->set_power(ios->power_mode, ios->vdd); > + > s3cmci_set_clk(host, ios); > > /* Set CLOCK_ENABLE */ > @@ -1317,13 +1303,6 @@ static const struct mmc_host_ops s3cmci_ops = { > .enable_sdio_irq = s3cmci_enable_sdio_irq, > }; > > -static struct s3c24xx_mci_pdata s3cmci_def_pdata = { > - /* This is currently here to avoid a number of if (host->pdata) > - * checks. Any zero fields to ensure reasonable defaults are picked. */ > - .no_wprotect = 1, > - .no_detect = 1, > -}; > - > #ifdef CONFIG_ARM_S3C24XX_CPUFREQ > > static int s3cmci_cpufreq_transition(struct notifier_block *nb, > @@ -1477,24 +1456,21 @@ static int s3cmci_probe_pdata(struct s3cmci_host *host) > int i, ret; > > host->is2440 = platform_get_device_id(pdev)->driver_data; > + pdata = pdev->dev.platform_data; > + if (!pdata) { > + dev_err(&pdev->dev, "need platform data"); > + return -ENXIO; > + } > > - for (i = S3C2410_GPE(5); i <= S3C2410_GPE(10); i++) { > - ret = gpio_request(i, dev_name(&pdev->dev)); > - if (ret) { > + for (i = 0; i < 6; i++) { > + pdata->bus[i] = devm_gpiod_get_index(&pdev->dev, "bus", i, > + GPIOD_OUT_LOW); > + if (IS_ERR(pdata->bus[i])) { > dev_err(&pdev->dev, "failed to get gpio %d\n", i); > - > - for (i--; i >= S3C2410_GPE(5); i--) > - gpio_free(i); > - > - return ret; > + return PTR_ERR(pdata->bus[i]); > } > } > > - if (!pdev->dev.platform_data) > - pdev->dev.platform_data = &s3cmci_def_pdata; > - > - pdata = pdev->dev.platform_data; > - > if (pdata->no_wprotect) > mmc->caps2 |= MMC_CAP2_NO_WRITE_PROTECT; > > @@ -1549,7 +1525,6 @@ static int s3cmci_probe(struct platform_device *pdev) > struct s3cmci_host *host; > struct mmc_host *mmc; > int ret; > - int i; > > mmc = mmc_alloc_host(sizeof(struct s3cmci_host), &pdev->dev); > if (!mmc) { > @@ -1593,7 +1568,7 @@ static int s3cmci_probe(struct platform_device *pdev) > "failed to get io memory region resource.\n"); > > ret = -ENOENT; > - goto probe_free_gpio; > + goto probe_free_host; > } > > host->mem = request_mem_region(host->mem->start, > @@ -1602,7 +1577,7 @@ static int s3cmci_probe(struct platform_device *pdev) > if (!host->mem) { > dev_err(&pdev->dev, "failed to request io memory region.\n"); > ret = -ENOENT; > - goto probe_free_gpio; > + goto probe_free_host; > } > > host->base = ioremap(host->mem->start, resource_size(host->mem)); > @@ -1726,11 +1701,6 @@ static int s3cmci_probe(struct platform_device *pdev) > probe_free_mem_region: > release_mem_region(host->mem->start, resource_size(host->mem)); > > - probe_free_gpio: > - if (!pdev->dev.of_node) > - for (i = S3C2410_GPE(5); i <= S3C2410_GPE(10); i++) > - gpio_free(i); > - > probe_free_host: > mmc_free_host(mmc); > > @@ -1756,7 +1726,6 @@ static int s3cmci_remove(struct platform_device *pdev) > { > struct mmc_host *mmc = platform_get_drvdata(pdev); > struct s3cmci_host *host = mmc_priv(mmc); > - int i; > > s3cmci_shutdown(pdev); > > @@ -1769,10 +1738,6 @@ static int s3cmci_remove(struct platform_device *pdev) > > free_irq(host->irq, host); > > - if (!pdev->dev.of_node) > - for (i = S3C2410_GPE(5); i <= S3C2410_GPE(10); i++) > - gpio_free(i); > - > iounmap(host->base); > release_mem_region(host->mem->start, resource_size(host->mem)); > > diff --git a/include/linux/platform_data/mmc-s3cmci.h b/include/linux/platform_data/mmc-s3cmci.h > index 33310b11cbdd..bacb86db3112 100644 > --- a/include/linux/platform_data/mmc-s3cmci.h > +++ b/include/linux/platform_data/mmc-s3cmci.h > @@ -35,6 +35,7 @@ struct s3c24xx_mci_pdata { > unsigned long ocr_avail; > void (*set_power)(unsigned char power_mode, > unsigned short vdd); > + struct gpio_desc *bus[6]; > }; > > /** > @@ -44,6 +45,7 @@ struct s3c24xx_mci_pdata { > * Copy the platform data supplied by @pdata so that this can be marked > * __initdata. > */ > +extern void s3c24xx_mci_def_set_power(unsigned char power_mode, unsigned short vdd); > extern void s3c24xx_mci_set_platdata(struct s3c24xx_mci_pdata *pdata); > > #endif /* _ARCH_NCI_H */ > -- > 2.20.0 >