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: 425603 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D499C1400B7 for ; Tue, 6 Jan 2015 21:38:47 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754893AbbAFKiZ (ORCPT ); Tue, 6 Jan 2015 05:38:25 -0500 Received: from mail-we0-f179.google.com ([74.125.82.179]:53336 "EHLO mail-we0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754879AbbAFKiV (ORCPT ); Tue, 6 Jan 2015 05:38:21 -0500 Received: by mail-we0-f179.google.com with SMTP id q59so9302126wes.24; 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 Cc: Javier Martinez Canillas , Tomeu Vizoso , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Russell King , Stephen Warren , Thierry Reding , Alexandre Courbot , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@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> Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org 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>;