From patchwork Sun Nov 17 11:04:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 21575 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 8193020299 for ; Sun, 17 Nov 2013 11:05:12 +0000 (UTC) Received: by mail-ob0-f200.google.com with SMTP id wm4sf713032obc.3 for ; Sun, 17 Nov 2013 03:05:12 -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=/jdihSyuk1MMv20CzrbNHW+bU5vJ/HF/3Bp6SwxGH0c=; b=M3YaciSK8J8hrZeb0FP+u+U9+vYsB+QJ5U+e9BYY1PZQiZao97XgUeu5uGm/4xJJAE dO7twTgEPb7D3AZJV0RUEEsQHNlhqvavmACTjhAj3xvx2n65+QP3jg6Q0Z7D3nJqyykY V9DWi+bPKXdtIAMdIGsvDH8yyKh0pyVTm7EUpyC3UZEewbcuwMX9GyL0BJp7b6JjfYpn JAC9WQOYUj2YJpPSzvuvHSScnmC2tYchxUWkiPRD+sSVI6R6+JL35EzfInlv/zp7xs8v T9CPd0lZALlSUPBZTp0Ts+zKC8IHqvM0ncxXlrMTb3RUVEzbG2DCw4lwJ09rQ/tqX62n O0Uw== X-Gm-Message-State: ALoCoQlOW0ZSwhtBibiOOu/7Mom4obydPxxZr9XQBlqDBFCaoQFu9CLf0eEZhcG7ClR+ybJtBEFz X-Received: by 10.182.158.4 with SMTP id wq4mr6651934obb.18.1384686312108; Sun, 17 Nov 2013 03:05:12 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.12.231 with SMTP id b7ls2240455qec.55.gmail; Sun, 17 Nov 2013 03:05:12 -0800 (PST) X-Received: by 10.52.157.232 with SMTP id wp8mr8281836vdb.4.1384686312007; Sun, 17 Nov 2013 03:05:12 -0800 (PST) Received: from mail-vb0-f46.google.com (mail-vb0-f46.google.com [209.85.212.46]) by mx.google.com with ESMTPS id o7si5552701vcl.135.2013.11.17.03.05.11 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 17 Nov 2013 03:05:12 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.46 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.46; Received: by mail-vb0-f46.google.com with SMTP id i3so1969273vbh.33 for ; Sun, 17 Nov 2013 03:05:11 -0800 (PST) X-Received: by 10.52.168.106 with SMTP id zv10mr5770122vdb.21.1384686311937; Sun, 17 Nov 2013 03:05:11 -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 u4csp140397vcz; Sun, 17 Nov 2013 03:05:11 -0800 (PST) X-Received: by 10.180.198.79 with SMTP id ja15mr12954712wic.36.1384686311162; Sun, 17 Nov 2013 03:05:11 -0800 (PST) Received: from mail-we0-f172.google.com (mail-we0-f172.google.com [74.125.82.172]) by mx.google.com with ESMTPS id hk7si4650211wjb.15.2013.11.17.03.05.10 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 17 Nov 2013 03:05:11 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.172 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=74.125.82.172; Received: by mail-we0-f172.google.com with SMTP id t60so146966wes.3 for ; Sun, 17 Nov 2013 03:05:10 -0800 (PST) X-Received: by 10.180.183.11 with SMTP id ei11mr13106093wic.10.1384686310755; Sun, 17 Nov 2013 03:05:10 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id fu1sm13156973wib.8.2013.11.17.03.05.09 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Nov 2013 03:05:10 -0800 (PST) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, Lee Jones Cc: devicetree@vger.kernel.org, Linus Walleij Subject: [PATCH 19/21] ARM: ux500: convert Snowball SPI pin reference Date: Sun, 17 Nov 2013 12:04:08 +0100 Message-Id: <1384686250-10542-20-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.46 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: , The SPI0 block is not at all connected to the AB8500 on the Snowball: it is connected to the external header. These pins on the header may also be used for GPIO, but let's assume that SPI is a probable usecase on the Snowball and mux in the SPI block and use these for SPI. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-snowball.dts | 28 ++++++++++++++++++++++++++++ arch/arm/mach-ux500/board-mop500-pins.c | 5 ----- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts index 4f5457a91589..744ab956059a 100644 --- a/arch/arm/boot/dts/ste-snowball.dts +++ b/arch/arm/boot/dts/ste-snowball.dts @@ -248,6 +248,11 @@ pinctrl-1 = <&i2c3_sleep_mode>; }; + ssp@80002000 { + pinctrl-names = "default"; + pinctrl-0 = <&ssp0_snowball_mode>; + }; + cpufreq-cooling { status = "okay"; }; @@ -386,6 +391,29 @@ }; }; + ssp0 { + ssp0_snowball_mode: ssp0_snowball_default { + snowball_mux { + ste,function = "ssp0"; + ste,pins = "ssp0_a_1"; + }; + snowball_cfg1 { + ste,pins = "GPIO144_B13"; /* FRM */ + ste,config = <&gpio_out_hi>; + }; + snowball_cfg2 { + ste,pins = "GPIO145_C13"; /* RXD */ + ste,config = <&in_pd>; + }; + snowball_cfg3 { + ste,pins = + "GPIO146_D13", /* TXD */ + "GPIO143_D12"; /* CLK */ + ste,config = <&out_lo>; + }; + + }; + }; }; mcde@a0350000 { diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c index 55da56e39974..0e5d2684bc9a 100644 --- a/arch/arm/mach-ux500/board-mop500-pins.c +++ b/arch/arm/mach-ux500/board-mop500-pins.c @@ -19,8 +19,6 @@ /* These simply sets bias for pins */ #define BIAS(a,b) static unsigned long a[] = { b } -BIAS(pd, PIN_PULL_DOWN); - BIAS(abx500_out_lo, PIN_CONF_PACKED(PIN_CONFIG_OUTPUT, 0)); BIAS(abx500_in_pd, PIN_CONF_PACKED(PIN_CONFIG_BIAS_PULL_DOWN, 1)); BIAS(abx500_in_nopull, PIN_CONF_PACKED(PIN_CONFIG_BIAS_PULL_DOWN, 0)); @@ -299,9 +297,6 @@ static struct pinctrl_map __initdata ab8505_pinmap[] = { }; 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), /* User LED */ DB8500_PIN_HOG("GPIO142_C11", gpio_out_hi), /* Accelerometer/Magnetometer */