From patchwork Tue Feb 4 19:52:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 24133 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f197.google.com (mail-vc0-f197.google.com [209.85.220.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1E5F5202FA for ; Tue, 4 Feb 2014 19:53:04 +0000 (UTC) Received: by mail-vc0-f197.google.com with SMTP id hq11sf22897417vcb.4 for ; Tue, 04 Feb 2014 11:53:03 -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=bM2vcSoKikS+5lD3N7Y3A9xYGmq63WE6ZO5VcnUFHbE=; b=kqb1mEUddD3e5MDqtXU9TlZx5HzoNGAqiWv3C2a/kEtZv0axRwJdvCKxPzeHaQKOyN u949xJGJZY2Zd+b+RUySn4GiVgvDfapj0OAWenJcv81wk+NQLjRvSvrkdOXP1+zbU1tO AbPUbUSiJ9iCfRwQea2RqNQ2PlO7lU+0k2VTfDMQno5SxtT25VE1nyBYugFmbhr9t6b/ uN4zTX2OKQQqYHffvqCJu1ST8EPFRu3xfPZ2yq1E0ZZffyA/IUinnTqxAZcPkS9cSwww jBnNlXi3z0ZoiFTK96vj3eDKqQIHKKsBOljtDKmABZIVu8eLSIEYluyspXLb+3zh3UT2 lsAQ== X-Gm-Message-State: ALoCoQkPhUnFL1FDAZ1gcs3OzvRP+4GsH3pliVl+kVq8XHTb7RBPAtgHLvebTkdE6lxtDGnyVw26 X-Received: by 10.236.19.36 with SMTP id m24mr505048yhm.14.1391543583249; Tue, 04 Feb 2014 11:53:03 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.108.73 with SMTP id i67ls2442521qgf.3.gmail; Tue, 04 Feb 2014 11:53:03 -0800 (PST) X-Received: by 10.58.168.142 with SMTP id zw14mr1560783veb.33.1391543583182; Tue, 04 Feb 2014 11:53:03 -0800 (PST) Received: from mail-vb0-f52.google.com (mail-vb0-f52.google.com [209.85.212.52]) by mx.google.com with ESMTPS id a8si3598670vej.17.2014.02.04.11.53.03 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Feb 2014 11:53:03 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.52 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.52; Received: by mail-vb0-f52.google.com with SMTP id p14so6018342vbm.39 for ; Tue, 04 Feb 2014 11:53:03 -0800 (PST) X-Received: by 10.52.244.102 with SMTP id xf6mr1182642vdc.42.1391543582865; Tue, 04 Feb 2014 11:53:02 -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 u4csp270675vcz; Tue, 4 Feb 2014 11:53:02 -0800 (PST) X-Received: by 10.194.175.66 with SMTP id by2mr2938504wjc.59.1391543581900; Tue, 04 Feb 2014 11:53:01 -0800 (PST) Received: from mail-wg0-f49.google.com (mail-wg0-f49.google.com [74.125.82.49]) by mx.google.com with ESMTPS id fm9si7483730wib.28.2014.02.04.11.53.01 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Feb 2014 11:53:01 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.49 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=74.125.82.49; Received: by mail-wg0-f49.google.com with SMTP id a1so13637354wgh.16 for ; Tue, 04 Feb 2014 11:53:01 -0800 (PST) X-Received: by 10.180.91.164 with SMTP id cf4mr7401552wib.37.1391543581205; Tue, 04 Feb 2014 11:53:01 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id fb8sm38716314wic.3.2014.02.04.11.52.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Feb 2014 11:53:00 -0800 (PST) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Cc: Linus Walleij , Patrice Chotard , Lee Jones Subject: [PATCH 05/10] ARM: ux500: move AB8500 USB UICC settings to DT Date: Tue, 4 Feb 2014 20:52:21 +0100 Message-Id: <1391543546-11158-5-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.52 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 set-up of the USB UICC (InteChip USB) 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 | 19 ++++++++++++++++++- arch/arm/mach-ux500/board-mop500-pins.c | 9 --------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/ste-href-ab8500.dtsi b/arch/arm/boot/dts/ste-href-ab8500.dtsi index 3aae4ec5bcc9..9cf12d5d0923 100644 --- a/arch/arm/boot/dts/ste-href-ab8500.dtsi +++ b/arch/arm/boot/dts/ste-href-ab8500.dtsi @@ -34,7 +34,8 @@ <&gpio35_default_mode>, <&ycbcr_default_mode>, <&pwm_default_mode>, - <&adi1_default_mode>; + <&adi1_default_mode>, + <&usbuicc_default_mode>; /* * Pins 2, 4, 10, 11, 12, 13, 16, 24, 25, 36, 37, 38, 39 and 42 @@ -301,6 +302,22 @@ }; }; }; + /* This sets up the USB UICC pins */ + usbuicc { + usbuicc_default_mode: usbuicc_default { + default_mux { + ste,function = "usbuicc"; + ste,pins = "usbuicc_d_1"; + }; + default_cfg { + ste,pins = "GPIO21_H19", + "GPIO22_G20", + "GPIO23_G19"; + 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 d0b262242ab7..443b1f4b828a 100644 --- a/arch/arm/mach-ux500/board-mop500-pins.c +++ b/arch/arm/mach-ux500/board-mop500-pins.c @@ -57,15 +57,6 @@ static struct pinctrl_map __initdata ab8500_pinmap[] = { AB8500_PIN_STATE("GPIO3_U9", in_pd, "regulator.36", PINCTRL_STATE_SLEEP), /* - * pins 21,22 and 23 are muxed in USB UICC - * configured in INPUT PULL DOWN - */ - AB8500_MUX_HOG("usbuicc_d_1", "usbuicc"), - AB8500_PIN_HOG("GPIO21_H19", in_pd), - AB8500_PIN_HOG("GPIO22_G20", in_pd), - AB8500_PIN_HOG("GPIO23_G19", in_pd), - - /* * pins 27,28 are muxed in DMIC12 * configured in INPUT PULL DOWN */