From patchwork Thu Oct 10 20:30:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 175873 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp2815341ill; Thu, 10 Oct 2019 13:50:03 -0700 (PDT) X-Google-Smtp-Source: APXvYqzUJFvYzRDbJd5r7gPlYfa2hHN3NtHjxHWPfNcLqfvSIKZ7NCG3YHKjv6dwDeJ7auPqxQRU X-Received: by 2002:a17:906:a38e:: with SMTP id k14mr7916614ejz.253.1570740603126; Thu, 10 Oct 2019 13:50:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570740603; cv=none; d=google.com; s=arc-20160816; b=t3oK35XyaZN45AK3PtYh4s6gmgpXGm0x+wMJeEQZRpKcOSAq2ZMIRYs6/xM+onhbP+ MX5RUQ5TZ8l6z7BpmlL1A5yXT0RAoVyQv4Ip4vqUTo7+ImlbvdRmcrU6CwIrw9+J9lOX Mxnr0fM8pLsLI5pyiT6nh8m9D1X9jSK+JIxko8KusmXydWDWsFfRTXDA52ZuIFMIDVT8 Oqj1E5WYcPsYGdi/qoaPvQ6Mmx2uyYGQlNTiU0RHcxThFA4KumB2d9yjRsN8D5WvW2x1 aS1mt9WNOdXVXgYSe2mFkmSqKW2NiTjaAf8jPV44yKC/XHIikmpQ2JC4xyIfhld/IKQp /wlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=SXYg6CzHPSIzPbxvtv2BV8tLN36G87ufH+e8Hr8Vw8Q=; b=dSe78gleQV6Tb7jwb9htRaqg7iMt0HCyl+k33/0t+CKqzIlA0t/gSzQ8Okak/PRPmm ucwpnJEJAL8WkCrJTemH4ExQGqTlLQ9DwXUP/nobzvaDNj2lvGAijZAa9rFt4Nwz28rI k4/Tnd4zRUZtIPkWnAGZhEWYprRm+eTtrfguNfxapt2vuO7iV+oHPnEan0Ow9Pw5eMd2 /ka2xIJij1B6Yz1iN6uVp1rNe46g2olXgBkwfKMzjDU9FZumltjbPtHX0/IuN7F+agNW BhHS/5T7/pMwxVhi1+jMtH+41/DWxjLDYwkvKS0sFLRPUOkjIdce35duKt9dfClX6GKx BLLw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-samsung-soc-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g38si4454495edg.127.2019.10.10.13.50.02; Thu, 10 Oct 2019 13:50:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-samsung-soc-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727189AbfJJUuC (ORCPT + 3 others); Thu, 10 Oct 2019 16:50:02 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:52031 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725867AbfJJUuC (ORCPT ); Thu, 10 Oct 2019 16:50:02 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.129]) with ESMTPA (Nemesis) id 1Mv3M8-1i100L05ya-00r230; Thu, 10 Oct 2019 22:49:49 +0200 From: Arnd Bergmann To: Kukjin Kim , Krzysztof Kozlowski Cc: linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linus.walleij@linaro.org, Arnd Bergmann , Jaehoon Chung , Sylwester Nawrocki , Sergio Prado , Ulf Hansson , linux-kernel@vger.kernel.org Subject: [PATCH 27/36] ARM: s3c: fix mmc gpio lookup tables Date: Thu, 10 Oct 2019 22:30:11 +0200 Message-Id: <20191010203043.1241612-27-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20191010203043.1241612-1-arnd@arndb.de> References: <20191010202802.1132272-1-arnd@arndb.de> <20191010203043.1241612-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:miEEBn8EyX3iXwAoHLbyo0Rw0t54e4gFtO4RuqFzuUUZsdSYYFe mkYXMoFATZbZnQ2AfYowuUP0fX+ZeGzayu62CMMllRNxC7eRWkNDSvECtwhssqt/cuhlHif lc6V7Z+awRWzKiKiG3VAE/QPRyGYyTVbjxGiVwQ1ROxYKb3Z+z+lhdpcJXOYpxsADIWDkFe 1OgpbGkn+Mj6daDqqBDJQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:dpz0F10rdwI=:gmQ4hYjc+doONpW56zCV1G duTMmQ1Tm+ujSzt1fdGRjwhjXsUNt0bWwVVQU3e4kieVQYr6zzVTmQhNADmMr+zmqbSaXkFHY wM0nBs4lSyLwzEdKXSmybyeBMfSyqSAYGyf3gDrQ6z1LKZOIA7z8kNsLyvzn4lSRlB9pyWXgl kFo8IHBIIk0YixwQj6UB3RFkmm5O5X1rrOwcJEinLRdvvciFLqajbFpSGq3K5eY+pMm9tVYmV VInU+edA8Qv8N7PLcHnIqRX+OtUEhgYp2HIc3+HSjAfbSMwnCptI+GqC8bb+WjYrolz5d+iyK fBCty6rdXpG+DpiKyyr5rhQOuuf/KTrIAD2Wnph1Gl4xxQZn67jAZrM4VFpkZYdcMU6bH3kUY T8T3yBrxIcGpeasXYxVh1lyfS/WO/18LZ19MM8jjPGnMyNj8Os4ja9Q9JmgKbrXj2WvuL3h7H NwqR6SiJUy62gadTpK1gy7hF1NMaEFKwZlK1KT6+D5RPAic95Mf+xI11Vtbl8uhuXAK+1CBsk 5iiwUMNIXwk5FWQrnoBhH6PVWyUlogHhNAgOJ8bS4G53Y2Ak21dmJoBj4dL0Jp4hnYDfV6ps4 WoqLWNZkJcizg+W+w59NVyWSdRjZctWCokmYIyIz11BtlzM70VKDPhfgJsLEXRasa7M2J5yIr w3xs73amS0zikViui4mN862kG8mfSsKNoC0YBxGbWKZewd6qUM+qnsTHS7F5TK2ImJEMAs6ya 868k4DO2Tmhv5usrXry8JINWNWVZrE+W/iV0CetPkSYT5z8lexHi+hHg1EzZRSm1f12Kz/Qwa Ynit5/TE1rRLFDe8NHWCsn1eUxf80G7wcieXmFGgXPb7b5JPDRs5pxNqe3rEoFbrW0TM5Ic5+ dDnV2mMl4vG6j9O3beMA== Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org The gpio controller names differ between s3c24xx and s3c64xx, and it seems that these all got the wrong names, using GPx instead of GPIOx. Fixes: d2951dfa070d ("mmc: s3cmci: Use the slot GPIO descriptor") Signed-off-by: Arnd Bergmann --- arch/arm/mach-s3c24xx/mach-at2440evb.c | 2 +- arch/arm/mach-s3c24xx/mach-h1940.c | 4 ++-- arch/arm/mach-s3c24xx/mach-mini2440.c | 4 ++-- arch/arm/mach-s3c24xx/mach-n30.c | 4 ++-- arch/arm/mach-s3c24xx/mach-rx1950.c | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) -- 2.20.0 diff --git a/arch/arm/mach-s3c24xx/mach-at2440evb.c b/arch/arm/mach-s3c24xx/mach-at2440evb.c index 3a793aaf2cba..b2199906e678 100644 --- a/arch/arm/mach-s3c24xx/mach-at2440evb.c +++ b/arch/arm/mach-s3c24xx/mach-at2440evb.c @@ -143,7 +143,7 @@ static struct gpiod_lookup_table at2440evb_mci_gpio_table = { .dev_id = "s3c2410-sdi", .table = { /* Card detect S3C2410_GPG(10) */ - GPIO_LOOKUP("GPG", 10, "cd", GPIO_ACTIVE_LOW), + GPIO_LOOKUP("GPIOG", 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), diff --git a/arch/arm/mach-s3c24xx/mach-h1940.c b/arch/arm/mach-s3c24xx/mach-h1940.c index 24f785da7659..446891e23511 100644 --- a/arch/arm/mach-s3c24xx/mach-h1940.c +++ b/arch/arm/mach-s3c24xx/mach-h1940.c @@ -469,9 +469,9 @@ static struct gpiod_lookup_table h1940_mmc_gpio_table = { .dev_id = "s3c2410-sdi", .table = { /* Card detect S3C2410_GPF(5) */ - GPIO_LOOKUP("GPF", 5, "cd", GPIO_ACTIVE_LOW), + GPIO_LOOKUP("GPIOF", 5, "cd", GPIO_ACTIVE_LOW), /* Write protect S3C2410_GPH(8) */ - GPIO_LOOKUP("GPH", 8, "wp", GPIO_ACTIVE_LOW), + GPIO_LOOKUP("GPIOH", 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), diff --git a/arch/arm/mach-s3c24xx/mach-mini2440.c b/arch/arm/mach-s3c24xx/mach-mini2440.c index 5c000efdf0e8..d73167f615b8 100644 --- a/arch/arm/mach-s3c24xx/mach-mini2440.c +++ b/arch/arm/mach-s3c24xx/mach-mini2440.c @@ -244,9 +244,9 @@ static struct gpiod_lookup_table mini2440_mmc_gpio_table = { .dev_id = "s3c2410-sdi", .table = { /* Card detect S3C2410_GPG(8) */ - GPIO_LOOKUP("GPG", 8, "cd", GPIO_ACTIVE_LOW), + GPIO_LOOKUP("GPIOG", 8, "cd", GPIO_ACTIVE_LOW), /* Write protect S3C2410_GPH(8) */ - GPIO_LOOKUP("GPH", 8, "wp", GPIO_ACTIVE_HIGH), + GPIO_LOOKUP("GPIOH", 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), diff --git a/arch/arm/mach-s3c24xx/mach-n30.c b/arch/arm/mach-s3c24xx/mach-n30.c index 8d7ad61e9930..f283abab0761 100644 --- a/arch/arm/mach-s3c24xx/mach-n30.c +++ b/arch/arm/mach-s3c24xx/mach-n30.c @@ -362,9 +362,9 @@ static struct gpiod_lookup_table n30_mci_gpio_table = { .dev_id = "s3c2410-sdi", .table = { /* Card detect S3C2410_GPF(1) */ - GPIO_LOOKUP("GPF", 1, "cd", GPIO_ACTIVE_LOW), + GPIO_LOOKUP("GPIOF", 1, "cd", GPIO_ACTIVE_LOW), /* Write protect S3C2410_GPG(10) */ - GPIO_LOOKUP("GPG", 10, "wp", GPIO_ACTIVE_LOW), + GPIO_LOOKUP("GPIOG", 10, "wp", GPIO_ACTIVE_LOW), { }, /* bus pins */ GPIO_LOOKUP_IDX("GPIOE", 5, "bus", 0, GPIO_ACTIVE_HIGH), diff --git a/arch/arm/mach-s3c24xx/mach-rx1950.c b/arch/arm/mach-s3c24xx/mach-rx1950.c index 820e626f5129..7752203fd9cd 100644 --- a/arch/arm/mach-s3c24xx/mach-rx1950.c +++ b/arch/arm/mach-s3c24xx/mach-rx1950.c @@ -569,9 +569,9 @@ static struct gpiod_lookup_table rx1950_mmc_gpio_table = { .dev_id = "s3c2410-sdi", .table = { /* Card detect S3C2410_GPF(5) */ - GPIO_LOOKUP("GPF", 5, "cd", GPIO_ACTIVE_LOW), + GPIO_LOOKUP("GPIOF", 5, "cd", GPIO_ACTIVE_LOW), /* Write protect S3C2410_GPH(8) */ - GPIO_LOOKUP("GPH", 8, "wp", GPIO_ACTIVE_LOW), + GPIO_LOOKUP("GPIOH", 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),