From patchwork Mon Nov 26 11:25:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 1801771 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 797413FC54 for ; Mon, 26 Nov 2012 11:28:08 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TcwoN-0000IW-8K; Mon, 26 Nov 2012 11:25:15 +0000 Received: from mail-oa0-f49.google.com ([209.85.219.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TcwoJ-0000ID-IC for linux-arm-kernel@lists.infradead.org; Mon, 26 Nov 2012 11:25:12 +0000 Received: by mail-oa0-f49.google.com with SMTP id l10so10382791oag.36 for ; Mon, 26 Nov 2012 03:25:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:x-gm-message-state; bh=+8/IjjNoD0HHKNliLp+7f1LPYH+nhH+jDyf2Y34cKcg=; b=Wa/aag/R3pcxmKeLYR5UYZDmB++RJsvDKIivi3qHQUWDysDa2qfRV/NhAXXFbGKNn9 R6+BDOJYX2RTsbU6Y2T1IspVMD+4gZtx++7rhyl2lxfN+UUAwuRAvYADgq7IVW9fyeXb zS8BBXMKlAzrjtjIQysXPkHE/W40EsaNfxpxePnxoc7ANNVN8FWvUrer/AKlv9k64b8a 0ykOfGz5krlHRXDVdipNWXLbJmGaB/szSxAYY0vzo8ksWCkZeD3eaDhhjTDV6FU+00NO CYp1qzKgENojqERHyaRb3fDR9ara0o35uWA/oUdOYJYohfGzGJbEAaR/T8q2IdopbBAY AImA== MIME-Version: 1.0 Received: by 10.60.31.6 with SMTP id w6mr8916532oeh.65.1353929108100; Mon, 26 Nov 2012 03:25:08 -0800 (PST) Received: by 10.76.98.102 with HTTP; Mon, 26 Nov 2012 03:25:08 -0800 (PST) In-Reply-To: References: Date: Mon, 26 Nov 2012 16:55:08 +0530 Message-ID: Subject: Re: [PATCH 08/14] ARM: SPEAr: DT: Update device nodes From: Viresh Kumar To: arm@kernel.org, olof@lixom.net, arnd@arndb.de X-Gm-Message-State: ALoCoQlQs2qvE2YF4j1n+MPRGDe/pmqwSADBILgaWs2hc3NBQlE+aGs9gzWJx0G0m358Tch1Fq1x X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121126_062511_685063_D1A4E543 X-CRM114-Status: GOOD ( 12.88 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.219.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: devicetree-discuss@lists.ozlabs.org, spear-devel@list.st.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org On 11 November 2012 10:09, Viresh Kumar wrote: > From: Shiraz Hashim > > This patch adds multiple device nodes for SPEAr machines and boards. > > Signed-off-by: Bhavna Yadav > Signed-off-by: Deepak Sikri > Signed-off-by: Rajeev Kumar > Signed-off-by: Shiraz Hashim > Signed-off-by: Vijay Kumar Mishra > Signed-off-by: Vipin Kumar > Signed-off-by: Vipul Kumar Samar > Signed-off-by: Viresh Kumar Arnd/Olof, As discussed (With Arnd) over IRC, i would be sending a PULL request for this patchset. There are few updates/fixes in the bindings for few nodes (as the drivers for them just got pushed by their maintainers after some updates) and here is a diff for that. I will merge this diff with current patch in my PULL request. From: Viresh Kumar Date: Mon, 26 Nov 2012 16:44:53 +0530 Subject: [PATCH] fixup! ARM: SPEAr: DT: Update device nodes --- arch/arm/boot/dts/spear1310-evb.dts | 14 ++++---------- arch/arm/boot/dts/spear1340-evb.dts | 25 ++++++++----------------- arch/arm/boot/dts/spear13xx.dtsi | 14 +++++++------- 3 files changed, 19 insertions(+), 34 deletions(-) -- viresh diff --git a/arch/arm/boot/dts/spear1310-evb.dts b/arch/arm/boot/dts/spear1310-evb.dts index cd4e2f8..b56a801 100644 --- a/arch/arm/boot/dts/spear1310-evb.dts +++ b/arch/arm/boot/dts/spear1310-evb.dts @@ -348,7 +348,6 @@ cs-gpios = <&gpio1 7 0>, <&spics 0>, <&spics 1>; stmpe610@0 { - status = "okay"; compatible = "st,stmpe610"; reg = <0>; #address-cells = <1>; @@ -364,15 +363,12 @@ pl022,ctrl-len = <0x7>; pl022,wait-state = <0>; pl022,duplex = <0>; - id = <0>; - blocks = <4>; - irq_over_gpio; - irq-gpios = <&gpio1 6 0x4>; + interrupts = <6 0x4>; + interrupt-parent = <&gpio1>; irq-trigger = <0x2>; - stmpe610-ts { - compatible = "stmpe,ts"; - reg = <0>; + stmpe_touchscreen { + compatible = "st,stmpe-ts"; ts,sample-time = <4>; ts,mod-12b = <1>; ts,ref-sel = <0>; @@ -386,7 +382,6 @@ }; m25p80@1 { - status = "okay"; compatible = "st,m25p80"; reg = <1>; spi-max-frequency = <12000000>; @@ -404,7 +399,6 @@ }; spidev@2 { - status = "okay"; compatible = "spidev"; reg = <2>; spi-max-frequency = <25000000>; diff --git a/arch/arm/boot/dts/spear1340-evb.dts b/arch/arm/boot/dts/spear1340-evb.dts index c519fa1..d6c30ae 100644 --- a/arch/arm/boot/dts/spear1340-evb.dts +++ b/arch/arm/boot/dts/spear1340-evb.dts @@ -319,15 +319,12 @@ #address-cells = <1>; #size-cells = <0>; reg = <0x41>; - irq-over-gpio; - irq-gpios = <&gpio0 4 0x4>; - id = <0>; - blocks = <1>; + interrupts = <4 0x4>; + interrupt-parent = <&gpio0>; irq-trigger = <0x2>; - stmpegpio: stmpe-gpio { - compatible = "stmpe,gpio"; - reg = <0>; + stmpegpio: stmpe_gpio { + compatible = "st,stmpe-gpio"; gpio-controller; #gpio-cells = <2>; }; @@ -445,7 +442,6 @@ <&gpiopinctrl 85 0>; m25p80@0 { - status = "okay"; compatible = "m25p80"; reg = <0>; spi-max-frequency = <12000000>; @@ -463,7 +459,6 @@ }; stmpe610@1 { - status = "okay"; compatible = "st,stmpe610"; spi-max-frequency = <1000000>; spi-cpha; @@ -477,17 +472,14 @@ pl022,ctrl-len = <0x7>; pl022,wait-state = <0>; pl022,duplex = <0>; - irq-over-gpio; - irq-gpios = <&gpiopinctrl 100 0>; - id = <0>; - blocks = <4>; + interrupts = <100 0>; + interrupt-parent = <&gpiopinctrl>; irq-trigger = <0x2>; #address-cells = <1>; #size-cells = <0>; - stmpe610-ts { - compatible = "stmpe,ts"; - reg = <0>; + stmpe_touchscreen { + compatible = "st,stmpe-ts"; ts,sample-time = <4>; ts,mod-12b = <1>; ts,ref-sel = <0>; @@ -501,7 +493,6 @@ }; spidev@2 { - status = "okay"; compatible = "spidev"; reg = <2>; spi-max-frequency = <25000000>; diff --git a/arch/arm/boot/dts/spear13xx.dtsi b/arch/arm/boot/dts/spear13xx.dtsi index 2e650f9..009096d 100644 --- a/arch/arm/boot/dts/spear13xx.dtsi +++ b/arch/arm/boot/dts/spear13xx.dtsi @@ -65,14 +65,14 @@ }; cpufreq { - compatible = "st,cpufreq"; + compatible = "st,cpufreq-spear"; cpufreq_tbl = < 166000 - 200000 - 250000 - 300000 - 400000 - 500000 - 600000 >; + 200000 + 250000 + 300000 + 400000 + 500000 + 600000 >; status = "disable"; };