From patchwork Tue Nov 1 23:51:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joshua Clayton X-Patchwork-Id: 9408353 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 263CD60234 for ; Tue, 1 Nov 2016 23:55:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1507F28AC0 for ; Tue, 1 Nov 2016 23:55:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 05CB729C08; Tue, 1 Nov 2016 23:55:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 822C128AC0 for ; Tue, 1 Nov 2016 23:55:01 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1c1iqt-0005yT-NY; Tue, 01 Nov 2016 23:52:23 +0000 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c1iqo-0005wb-KU for linux-arm-kernel@lists.infradead.org; Tue, 01 Nov 2016 23:52:19 +0000 Received: by mail-pf0-x243.google.com with SMTP id i88so1549551pfk.2 for ; Tue, 01 Nov 2016 16:51:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=seRGeOvTCdmFPhtVy+6v6RICWVlbupDCUPxcADDD+Z0=; b=EmtnOHmhymE6JFHkkdreKIzHqDYlMNJcmYMmvveg7CWxqpQ50APIdSOdc8GMZ/bpZA B7wryHvo5XJgN5TXpI3TdFTM4jD3RK/an3TCAFvic6FXqxKjzVxcsi8a4eIgpPk7yeQD c29buf9BDk3GeJwkd/S8//JgCk7fUjgLCaud7ns+2O9Ev5SYpNHHvMEjigMaBjkRAJFC He1OrnZvDVo3/444GW29X8xGrnxKI8kZryeueK5lNMsQNT/5Y3bYzo3JpHmnXyG8eqdO tXiU/+f8xhECtntCxC/mi8U/oYv7GTTkG03aW088Zsb8yO9Oyj2nwiNVPqhYJB1HuiH4 FOMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=seRGeOvTCdmFPhtVy+6v6RICWVlbupDCUPxcADDD+Z0=; b=LS2LkoJLXRQuMX3eoz7glqcroxckh+w4Z7QYsZguDdy00LCDh0jEg4/CXqohCWaWes bmO44i9eOfL6XzfU2whXMKc1zqc6FlN5zlISVzceFxRJ5lO3gWADcYn57gJD73RmrALT zfeqblylJzhqWHbeDgxRgQN6HfaUKF3T4XIFUqwmbtcpOSQJXgo8yjWfTQnehY0xYAoW c8csl6b5Cuyu0mYFkOz/m6gSp30OFu/2cwkKZlRXugkXulMrcGpzbFYvm0ZKn/UWAIvi 3/ACqcFTE+80rYEVX4RS62IrYPeshTcN95WXlgDYs4dd5r9QLlFhAnizioV0FxZ9lMMG uBkA== X-Gm-Message-State: ABUngvdS9dpD1tGibKq7dpmm7+LXYUP0dsgCK4gR0RpopASgHnfkNj1y56UYIoXv7mGZKQ== X-Received: by 10.98.79.27 with SMTP id d27mr1145354pfb.165.1478044315673; Tue, 01 Nov 2016 16:51:55 -0700 (PDT) Received: from jclayton-pc.columbia.uniwest.com (68-185-59-186.static.knwc.wa.charter.com. [68.185.59.186]) by smtp.gmail.com with ESMTPSA id 4sm44643495pfg.66.2016.11.01.16.51.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 01 Nov 2016 16:51:54 -0700 (PDT) From: Joshua Clayton To: Shawn Guo , Sascha Hauer , Fabio Estevam , Rob Herring , Mark Rutland , Russell King , linux-arm-kernel@lists.infradead.org (moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH] ARM: dts: imx6: Add imx-weim parameters to dtsi's Date: Tue, 1 Nov 2016 16:51:45 -0700 Message-Id: <1478044305-5666-1-git-send-email-stillcompiling@gmail.com> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161101_165218_773380_AA9B87A8 X-CRM114-Status: GOOD ( 11.66 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Joshua Clayton MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP imx-weim should always set address-cells to 2, and size_cells to 1. On imx6, fsl,weim-cs-gpr will always be &gpr Set these common parameters in the dtsi file, rather than in a downstream dts. Signed-off-by: Joshua Clayton Reviewed-by: Fabio Estevam --- arch/arm/boot/dts/imx6q-evi.dts | 3 --- arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 2 -- arch/arm/boot/dts/imx6qdl.dtsi | 3 +++ arch/arm/boot/dts/imx6sl.dtsi | 3 +++ arch/arm/boot/dts/imx6sx.dtsi | 3 +++ 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/imx6q-evi.dts b/arch/arm/boot/dts/imx6q-evi.dts index bd0b85c..a88cbd8 100644 --- a/arch/arm/boot/dts/imx6q-evi.dts +++ b/arch/arm/boot/dts/imx6q-evi.dts @@ -241,10 +241,7 @@ }; &weim { - #address-cells = <2>; - #size-cells = <1>; ranges = <0 0 0x08000000 0x08000000>; - fsl,weim-cs-gpr = <&gpr>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_weimfpga &pinctrl_weimcs>; status = "okay"; diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi index 8006467..52390ba 100644 --- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi @@ -613,8 +613,6 @@ &weim { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_weim_nor &pinctrl_weim_cs0>; - #address-cells = <2>; - #size-cells = <1>; ranges = <0 0 0x08000000 0x08000000>; status = "disabled"; /* pin conflict with SPI NOR */ diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi index 1bbd36f..d7bed1f 100644 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi @@ -1092,10 +1092,13 @@ }; weim: weim@021b8000 { + #address-cells = <2>; + #size-cells = <1>; compatible = "fsl,imx6q-weim"; reg = <0x021b8000 0x4000>; interrupts = <0 14 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6QDL_CLK_EIM_SLOW>; + fsl,weim-cs-gpr = <&gpr>; }; ocotp: ocotp@021bc000 { diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi index 02378db..c2b28c0 100644 --- a/arch/arm/boot/dts/imx6sl.dtsi +++ b/arch/arm/boot/dts/imx6sl.dtsi @@ -893,8 +893,11 @@ }; weim: weim@021b8000 { + #address-cells = <2>; + #size-cells = <1>; reg = <0x021b8000 0x4000>; interrupts = <0 14 IRQ_TYPE_LEVEL_HIGH>; + fsl,weim-cs-gpr = <&gpr>; }; ocotp: ocotp@021bc000 { diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi index 9526c38..78eb023 100644 --- a/arch/arm/boot/dts/imx6sx.dtsi +++ b/arch/arm/boot/dts/imx6sx.dtsi @@ -968,10 +968,13 @@ }; weim: weim@021b8000 { + #address-cells = <2>; + #size-cells = <1>; compatible = "fsl,imx6sx-weim", "fsl,imx6q-weim"; reg = <0x021b8000 0x4000>; interrupts = ; clocks = <&clks IMX6SX_CLK_EIM_SLOW>; + fsl,weim-cs-gpr = <&gpr>; }; ocotp: ocotp@021bc000 {