From patchwork Sun Nov 17 11:04:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 21574 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f200.google.com (mail-ob0-f200.google.com [209.85.214.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 75D5E20299 for ; Sun, 17 Nov 2013 11:05:10 +0000 (UTC) Received: by mail-ob0-f200.google.com with SMTP id wm4sf706645obc.11 for ; Sun, 17 Nov 2013 03:05:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=HFqI704dfRQxh25lPuy4lQGQtCSFraQ5FHX7E08h4e4=; b=eSpE3w9rDrOmB86Qoix2ymLNJS3TM3bANC+jcYXstUrbQJAldfY7mowedn2rLZoBPZ brR3C8FedAfiVAV99weXQLGgFHnwvWSqUOyzhvcmy5OyP9U4ngEGttPcLjipEw+qpjF+ aJTuiqPYcxcAhKgvsoxoPtgWkZsPED2stejGcbgtKIzA2RlmHEVPH59t46605P0cFT4r +04P8hNhIYGLSo5JAkubniKV1thZy7JLYiR89ICVViqiqYzUCcz9IIUt/6AcLCufYdDI AuiYUbKLx807jK686opnAUP2zizGxZFxd4jjAKdv5wwwKRIwCJ52B1yMkSKPrYspUcz0 lsWw== X-Gm-Message-State: ALoCoQm+1EWDaawkOB87FWmavk6jp032jQQ1MD2m68f24nbxziVc6j0Czyd/NfyJINnY81f9/Txq X-Received: by 10.50.17.101 with SMTP id n5mr6884523igd.2.1384686310045; Sun, 17 Nov 2013 03:05:10 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.129.101 with SMTP id nv5ls2381885qeb.53.gmail; Sun, 17 Nov 2013 03:05:09 -0800 (PST) X-Received: by 10.52.103.35 with SMTP id ft3mr8341783vdb.5.1384686309947; Sun, 17 Nov 2013 03:05:09 -0800 (PST) Received: from mail-vb0-f51.google.com (mail-vb0-f51.google.com [209.85.212.51]) by mx.google.com with ESMTPS id sw5si5575608veb.61.2013.11.17.03.05.09 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 17 Nov 2013 03:05:09 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.51 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.51; Received: by mail-vb0-f51.google.com with SMTP id w5so3959092vbf.10 for ; Sun, 17 Nov 2013 03:05:09 -0800 (PST) X-Received: by 10.52.187.138 with SMTP id fs10mr8038753vdc.10.1384686309870; Sun, 17 Nov 2013 03:05:09 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp140391vcz; Sun, 17 Nov 2013 03:05:09 -0800 (PST) X-Received: by 10.180.78.165 with SMTP id c5mr13240606wix.3.1384686308916; Sun, 17 Nov 2013 03:05:08 -0800 (PST) Received: from mail-wg0-f42.google.com (mail-wg0-f42.google.com [74.125.82.42]) by mx.google.com with ESMTPS id ut3si4615186wjc.140.2013.11.17.03.05.08 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 17 Nov 2013 03:05:08 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.42 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=74.125.82.42; Received: by mail-wg0-f42.google.com with SMTP id k14so3554973wgh.5 for ; Sun, 17 Nov 2013 03:05:08 -0800 (PST) X-Received: by 10.180.24.137 with SMTP id u9mr13215323wif.5.1384686308507; Sun, 17 Nov 2013 03:05:08 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id fu1sm13156973wib.8.2013.11.17.03.05.07 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Nov 2013 03:05:07 -0800 (PST) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, Lee Jones Cc: devicetree@vger.kernel.org, Linus Walleij Subject: [PATCH 18/21] ARM: ux500: move snowball ethernet config to device tree Date: Sun, 17 Nov 2013 12:04:07 +0100 Message-Id: <1384686250-10542-19-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1384686250-10542-1-git-send-email-linus.walleij@linaro.org> References: <1384686250-10542-1-git-send-email-linus.walleij@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.51 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This transfers the muxing and biasing of the ethernet-related pins on the snowball over to the device tree. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-snowball.dts | 25 +++++++++++++++++++++++++ arch/arm/mach-ux500/board-mop500-pins.c | 4 ---- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts index 53febe58a1cb..4f5457a91589 100644 --- a/arch/arm/boot/dts/ste-snowball.dts +++ b/arch/arm/boot/dts/ste-snowball.dts @@ -130,6 +130,8 @@ interrupt-parent = <&gpio4>; vdd33a-supply = <&en_3v3_reg>; vddvario-supply = <&db8500_vape_reg>; + pinctrl-names = "default"; + pinctrl-0 = <ð_snowball_mode>; reg-shift = <1>; reg-io-width = <2>; @@ -348,6 +350,29 @@ }; pinctrl { + ethernet { + /* + * Mux in "SM" which is used for the + * SMSC911x Ethernet adapter + */ + eth_snowball_mode: eth_snowball { + snowball_mux { + ste,function = "sm"; + ste,pins = "sm_b_1"; + }; + /* LAN IRQ pin */ + snowball_cfg1 { + ste,pins = "GPIO140_B11"; + ste,config = <&in_nopull>; + }; + /* LAN reset pin */ + snowball_cfg2 { + ste,pins = "GPIO141_C12"; + ste,config = <&gpio_out_hi>; + }; + + }; + }; sdi0 { sdi0_default_mode: sdi0_default { snowball_mux { diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c index 71ee944ea70f..55da56e39974 100644 --- a/arch/arm/mach-ux500/board-mop500-pins.c +++ b/arch/arm/mach-ux500/board-mop500-pins.c @@ -302,12 +302,8 @@ static struct pinctrl_map __initdata snowball_pinmap[] = { /* Mux in SSP0 connected to AB8500, pull down RXD pin */ DB8500_MUX_HOG("ssp0_a_1", "ssp0"), DB8500_PIN_HOG("GPIO145_C13", pd), - /* Mux in "SM" which is used for the SMSC911x Ethernet adapter */ - DB8500_MUX_HOG("sm_b_1", "sm"), /* User LED */ DB8500_PIN_HOG("GPIO142_C11", gpio_out_hi), - /* Drive RSTn_LAN high */ - DB8500_PIN_HOG("GPIO141_C12", gpio_out_hi), /* Accelerometer/Magnetometer */ DB8500_PIN_HOG("GPIO163_C20", gpio_in_pu), /* ACCEL_IRQ1 */ DB8500_PIN_HOG("GPIO164_B21", gpio_in_pu), /* ACCEL_IRQ2 */