From patchwork Tue Jul 22 19:30:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Belisko X-Patchwork-Id: 4605011 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1CAEDC0514 for ; Tue, 22 Jul 2014 19:32:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4251A20155 for ; Tue, 22 Jul 2014 19:32:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 718BB20123 for ; Tue, 22 Jul 2014 19:32:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756705AbaGVTa4 (ORCPT ); Tue, 22 Jul 2014 15:30:56 -0400 Received: from mail-we0-f181.google.com ([74.125.82.181]:47455 "EHLO mail-we0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756661AbaGVTay (ORCPT ); Tue, 22 Jul 2014 15:30:54 -0400 Received: by mail-we0-f181.google.com with SMTP id k48so117214wev.40 for ; Tue, 22 Jul 2014 12:30:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=BA0qclTzw69+btgvyEpzM1uEBj5HxUE6WyM0+2rsq5o=; b=FOnaG25BaqlFaGOq+l2rQkEXBNtrR4+ckKB4uufBmhWWQ8nOMluup8HJ9lZdR/IRT4 ksCShwA/kg8Xhr4bVwJKWSi+Ns/iAQPqniu4ROQgCOM06/rJ/Va1uNKcixjxKthExr3l WnBaka5mjXlDmf/lSAM7XAXObO47DGL/Vuts6jz9lRXDsrigD3XcFTQ71563W7POOwpT aVSEM+8WPTLCbESThXyctcUB4y4bt2/hXTnauH1R7D5ZaILXp6A58FOYqIcisowfvnhk mOivr6d3zl+vWS8EwEJ4DgqXD5wubMWz2uACh+MMNktNklR/RvFLq0ju19YsZEROURzI q8KA== X-Received: by 10.194.189.50 with SMTP id gf18mr37788891wjc.13.1406057452818; Tue, 22 Jul 2014 12:30:52 -0700 (PDT) Received: from nb.lan (ip-85.163.207.191.o2inet.sk. [85.163.207.191]) by mx.google.com with ESMTPSA id l8sm38723wje.15.2014.07.22.12.30.49 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 Jul 2014 12:30:52 -0700 (PDT) From: Marek Belisko To: bcousson@baylibre.com, tony@atomide.com Cc: robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com, ijc+devicetree@hellion.org.uk, galak@codeaurora.org, linux@arm.linux.org.uk, linux-omap@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, hns@goldelico.com, Marek Belisko Subject: [PATCH v2 4/7] arm: dts: omap3-gta04: Move spi gpio pins to pmx_core2 Date: Tue, 22 Jul 2014 21:30:17 +0200 Message-Id: <1406057420-22269-5-git-send-email-marek@goldelico.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1406057420-22269-1-git-send-email-marek@goldelico.com> References: <1406057420-22269-1-git-send-email-marek@goldelico.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Because of commit: 3d495383648a7cda3ea51a1e2fa5d288581479aa spi_gpio_pins node isn't valid anymore. Move to pmx_core2 node. Signed-off-by: Marek Belisko --- arch/arm/boot/dts/omap3-gta04.dts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/omap3-gta04.dts b/arch/arm/boot/dts/omap3-gta04.dts index 5b08d93..4ca1277 100644 --- a/arch/arm/boot/dts/omap3-gta04.dts +++ b/arch/arm/boot/dts/omap3-gta04.dts @@ -141,12 +141,15 @@ 0x0da (PIN_OUTPUT | MUX_MODE0) /* dss_data23.dss_data23 */ >; }; +}; +&omap3_pmx_core2 { spi_gpio_pins: spi_gpio_pinmux { - pinctrl-single,pins = <0x5a8 (PIN_OUTPUT | MUX_MODE4) /* clk */ - 0x5b6 (PIN_OUTPUT | MUX_MODE4) /* cs */ - 0x5b8 (PIN_OUTPUT | MUX_MODE4) /* tx */ - 0x5b4 (PIN_INPUT | MUX_MODE4) /* rx */ + pinctrl-single,pins = < + OMAP3630_CORE2_IOPAD(0x25d8, PIN_OUTPUT | MUX_MODE4) /* clk */ + OMAP3630_CORE2_IOPAD(0x25e6, PIN_OUTPUT | MUX_MODE4) /* cs */ + OMAP3630_CORE2_IOPAD(0x25e8, PIN_OUTPUT | MUX_MODE4) /* tx */ + OMAP3630_CORE2_IOPAD(0x25e4, PIN_INPUT | MUX_MODE4) /* rx */ >; }; };