From patchwork Tue Feb 4 19:52:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 24129 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vb0-f70.google.com (mail-vb0-f70.google.com [209.85.212.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2F0CE202FA for ; Tue, 4 Feb 2014 19:52:56 +0000 (UTC) Received: by mail-vb0-f70.google.com with SMTP id w17sf22582112vbj.5 for ; Tue, 04 Feb 2014 11:52:55 -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=JfSY9WqR3H+bw7DeswtvEIAYcvrljNc7smr/tp8aCU0=; b=DGVEE8TW383adN6AmGuxtxclV6Kw/u38jY2L4v3AuaamPREgkjgnpcKButA7jGBQw7 UdwtbVEaJfPQbhj0OiHng+ceyZkWCHbaEIBxgRXVFY9qzXWIGBRYEmBvnMlg+qCsoVh9 Ke0GWp4U2mQ8yUWYJvZ9n4+O8RuJv7r+iIMD8S3UkryVqyfWoz5ov4sDuFdNNAfrLcCf X0tnnS6ItFN0/gP7S+Ov0p6uQSFhzTScnw8Oan8eCEZ4vkj4j+o1J/qckS6iobxsrTZi Jd53UQfHSoj9g6b1xmSnSS/BY8EF+x/5OzqfDO0C63RUuKuL9IP7oAVvANocepeI0PFG I8vA== X-Gm-Message-State: ALoCoQlp7uQHHMWFv04/KroDHyc9IhRcazPph/WlAPFx7wAdD9/0OV5r2mW0AOzW95Db/ZOKDglT X-Received: by 10.58.95.1 with SMTP id dg1mr16141960veb.29.1391543575306; Tue, 04 Feb 2014 11:52:55 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.108.73 with SMTP id i67ls2442471qgf.3.gmail; Tue, 04 Feb 2014 11:52:55 -0800 (PST) X-Received: by 10.221.29.137 with SMTP id ry9mr13264803vcb.6.1391543575235; Tue, 04 Feb 2014 11:52:55 -0800 (PST) Received: from mail-vb0-f45.google.com (mail-vb0-f45.google.com [209.85.212.45]) by mx.google.com with ESMTPS id d11si8649048vcd.92.2014.02.04.11.52.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Feb 2014 11:52:55 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.45 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.45; Received: by mail-vb0-f45.google.com with SMTP id m10so6103951vbh.18 for ; Tue, 04 Feb 2014 11:52:55 -0800 (PST) X-Received: by 10.58.181.230 with SMTP id dz6mr1300764vec.35.1391543575143; Tue, 04 Feb 2014 11:52:55 -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 u4csp270667vcz; Tue, 4 Feb 2014 11:52:54 -0800 (PST) X-Received: by 10.194.21.193 with SMTP id x1mr10259107wje.33.1391543573980; Tue, 04 Feb 2014 11:52:53 -0800 (PST) Received: from mail-wg0-f53.google.com (mail-wg0-f53.google.com [74.125.82.53]) by mx.google.com with ESMTPS id pv1si13184921wjc.65.2014.02.04.11.52.53 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Feb 2014 11:52:53 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.53 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=74.125.82.53; Received: by mail-wg0-f53.google.com with SMTP id y10so13146161wgg.8 for ; Tue, 04 Feb 2014 11:52:53 -0800 (PST) X-Received: by 10.180.35.36 with SMTP id e4mr13932309wij.8.1391543573558; Tue, 04 Feb 2014 11:52:53 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id fb8sm38716314wic.3.2014.02.04.11.52.51 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Feb 2014 11:52:52 -0800 (PST) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Cc: Linus Walleij , Patrice Chotard , Lee Jones Subject: [PATCH 02/10] ARM: ux500: move AB8500 YCBCR settings to device tree Date: Tue, 4 Feb 2014 20:52:18 +0100 Message-Id: <1391543546-11158-2-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.45 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 control settings for the YCBCR connector on the AB8500 over to the device tree as a hog. Cc: Patrice Chotard Cc: Lee Jones Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-href-ab8500.dtsi | 23 ++++++++++++++++++++++- arch/arm/mach-ux500/board-mop500-pins.c | 10 ---------- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/arch/arm/boot/dts/ste-href-ab8500.dtsi b/arch/arm/boot/dts/ste-href-ab8500.dtsi index 58b00d0f023e..2b548e90878e 100644 --- a/arch/arm/boot/dts/ste-href-ab8500.dtsi +++ b/arch/arm/boot/dts/ste-href-ab8500.dtsi @@ -31,7 +31,8 @@ <&gpio39_default_mode>, <&gpio42_default_mode>, <&gpio26_default_mode>, - <&gpio35_default_mode>; + <&gpio35_default_mode>, + <&ycbcr_default_mode>; /* * Pins 2, 4, 10, 11, 12, 13, 16, 24, 25, 36, 37, 38, 39 and 42 @@ -246,6 +247,26 @@ }; }; }; + /* + * This sets up the YCBCR connector pins, i.e. analog video out. + * Set as input with no bias. + */ + ycbcr { + ycbcr_default_mode: ycbcr_default { + default_mux { + ste,function = "ycbcr"; + ste,pins = "ycbcr0123_d_1"; + }; + default_cfg { + ste,pins = "GPIO6_Y18", + "GPIO7_AA20", + "GPIO8_W18", + "GPIO9_AA19"; + input-enable; + bias-disable; + }; + }; + }; }; }; }; diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c index 139298043685..d58513b08a6d 100644 --- a/arch/arm/mach-ux500/board-mop500-pins.c +++ b/arch/arm/mach-ux500/board-mop500-pins.c @@ -57,16 +57,6 @@ static struct pinctrl_map __initdata ab8500_pinmap[] = { AB8500_PIN_STATE("GPIO3_U9", in_pd, "regulator.36", PINCTRL_STATE_SLEEP), /* - * pins 6,7,8 and 9 are muxed in YCBCR0123 - * configured in INPUT PULL UP - */ - AB8500_MUX_HOG("ycbcr0123_d_1", "ycbcr"), - AB8500_PIN_HOG("GPIO6_Y18", in_nopull), - AB8500_PIN_HOG("GPIO7_AA20", in_nopull), - AB8500_PIN_HOG("GPIO8_W18", in_nopull), - AB8500_PIN_HOG("GPIO9_AA19", in_nopull), - - /* * pins 14,15 are muxed in PWM1 and PWM2 * configured in INPUT PULL DOWN */