From patchwork Sun Nov 17 11:04:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 21568 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f197.google.com (mail-ob0-f197.google.com [209.85.214.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4507820299 for ; Sun, 17 Nov 2013 11:04:57 +0000 (UTC) Received: by mail-ob0-f197.google.com with SMTP id wp4sf13082685obc.4 for ; Sun, 17 Nov 2013 03:04:56 -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=h28l0ttNwOFCpBGtWLosLQMzGJZ4dnPIpYQ1gJ2Y4QQ=; b=b8592CYHdgCt+fCSc0wtm6GZRAs5p3n6BpEznGEKR34RpUUzFfKhz/MUltQe1HRswd JP+Q//sLPXTSlk/TxTGi6iL5qOfAySLz4J+PoabJ2t/IdFl27kAz0HrZ4FFYNMv8ZkrI LsdTSMMqxp75QhKqcifssAWFPBItGm2CT7mf3GjGYkmXqEfLPyTa+CB0qEJMX+2RhkKp /JsiOxrfATIIIKToo6NA6yYwCqrrSnShPlXHGLJjdHIjRgqZodrlwlvooNQYsPpmFNe9 3eKtTMlHuWJprI52udhnIxpw5UZL3yqznjn09bigPa+41wfsV/PJyc0BqZH1uL0fIydk ezyA== X-Gm-Message-State: ALoCoQlMmz0vutEwAPzD7F/IHOmllcJzF5xmlyiVCIcGnfqaBPfVMJrep3jHdhaCJgOn3FKLSeR+ X-Received: by 10.182.81.7 with SMTP id v7mr6549593obx.28.1384686296842; Sun, 17 Nov 2013 03:04:56 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.37.72 with SMTP id w8ls2314924qej.59.gmail; Sun, 17 Nov 2013 03:04:56 -0800 (PST) X-Received: by 10.221.47.193 with SMTP id ut1mr9876421vcb.8.1384686296759; Sun, 17 Nov 2013 03:04:56 -0800 (PST) Received: from mail-vb0-f51.google.com (mail-vb0-f51.google.com [209.85.212.51]) by mx.google.com with ESMTPS id nh5si5561033vec.106.2013.11.17.03.04.56 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 17 Nov 2013 03:04:56 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.51 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.51; Received: by mail-vb0-f51.google.com with SMTP id w5so3905290vbf.38 for ; Sun, 17 Nov 2013 03:04:56 -0800 (PST) X-Received: by 10.52.243.138 with SMTP id wy10mr8371617vdc.2.1384686296683; Sun, 17 Nov 2013 03:04:56 -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 u4csp140381vcz; Sun, 17 Nov 2013 03:04:56 -0800 (PST) X-Received: by 10.180.211.212 with SMTP id ne20mr13226866wic.31.1384686295780; Sun, 17 Nov 2013 03:04:55 -0800 (PST) Received: from mail-we0-f170.google.com (mail-we0-f170.google.com [74.125.82.170]) by mx.google.com with ESMTPS id a16si2253562wib.77.2013.11.17.03.04.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 17 Nov 2013 03:04:55 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.170 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=74.125.82.170; Received: by mail-we0-f170.google.com with SMTP id w61so1446830wes.29 for ; Sun, 17 Nov 2013 03:04:55 -0800 (PST) X-Received: by 10.180.208.4 with SMTP id ma4mr3785928wic.43.1384686295044; Sun, 17 Nov 2013 03:04:55 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id fu1sm13156973wib.8.2013.11.17.03.04.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Nov 2013 03:04:54 -0800 (PST) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, Lee Jones Cc: devicetree@vger.kernel.org, Linus Walleij Subject: [PATCH 12/21] ARM: ux500: move old HREF ipgpio to the device tree Date: Sun, 17 Nov 2013 12:04:01 +0100 Message-Id: <1384686250-10542-13-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.51 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 old HREFs (MOP500) were controlling an image-processor GPIO (IPGPIO) by using hogs. Do the same thing with device tree and get rid of the mop500_pins setting. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-hrefprev60.dtsi | 16 ++++++++++++++++ arch/arm/mach-ux500/board-mop500-pins.c | 24 ------------------------ 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/arch/arm/boot/dts/ste-hrefprev60.dtsi b/arch/arm/boot/dts/ste-hrefprev60.dtsi index 32295e396ff8..b0f5def8e2a8 100644 --- a/arch/arm/boot/dts/ste-hrefprev60.dtsi +++ b/arch/arm/boot/dts/ste-hrefprev60.dtsi @@ -68,6 +68,10 @@ }; pinctrl { + /* Set this up using hogs */ + pinctrl-names = "default"; + pinctrl-0 = <&ipgpio_hrefprev60_mode>; + ssp0 { ssp0_hrefprev60_mode: ssp0_hrefprev60_default { hrefprev60_mux { @@ -103,6 +107,18 @@ }; }; }; + ipgpio { + ipgpio_hrefprev60_mode: ipgpio_hrefprev60 { + hrefprev60_mux { + ste,function = "ipgpio"; + ste,pins = "ipgpio0_c_1", "ipgpio1_c_1"; + }; + hrefprev60_cfg1 { + ste,pins = "GPIO6_AF6", "GPIO7_AG5"; + ste,config = <&in_pu>; + }; + }; + }; }; }; }; diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c index c311d11d6c3d..257c97a214a5 100644 --- a/arch/arm/mach-ux500/board-mop500-pins.c +++ b/arch/arm/mach-ux500/board-mop500-pins.c @@ -312,28 +312,6 @@ static struct pinctrl_map __initdata ab8505_pinmap[] = { }; /* - * These are specifically for the MOP500 and HREFP (pre-v60) version of the - * board, which utilized a TC35892 GPIO expander instead of using a lot of - * on-chip pins as the HREFv60 and later does. - */ -static struct pinctrl_map __initdata mop500_pinmap[] = { - /* - * XENON Flashgun on image processor GPIO (controlled from image - * processor firmware), mux in these image processor GPIO lines 0 - * (XENON_FLASH_ID) and 1 (XENON_READY) on altfunction C and pull up - * the pins. - */ - DB8500_MUX_HOG("ipgpio0_c_1", "ipgpio"), - DB8500_MUX_HOG("ipgpio1_c_1", "ipgpio"), - DB8500_PIN_HOG("GPIO6_AF6", in_pu), - DB8500_PIN_HOG("GPIO7_AG5", in_pu), - /* - * Runtime stuff: make it possible to mux in the SKE keypad - * and bias the pins - */ -}; - -/* * The HREFv60 series of platforms is using available pins on the DB8500 * insteaf of the Toshiba I2C GPIO expander, reusing some pins like the SSP0 * and SSP1 ports (previously connected to the AB8500) as generic GPIO lines. @@ -496,8 +474,6 @@ static void __init mop500_href_family_pinmaps_init(void) void __init mop500_pinmaps_init(void) { - pinctrl_register_mappings(mop500_pinmap, - ARRAY_SIZE(mop500_pinmap)); mop500_href_family_pinmaps_init(); if (machine_is_u8520()) pinctrl_register_mappings(ab8505_pinmap,