From patchwork Sun Nov 17 11:04:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 21572 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f69.google.com (mail-pa0-f69.google.com [209.85.220.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0A72A20299 for ; Sun, 17 Nov 2013 11:05:05 +0000 (UTC) Received: by mail-pa0-f69.google.com with SMTP id hz1sf4828512pad.4 for ; Sun, 17 Nov 2013 03:05:05 -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=5Z1EUo5gPBFDshLP3Ue0ZA3ui0eNtuFOMNEQd9yzwUc=; b=Q4BLQxvitx+m94wtQ8FewS3+nliG+SoFbBeWwZGtgQWVScksnvIBADEzjKhyURRI9z Zm0Ehu7CyXJZwdPv6b4Ycqc+nvIaCJDQUX4WbebtPV6ObdCqYoUwXvsw6J3Fx4zwxr6V VtKtONzDLril7vWd/CiOR9h5d5PimVP1Lm8nvK3gtx8mQMaEIzeVIkgHXHNY+G7HsTNn yfagjTlHkiA3qfPPKosAm4wN2UXf1fC61yOAo/JHoZ6orNPX9Kabr/ATjy0TuGG/KZiF GAvch0gp4omoqgkQqXNPIC5I1yAhc7AW3jmq3gAKpyuvyzc3aK07x5I7uDm25XgqGVWm ftGg== X-Gm-Message-State: ALoCoQnG0ptnN3wClTN1w+ix5R2/32Reau8tZiPaPnzey44tfUHEVQ7tGjaKtDN0pOWywQVOsrDg X-Received: by 10.66.240.203 with SMTP id wc11mr6488387pac.29.1384686305322; Sun, 17 Nov 2013 03:05:05 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.2.102 with SMTP id 6ls2261673qet.69.gmail; Sun, 17 Nov 2013 03:05:05 -0800 (PST) X-Received: by 10.58.67.168 with SMTP id o8mr1463864vet.22.1384686305201; Sun, 17 Nov 2013 03:05:05 -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 gw1si5553809vcb.137.2013.11.17.03.05.05 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 17 Nov 2013 03:05:05 -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 i3so1909435vbh.5 for ; Sun, 17 Nov 2013 03:05:05 -0800 (PST) X-Received: by 10.58.136.231 with SMTP id qd7mr9786691veb.1.1384686305134; Sun, 17 Nov 2013 03:05:05 -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 u4csp140389vcz; Sun, 17 Nov 2013 03:05:04 -0800 (PST) X-Received: by 10.180.160.212 with SMTP id xm20mr12951667wib.23.1384686304343; Sun, 17 Nov 2013 03:05:04 -0800 (PST) Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com [209.85.212.169]) by mx.google.com with ESMTPS id a14si2263106wic.53.2013.11.17.03.05.03 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 17 Nov 2013 03:05:04 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.169 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=209.85.212.169; Received: by mail-wi0-f169.google.com with SMTP id hi5so4072514wib.2 for ; Sun, 17 Nov 2013 03:05:03 -0800 (PST) X-Received: by 10.194.11.67 with SMTP id o3mr13214472wjb.0.1384686303903; Sun, 17 Nov 2013 03:05:03 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id fu1sm13156973wib.8.2013.11.17.03.05.02 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Nov 2013 03:05:03 -0800 (PST) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, Lee Jones Cc: devicetree@vger.kernel.org, Linus Walleij Subject: [PATCH 16/21] ARM: ux500: move final HREFv60 LCD pins to device tree Date: Sun, 17 Nov 2013 12:04:05 +0100 Message-Id: <1384686250-10542-17-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: , Put two extra configs into the device tree to handle the default configuration of the display reset signals on the HREFv60plus, move this over from the board file to the device tree. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-hrefv60plus.dtsi | 17 +++++++++++++++++ arch/arm/mach-ux500/board-mop500-pins.c | 7 ------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/ste-hrefv60plus.dtsi b/arch/arm/boot/dts/ste-hrefv60plus.dtsi index ecd26848f24f..25b4848e9a6a 100644 --- a/arch/arm/boot/dts/ste-hrefv60plus.dtsi +++ b/arch/arm/boot/dts/ste-hrefv60plus.dtsi @@ -102,6 +102,23 @@ }; }; }; + mcde { + lcd_hrefv60_mode: lcd_hrefv60 { + /* + * Display Interface 1 uses GPIO 65 for RST (reset). + * Display Interface 2 uses GPIO 66 for RST (reset). + * Drive DISP1 reset high (not reset), driver DISP2 reset low (reset) + */ + hrefv60_cfg1 { + ste,pins ="GPIO65_F1"; + ste,config = <&gpio_out_hi>; + }; + hrefv60_cfg2 { + ste,pins ="GPIO66_G3"; + ste,config = <&gpio_out_lo>; + }; + }; + }; }; }; }; diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c index e208dddfeda9..6cc71d02957f 100644 --- a/arch/arm/mach-ux500/board-mop500-pins.c +++ b/arch/arm/mach-ux500/board-mop500-pins.c @@ -309,13 +309,6 @@ static struct pinctrl_map __initdata hrefv60_pinmap[] = { DB8500_PIN_HOG("GPIO31_V3", gpio_in_pu), /* EN1 */ DB8500_PIN_HOG("GPIO32_V2", gpio_in_pd), /* DRDY */ /* - * Display Interface 1 uses GPIO 65 for RST (reset). - * Display Interface 2 uses GPIO 66 for RST (reset). - * Drive DISP1 reset high (not reset), driver DISP2 reset low (reset) - */ - DB8500_PIN_HOG("GPIO65_F1", gpio_out_hi), /* DISP1 NO RST */ - DB8500_PIN_HOG("GPIO66_G3", gpio_out_lo), /* DISP2 RST */ - /* * Touch screen uses GPIO 143 for RST1, GPIO 146 for RST2 and * GPIO 67 for interrupts. Pull-up the IRQ line and drive both * reset signals low.