From patchwork Thu Dec 6 12:08:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 10715679 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5899E18A7 for ; Thu, 6 Dec 2018 12:08:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 48A362D1D6 for ; Thu, 6 Dec 2018 12:08:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3D20C2D3F3; Thu, 6 Dec 2018 12:08:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 49BFB2D1D6 for ; Thu, 6 Dec 2018 12:08:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728648AbeLFMIZ (ORCPT ); Thu, 6 Dec 2018 07:08:25 -0500 Received: from mail-lj1-f195.google.com ([209.85.208.195]:36089 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727832AbeLFMIZ (ORCPT ); Thu, 6 Dec 2018 07:08:25 -0500 Received: by mail-lj1-f195.google.com with SMTP id g11-v6so204336ljk.3 for ; Thu, 06 Dec 2018 04:08:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=L6jNYHUkQQMTlGDs6D0jAdrLaNQTpFUj9XIm9ktNv5s=; b=aaMTubaIleHv9ps6shLjd/KXF6vr9rxo5TE74cOwMVwimAEHOoTYsTbz/m6Z8Xv+lf QKP1ElwMS6CUrzqQKABg9Cslb8cT+1qVCCT9eTX7hFt/C/DHnlkPVbr2YhMC+GcpgTuF trg7yU1vX9yjIRhUo/RRVWMmaLQONVxjFebuA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=L6jNYHUkQQMTlGDs6D0jAdrLaNQTpFUj9XIm9ktNv5s=; b=QadCdCRBexNX9YaZtXB7rtntERcd54uo7NSMAji8PPwxOl5g3GYkE9r/xjmu/F/FVo NBWAhbTcgDUAsyRFNUeGgVn4B0iUoRYXVaAdQlMUVYNIjOeDD92l7soZFi8zCS1G/0O1 HlChzVQF7Wee6XyfII+MS3Q/PQ2xydr/AAq8Va4uwOZhUTWygVTX4NpPxDks+WrmSOfX GWkDQRY0HOE4KHUUEJesQyW6Mksj6NJ9g/qO2CzekVhcNI9fjKNgU+1nFnKZOmBgKclR nx7LzPuqLfJp4w3racgD37G4vwWczSvU26qWtj4OVevj/GvOaAy05E32RknglWGXEHAt EYKw== X-Gm-Message-State: AA+aEWbnC2AsLs29r4P01/JLv5XLLoQRkVQgJoFPkWOAG5J2F23H+nRV ZvGjMc8IqCRo2h6jROW8OhWHYG4RxdI5Cw== X-Google-Smtp-Source: AFSGD/VYP/JcjkfuYsStn5yFrPYR0AVR3YuCtyDBKR3zqunB7xdeN38kssjCaDnwt/zwJZ2qNgxD8A== X-Received: by 2002:a2e:9107:: with SMTP id m7-v6mr18346177ljg.23.1544098102800; Thu, 06 Dec 2018 04:08:22 -0800 (PST) Received: from genomnajs.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id y12-v6sm29578ljy.76.2018.12.06.04.08.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 06 Dec 2018 04:08:21 -0800 (PST) From: Linus Walleij To: linux-mmc@vger.kernel.org, Ulf Hansson Cc: Linus Walleij , Laurent Pinchart , Kuninori Morimoto Subject: [PATCH] sh: ecovec24: Fix an ifdef Date: Thu, 6 Dec 2018 13:08:17 +0100 Message-Id: <20181206120817.6151-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP I managed to put the ifdef/else statements wrong when registering the GPIO descriptor table for MMC CD/WP. Fixing it up! Cc: Laurent Pinchart Cc: Kuninori Morimoto Fixes: babd0b238d11 ("mmc: host: tmio: Use GPIO descriptors") Signed-off-by: Linus Walleij --- Ulf can you please apply this patch to the MMC "next" branch (if noone is objecting) as I made the error there. --- arch/sh/boards/mach-ecovec24/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c index af2c28946319..058b168bdf26 100644 --- a/arch/sh/boards/mach-ecovec24/setup.c +++ b/arch/sh/boards/mach-ecovec24/setup.c @@ -1460,9 +1460,9 @@ static int __init arch_setup(void) #if defined(CONFIG_MMC_SDHI) || defined(CONFIG_MMC_SDHI_MODULE) gpiod_add_lookup_table(&sdhi0_power_gpiod_table); gpiod_add_lookup_table(&sdhi0_gpio_table); -#endif #if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE) gpiod_add_lookup_table(&sdhi1_gpio_table); +#endif #endif return platform_add_devices(ecovec_devices,