From patchwork Tue Jan 6 10:37:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 5572511 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E256EBF6C3 for ; Tue, 6 Jan 2015 10:41:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0AE8F201DD for ; Tue, 6 Jan 2015 10:41:26 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 39CB5201BC for ; Tue, 6 Jan 2015 10:41:25 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Y8RXu-0007Ww-Ar; Tue, 06 Jan 2015 10:39:30 +0000 Received: from mail-wi0-x234.google.com ([2a00:1450:400c:c05::234]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Y8RXA-000715-DN for linux-arm-kernel@lists.infradead.org; Tue, 06 Jan 2015 10:38:45 +0000 Received: by mail-wi0-f180.google.com with SMTP id n3so5062413wiv.1 for ; Tue, 06 Jan 2015 02:38:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=WFikls6ut3BNLHpOl5nN9mdQinhCfwTp2OilI2jL9xo=; b=X2InyqLONpbwMTXywun/s1xnEiRXmpFe/6AbBa9pnYg3vcrTIOZRfcCJBa1Kjtjq7k 8AN9gArecRL9kAftg/I2I1WOIPJibBeKV+BBF7Kst7TZNJqoT37Ywvvo2ZYIUcGRPJOd R3nhUvI2WJT3sBoM3Xq6229R/RPwT64Op4LirUYDXSqxGfDk7ZP9ZQcqmSljdsUGsUHd hcbiyW0lBXBhTFZ98upzEKcNgQMMuQ6qFCO+SaqpXsP98gKfX4E3XKcBiG9IU4Jnxrpc BjSIOMYSeF/br+m50/NCAZSPZBmFC+lA0Bzd0wQXw1UMho7j6l7/rTU/iRk0zFOVD5j9 v0AA== X-Received: by 10.194.9.4 with SMTP id v4mr23958565wja.115.1420540700519; Tue, 06 Jan 2015 02:38:20 -0800 (PST) Received: from cizrna.lan (37-48-36-73.tmcz.cz. [37.48.36.73]) by mx.google.com with ESMTPSA id i3sm13388982wie.23.2015.01.06.02.38.17 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Jan 2015 02:38:19 -0800 (PST) From: Tomeu Vizoso To: linux-tegra@vger.kernel.org Subject: [PATCH 4/4] ARM: tegra: remove wp-gpios from the generic nyan dtsi Date: Tue, 6 Jan 2015 11:37:29 +0100 Message-Id: <1420540653-14816-5-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1420540653-14816-1-git-send-email-tomeu.vizoso@collabora.com> References: <1420540653-14816-1-git-send-email-tomeu.vizoso@collabora.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150106_023844_645909_6D98CC79 X-CRM114-Status: GOOD ( 10.54 ) X-Spam-Score: -0.7 (/) Cc: Mark Rutland , Alexandre Courbot , Russell King , Tomeu Vizoso , Pawel Moll , Ian Campbell , Stephen Warren , linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Rob Herring , Thierry Reding , Kumar Gala , Javier Martinez Canillas , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP As the nyan-blaze has a micro-sd slot, as opposed to nyan-big, which has a full SD slot. Signed-off-by: Tomeu Vizoso --- arch/arm/boot/dts/tegra124-nyan-big.dts | 4 ++++ arch/arm/boot/dts/tegra124-nyan.dtsi | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/tegra124-nyan-big.dts b/arch/arm/boot/dts/tegra124-nyan-big.dts index 2041077..598c090 100644 --- a/arch/arm/boot/dts/tegra124-nyan-big.dts +++ b/arch/arm/boot/dts/tegra124-nyan-big.dts @@ -6,6 +6,10 @@ model = "Acer Chromebook 13 CB5-311"; compatible = "google,nyan-big", "google,nyan", "nvidia,tegra124"; + sdhci@0,700b0400 { /* SD Card on this bus */ + wp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_LOW>; + }; + sound { nvidia,model = "Acer Chromebook 13 CB5-311"; }; diff --git a/arch/arm/boot/dts/tegra124-nyan.dtsi b/arch/arm/boot/dts/tegra124-nyan.dtsi index 4c68658..12d757e 100644 --- a/arch/arm/boot/dts/tegra124-nyan.dtsi +++ b/arch/arm/boot/dts/tegra124-nyan.dtsi @@ -820,7 +820,6 @@ status = "okay"; cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>; power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>; - wp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_LOW>; bus-width = <4>; no-1-8-v; vqmmc-supply = <&vddio_sdmmc3>;