From patchwork Tue Feb 4 19:52:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 24137 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f70.google.com (mail-pa0-f70.google.com [209.85.220.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 173BF202FA for ; Tue, 4 Feb 2014 19:53:10 +0000 (UTC) Received: by mail-pa0-f70.google.com with SMTP id kq14sf23716894pab.1 for ; Tue, 04 Feb 2014 11:53: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=U/yANWeZb1x+dCRPjzj1N+IKjTKoec3bmH5lsmzflrs=; b=NuzzrAIJVqsGgUwjE81UG9g5rWggU1gtcg7nIXZR3Ss7Sj0M+kncv6YfNTZx1ul/K9 8c3Hm4Kot8Eoo7boXs+eDLsdi/wYk0uCWsafvkftMF2uuDBBJ+90zEUCdkDdoMtPdEWN 2fAlZx4UsKJ/0AbMKiJUfHcabadks1s+X8/qBmXK7LWdAXM+5SsaU6o+blMSntExwRdu 98fjQ7E8q8NTPzJohobgbFONbM1ZUfhoxiu/orhU+qrpsEHHQmdOORpjt0LnlZeww0Vo 8v1J3UhF4fITdLZPHo4qsW4Rxoe2vxRu0QOrEIN0FbXBKj3+RvpQZk8A0E9R5acx+QJ2 yZKQ== X-Gm-Message-State: ALoCoQlgLgIUH2dcMBdKSbAs0jqwBeY/k244F2e5eSUC8Qm7REI3/rUdZr8csXladhq83LKsdi4c X-Received: by 10.66.8.234 with SMTP id u10mr5457718paa.40.1391543590263; Tue, 04 Feb 2014 11:53:10 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.31.72 with SMTP id e66ls2431381qge.67.gmail; Tue, 04 Feb 2014 11:53:10 -0800 (PST) X-Received: by 10.58.90.202 with SMTP id by10mr32947898veb.6.1391543590141; Tue, 04 Feb 2014 11:53:10 -0800 (PST) Received: from mail-vb0-f47.google.com (mail-vb0-f47.google.com [209.85.212.47]) by mx.google.com with ESMTPS id ny8si1355230vcb.144.2014.02.04.11.53.10 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Feb 2014 11:53:10 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.47 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.47; Received: by mail-vb0-f47.google.com with SMTP id p6so6047556vbe.20 for ; Tue, 04 Feb 2014 11:53:10 -0800 (PST) X-Received: by 10.220.103.141 with SMTP id k13mr7286086vco.25.1391543590064; Tue, 04 Feb 2014 11:53:10 -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 u4csp270688vcz; Tue, 4 Feb 2014 11:53:09 -0800 (PST) X-Received: by 10.194.192.233 with SMTP id hj9mr1842552wjc.78.1391543589093; Tue, 04 Feb 2014 11:53:09 -0800 (PST) Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com [74.125.82.45]) by mx.google.com with ESMTPS id fq9si7477067wib.64.2014.02.04.11.53.08 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Feb 2014 11:53:09 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.45 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=74.125.82.45; Received: by mail-wg0-f45.google.com with SMTP id n12so13128557wgh.0 for ; Tue, 04 Feb 2014 11:53:08 -0800 (PST) X-Received: by 10.194.22.129 with SMTP id d1mr30118713wjf.22.1391543588672; Tue, 04 Feb 2014 11:53:08 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id fb8sm38716314wic.3.2014.02.04.11.53.07 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Feb 2014 11:53:07 -0800 (PST) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Cc: Linus Walleij , Patrice Chotard , Lee Jones Subject: [PATCH 08/10] ARM: ux500: move AB8500 modem I2C settings to DT Date: Tue, 4 Feb 2014 20:52:24 +0100 Message-Id: <1391543546-11158-8-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1391543546-11158-1-git-send-email-linus.walleij@linaro.org> References: <1391543546-11158-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.47 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 moves the pin setup of the AB8500 modem I2C pins (SCL/SDA) from the board file to the device tree. Cc: Patrice Chotard Cc: Lee Jones Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-href-ab8500.dtsi | 18 +++++++++++++++++- arch/arm/mach-ux500/board-mop500-pins.c | 8 -------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/ste-href-ab8500.dtsi b/arch/arm/boot/dts/ste-href-ab8500.dtsi index beb59f99eff8..333b554c0bf7 100644 --- a/arch/arm/boot/dts/ste-href-ab8500.dtsi +++ b/arch/arm/boot/dts/ste-href-ab8500.dtsi @@ -37,7 +37,8 @@ <&adi1_default_mode>, <&usbuicc_default_mode>, <&dmic_default_mode>, - <&extcpena_default_mode>; + <&extcpena_default_mode>, + <&modsclsda_default_mode>; /* * Pins 2, 4, 10, 11, 12, 13, 16, 24, 25, 36, 37, 38, 39 and 42 @@ -354,6 +355,21 @@ }; }; }; + /* Modem I2C setup (SCL and SDA pins) */ + modsclsda { + modsclsda_default_mode: modsclsda_default { + default_mux { + ste,function = "modsclsda"; + ste,pins = "modsclsda_d_1"; + }; + default_cfg { + ste,pins = "GPIO40_T19", + "GPIO41_U19"; + input-enable; + bias-pull-down; + }; + }; + }; }; }; }; diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c index bbd5bc56f7f0..cbe91714f57f 100644 --- a/arch/arm/mach-ux500/board-mop500-pins.c +++ b/arch/arm/mach-ux500/board-mop500-pins.c @@ -55,14 +55,6 @@ static struct pinctrl_map __initdata ab8500_pinmap[] = { /* sysclkreq4 disable, mux in gpio configured in input pulldown */ AB8500_MUX_STATE("gpio3_a_1", "gpio", "regulator.36", PINCTRL_STATE_SLEEP), AB8500_PIN_STATE("GPIO3_U9", in_pd, "regulator.36", PINCTRL_STATE_SLEEP), - - /* - * pins 40 and 41 are muxed in MODCSLSDA - * configured INPUT PULL DOWN - */ - AB8500_MUX_HOG("modsclsda_d_1", "modsclsda"), - AB8500_PIN_HOG("GPIO40_T19", in_pd), - AB8500_PIN_HOG("GPIO41_U19", in_pd), }; static struct pinctrl_map __initdata ab8505_pinmap[] = {