From patchwork Sat Sep 8 13:16:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 967622 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="WnLeXXqe"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 426vwS0zllz9s1x for ; Sat, 8 Sep 2018 23:16:52 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id E8A4DC21E3A; Sat, 8 Sep 2018 13:16:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 1CD32C21C38; Sat, 8 Sep 2018 13:16:43 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id BA863C21C38; Sat, 8 Sep 2018 13:16:41 +0000 (UTC) Received: from mail-it0-f68.google.com (mail-it0-f68.google.com [209.85.214.68]) by lists.denx.de (Postfix) with ESMTPS id 60CD6C21C2F for ; Sat, 8 Sep 2018 13:16:40 +0000 (UTC) Received: by mail-it0-f68.google.com with SMTP id f14-v6so24077729ita.4 for ; Sat, 08 Sep 2018 06:16:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=DoZoFzcT41po29/IA6DR63Teuj2hToFtpQFULoH92tY=; b=WnLeXXqeo4m3HqfTqBEBuLhIQcafidGXQL4HvQKcBuY3ybmlx3I2FEEBR/KASEivRY qYs8P4rlSVQu2PN+d/4X2Mrhh637Coly5ywWsmXbgq2hmXFW5Y154WKl61s5lEYfOXdI agyXf2KIvzH0HKiQrL4SQUMtJDjFyAMhJziPXEgSJz9S1RD/9ErdJZLYNYt14WSsOvPH gI7cyL4+iVQZcYlWBU8oZs6ASJtixhgNnXsYPQnVVBCwXzgSDUxtmRlVpel6T/aDw/Qd zmJHIZI0ergjzwhAgx7s7ntRzjolhs8nIxLdRsbOZGx6do/5blOK5kHuGq3Tol0vzkHk 7E8Q== 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; bh=DoZoFzcT41po29/IA6DR63Teuj2hToFtpQFULoH92tY=; b=tsdJv1NMg2W99bf5PO+yGAR+yfhSIDfTgKLx7Nihrc7ZnAaRpQzp2ydFJj4Vvdci3y 2zeOeL3/C+NkPViMMWhHKWPYgXEnEMtpZ5/RwsQ+6Vp/Rfyp7e8AE6aFK1QWgV8QZ28A HhD4HDzhgrOP2Wmq6nwqItf7eyfE/UcBl8WdRvogXa7ZUSMAnG3ALZeTy9CL9Keq5SDe /KfDPUrHfIS3ldH1pw2qADb3+85pVcJNxAgcg1RWKrJP53zicVDsHne0pKpncS+KqkLb 7n6H4dg4Xrx5X1u73e1rNnmzV9s/0sqLvGCPIhga1M833nYrdvJgVf6g00HYVVvomZC1 bEaw== X-Gm-Message-State: APzg51DS4PUfozMLW0+dmvI82DD5N3ZsA/pDiv6NNvNvVZnBfHMhjCNz VRWz9muq1wEbW5htcJ/1r1q0v5+QkwI= X-Google-Smtp-Source: ANB0VdY7LSHUpBalh7QMZYEeXXZwgJUWj1ixd0uNSRlCRWS2MN3Z9EGO36/Dn7EL/t1PUP0Rnj23kA== X-Received: by 2002:a24:cf06:: with SMTP id y6-v6mr11155698itf.5.1536412598736; Sat, 08 Sep 2018 06:16:38 -0700 (PDT) Received: from localhost.localdomain (c-75-73-34-135.hsd1.mn.comcast.net. [75.73.34.135]) by smtp.gmail.com with ESMTPSA id b129-v6sm8849508ioa.75.2018.09.08.06.16.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Sep 2018 06:16:38 -0700 (PDT) From: Adam Ford To: u-boot@lists.denx.de Date: Sat, 8 Sep 2018 08:16:23 -0500 Message-Id: <20180908131626.23203-1-aford173@gmail.com> X-Mailer: git-send-email 2.17.1 Cc: Kishon Vijay Abraham I Subject: [U-Boot] [PATCH V2 1/2] mmc: omap_mmc: Remove invert references X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" With DM_GPIO and DM_MMC translating GPIO_ACTIVE_LOW, any boards using the 'cd-invert' option will no longer need to do this. This patch removes the support for 'invert' from the MMC driver. Signed-off-by: Adam Ford --- V2: Don't include patch 1 with xlate. It is not apparently needed. Remove cd_inverted from omap_hsmmc_plat diff --git a/arch/arm/include/asm/omap_mmc.h b/arch/arm/include/asm/omap_mmc.h index 42ce8dcd6d..6d31cc4422 100644 --- a/arch/arm/include/asm/omap_mmc.h +++ b/arch/arm/include/asm/omap_mmc.h @@ -68,7 +68,6 @@ struct omap_hsmmc_plat { struct mmc_config cfg; struct hsmmc *base_addr; struct mmc *mmc; - bool cd_inverted; u32 controller_flags; const char *hw_rev; }; diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c index 8ab56d247d..e9786ec5bb 100644 --- a/drivers/mmc/omap_hsmmc.c +++ b/drivers/mmc/omap_hsmmc.c @@ -83,7 +83,6 @@ struct omap_hsmmc_data { #if CONFIG_IS_ENABLED(DM_MMC) struct gpio_desc cd_gpio; /* Change Detect GPIO */ struct gpio_desc wp_gpio; /* Write Protect GPIO */ - bool cd_inverted; #else int cd_gpio; int wp_gpio; @@ -1377,8 +1376,6 @@ static int omap_hsmmc_getcd(struct udevice *dev) if (value < 0) return 1; - if (priv->cd_inverted) - return !value; return value; } @@ -1860,10 +1857,6 @@ static int omap_hsmmc_ofdata_to_platdata(struct udevice *dev) } #endif -#ifdef OMAP_HSMMC_USE_GPIO - plat->cd_inverted = fdtdec_get_bool(fdt, node, "cd-inverted"); -#endif - return 0; } #endif @@ -1892,9 +1885,6 @@ static int omap_hsmmc_probe(struct udevice *dev) priv->base_addr = plat->base_addr; priv->controller_flags = plat->controller_flags; priv->hw_rev = plat->hw_rev; -#ifdef OMAP_HSMMC_USE_GPIO - priv->cd_inverted = plat->cd_inverted; -#endif #ifdef CONFIG_BLK mmc = plat->mmc; From patchwork Sat Sep 8 13:16:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 967623 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="CNsd9EXy"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 426vx228qBz9s1x for ; Sat, 8 Sep 2018 23:17:26 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id E4C74C21E4F; Sat, 8 Sep 2018 13:17:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id D287BC21E5B; Sat, 8 Sep 2018 13:16:53 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E9DD2C21E34; Sat, 8 Sep 2018 13:16:47 +0000 (UTC) Received: from mail-io1-f68.google.com (mail-io1-f68.google.com [209.85.166.68]) by lists.denx.de (Postfix) with ESMTPS id 78A17C21DD3 for ; Sat, 8 Sep 2018 13:16:43 +0000 (UTC) Received: by mail-io1-f68.google.com with SMTP id y3-v6so3607179ioc.5 for ; Sat, 08 Sep 2018 06:16:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ulgMVKFwNAh+c+NVLRs6viEj8Y3WCSNzZv0UVUoUs9s=; b=CNsd9EXyY9sqa3TFJMgBNHXjWdLbmfBpUSHaVReXO7R6Cu51qMp4iKGCPCTqKmFphM DSrld9DJt4C8dbdtm/0exW6uro9jM1Pa6oOO+cp2U4m0ASVpCW6R2LZvrij+4bzFRePS Z7UZOvfhxxSrSLQuRoOp75NjjxNZR3CMKo1sgAZeHYjL519BcPZA3WzgbhiYEqLmp1Eh cxtWCu8MOVAqkskCO5h7Wy1UWHjx3EaCJmcN+4s5jWoY4gMtS+/38BY2moZS6PbSYQEG V+WHyw8BuF3Kx2QxNvG/0uorgm+Ehg4tSFd4mvZPAbDH8Z+MLwESoH371AfYwZfsiUvW yOOA== 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:in-reply-to :references; bh=ulgMVKFwNAh+c+NVLRs6viEj8Y3WCSNzZv0UVUoUs9s=; b=Rg4iwvGgndtjK9m3gOgbZibDFKHodHQ45rqHDYsuyqiQW8MPMcssge5nwXFL4iWDuM w4FPNlD/luLJDbJd/D0fNYMVa5gzrtlsdGG3g6SDsn6CUW3SL+muPtL7Gi30AD6SsyMH A+m2lPdni6m5BGXCNsB+J81mvENj054bl7ZbMa8p0DFDDcuru4FRruRJLUDWrilSULOS 9qgA/V6o6gG2qKzVDIWbjFeK+oumouRud7SIFrsApb5w/WjiyXO13MejRzO9C2ycRcHs tDhPOBcz9a7EHpUowEGtmyN0aUaLPYrXGkDW3A5HVR9EIeWXbNyAwALoy6YRgNw7iAaC 9GIw== X-Gm-Message-State: APzg51A3f3AfQHNi3sWsXnJG1s+Ta+rp4YWP/6IRiIqE0hHG6UPM7TYQ F+Fb1WoTqCXuqKg/YZZhKVknFb6Yr6s= X-Google-Smtp-Source: ANB0VdbzZ20fPp7j2Dem6nr6mQo2fBCUXqyonWo3uKGZNJ3HFI1+3hQr3Q1FLhfnOlpGOugee7wY5w== X-Received: by 2002:a6b:d90b:: with SMTP id r11-v6mr9347142ioc.50.1536412601591; Sat, 08 Sep 2018 06:16:41 -0700 (PDT) Received: from localhost.localdomain (c-75-73-34-135.hsd1.mn.comcast.net. [75.73.34.135]) by smtp.gmail.com with ESMTPSA id b129-v6sm8849508ioa.75.2018.09.08.06.16.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Sep 2018 06:16:41 -0700 (PDT) From: Adam Ford To: u-boot@lists.denx.de Date: Sat, 8 Sep 2018 08:16:24 -0500 Message-Id: <20180908131626.23203-2-aford173@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180908131626.23203-1-aford173@gmail.com> References: <20180908131626.23203-1-aford173@gmail.com> Cc: Kishon Vijay Abraham I Subject: [U-Boot] [PATCH V2 2/2] ARM: DTS: various omap3: Remove cd-inverted from u-boot.dtsi X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" With the omap_mmc driver no longer supporting cd-inverted, this patch removes all these references since they are not needed. Signed-off-by: Adam Ford --- V2: No changes diff --git a/arch/arm/dts/am3517-evm-u-boot.dtsi b/arch/arm/dts/am3517-evm-u-boot.dtsi index c02beaad77..59df819f9d 100644 --- a/arch/arm/dts/am3517-evm-u-boot.dtsi +++ b/arch/arm/dts/am3517-evm-u-boot.dtsi @@ -10,10 +10,6 @@ }; }; -&mmc1 { - cd-inverted; -}; - &uart1 { reg-shift = <2>; }; diff --git a/arch/arm/dts/omap3-beagle-u-boot.dtsi b/arch/arm/dts/omap3-beagle-u-boot.dtsi index 094f9557b7..41beaf0900 100644 --- a/arch/arm/dts/omap3-beagle-u-boot.dtsi +++ b/arch/arm/dts/omap3-beagle-u-boot.dtsi @@ -11,10 +11,6 @@ }; }; -&mmc1 { - cd-inverted; -}; - &uart1 { reg-shift = <2>; }; diff --git a/arch/arm/dts/omap3-beagle-xm-ab-u-boot.dtsi b/arch/arm/dts/omap3-beagle-xm-ab-u-boot.dtsi index 094f9557b7..41beaf0900 100644 --- a/arch/arm/dts/omap3-beagle-xm-ab-u-boot.dtsi +++ b/arch/arm/dts/omap3-beagle-xm-ab-u-boot.dtsi @@ -11,10 +11,6 @@ }; }; -&mmc1 { - cd-inverted; -}; - &uart1 { reg-shift = <2>; }; diff --git a/arch/arm/dts/omap3-beagle-xm-u-boot.dtsi b/arch/arm/dts/omap3-beagle-xm-u-boot.dtsi index 094f9557b7..41beaf0900 100644 --- a/arch/arm/dts/omap3-beagle-xm-u-boot.dtsi +++ b/arch/arm/dts/omap3-beagle-xm-u-boot.dtsi @@ -11,10 +11,6 @@ }; }; -&mmc1 { - cd-inverted; -}; - &uart1 { reg-shift = <2>; }; diff --git a/arch/arm/dts/omap3-evm-37xx-u-boot.dtsi b/arch/arm/dts/omap3-evm-37xx-u-boot.dtsi index b09ce0efb5..de411316d8 100644 --- a/arch/arm/dts/omap3-evm-37xx-u-boot.dtsi +++ b/arch/arm/dts/omap3-evm-37xx-u-boot.dtsi @@ -11,10 +11,6 @@ }; }; -&mmc1 { - cd-inverted; -}; - &uart1 { reg-shift = <2>; }; diff --git a/arch/arm/dts/omap3-evm-u-boot.dtsi b/arch/arm/dts/omap3-evm-u-boot.dtsi index b09ce0efb5..de411316d8 100644 --- a/arch/arm/dts/omap3-evm-u-boot.dtsi +++ b/arch/arm/dts/omap3-evm-u-boot.dtsi @@ -11,10 +11,6 @@ }; }; -&mmc1 { - cd-inverted; -}; - &uart1 { reg-shift = <2>; };