All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
	<linux-arm-kernel@lists.infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Pantelis Antoniou <panto@antoniou-consulting.com>,
	"Patil, Rachna" <rachna@ti.com>, Felipe Balbi <balbi@ti.com>,
	Sebastian Andrzej Siewior <sebastian@breakpoint.cc>,
	Samuel Ortiz <sameo@linux.intel.com>,
	Philip Avinash <avinashphilip@ti.com>, Pekon Gupta <pekon@ti.com>,
	Benoit Cousson <benoit.cousson@linaro.org>
Subject: linux-next: manual merge of the arm-soc tree with the mfd tree
Date: Fri, 21 Jun 2013 15:54:08 +1000	[thread overview]
Message-ID: <20130621155408.7e4a4c891ff4d74627b57a45@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1341 bytes --]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/boot/dts/am33xx.dtsi between commit a82279dd6d3e ("arm: am33xx:
add TSC/ADC mfd device support") from the mfd tree and commit
15e8246bd61b ("ARM: dts: AM33XX: Add ELM node") from the arm-soc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/boot/dts/am33xx.dtsi
index 37ef320,0d4df90..0000000
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@@ -404,24 -494,14 +494,32 @@@
  			ti,hwmods = "wkup_m3";
  		};
  
 +		tscadc: tscadc@44e0d000 {
 +			compatible = "ti,am3359-tscadc";
 +			reg = <0x44e0d000 0x1000>;
 +			interrupt-parent = <&intc>;
 +			interrupts = <16>;
 +			ti,hwmods = "adc_tsc";
 +			status = "disabled";
 +
 +			tsc {
 +				compatible = "ti,am3359-tsc";
 +			};
 +			am335x_adc: adc {
 +				#io-channel-cells = <1>;
 +				compatible = "ti,am3359-adc";
 +			};
 +
 +		};
 +
+ 		elm: elm@48080000 {
+ 			compatible = "ti,am3352-elm";
+ 			reg = <0x48080000 0x2000>;
+ 			interrupts = <4>;
+ 			ti,hwmods = "elm";
+ 			status = "disabled";
+ 		};
+ 
  		gpmc: gpmc@50000000 {
  			compatible = "ti,am3352-gpmc";
  			ti,hwmods = "gpmc";

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
	linux-arm-kernel@lists.infradead.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Pantelis Antoniou <panto@antoniou-consulting.com>,
	"Patil, Rachna" <rachna@ti.com>, Felipe Balbi <balbi@ti.com>,
	Sebastian Andrzej Siewior <sebastian@breakpoint.cc>,
	Samuel Ortiz <sameo@linux.intel.com>,
	Philip Avinash <avinashphilip@ti.com>, Pekon Gupta <pekon@ti.com>,
	Benoit Cousson <benoit.cousson@linaro.org>
Subject: linux-next: manual merge of the arm-soc tree with the mfd tree
Date: Fri, 21 Jun 2013 15:54:08 +1000	[thread overview]
Message-ID: <20130621155408.7e4a4c891ff4d74627b57a45@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1341 bytes --]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/boot/dts/am33xx.dtsi between commit a82279dd6d3e ("arm: am33xx:
add TSC/ADC mfd device support") from the mfd tree and commit
15e8246bd61b ("ARM: dts: AM33XX: Add ELM node") from the arm-soc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/boot/dts/am33xx.dtsi
index 37ef320,0d4df90..0000000
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@@ -404,24 -494,14 +494,32 @@@
  			ti,hwmods = "wkup_m3";
  		};
  
 +		tscadc: tscadc@44e0d000 {
 +			compatible = "ti,am3359-tscadc";
 +			reg = <0x44e0d000 0x1000>;
 +			interrupt-parent = <&intc>;
 +			interrupts = <16>;
 +			ti,hwmods = "adc_tsc";
 +			status = "disabled";
 +
 +			tsc {
 +				compatible = "ti,am3359-tsc";
 +			};
 +			am335x_adc: adc {
 +				#io-channel-cells = <1>;
 +				compatible = "ti,am3359-adc";
 +			};
 +
 +		};
 +
+ 		elm: elm@48080000 {
+ 			compatible = "ti,am3352-elm";
+ 			reg = <0x48080000 0x2000>;
+ 			interrupts = <4>;
+ 			ti,hwmods = "elm";
+ 			status = "disabled";
+ 		};
+ 
  		gpmc: gpmc@50000000 {
  			compatible = "ti,am3352-gpmc";
  			ti,hwmods = "gpmc";

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

WARNING: multiple messages have this Message-ID (diff)
From: sfr@canb.auug.org.au (Stephen Rothwell)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the arm-soc tree with the mfd tree
Date: Fri, 21 Jun 2013 15:54:08 +1000	[thread overview]
Message-ID: <20130621155408.7e4a4c891ff4d74627b57a45@canb.auug.org.au> (raw)

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/boot/dts/am33xx.dtsi between commit a82279dd6d3e ("arm: am33xx:
add TSC/ADC mfd device support") from the mfd tree and commit
15e8246bd61b ("ARM: dts: AM33XX: Add ELM node") from the arm-soc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au

diff --cc arch/arm/boot/dts/am33xx.dtsi
index 37ef320,0d4df90..0000000
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@@ -404,24 -494,14 +494,32 @@@
  			ti,hwmods = "wkup_m3";
  		};
  
 +		tscadc: tscadc at 44e0d000 {
 +			compatible = "ti,am3359-tscadc";
 +			reg = <0x44e0d000 0x1000>;
 +			interrupt-parent = <&intc>;
 +			interrupts = <16>;
 +			ti,hwmods = "adc_tsc";
 +			status = "disabled";
 +
 +			tsc {
 +				compatible = "ti,am3359-tsc";
 +			};
 +			am335x_adc: adc {
 +				#io-channel-cells = <1>;
 +				compatible = "ti,am3359-adc";
 +			};
 +
 +		};
 +
+ 		elm: elm at 48080000 {
+ 			compatible = "ti,am3352-elm";
+ 			reg = <0x48080000 0x2000>;
+ 			interrupts = <4>;
+ 			ti,hwmods = "elm";
+ 			status = "disabled";
+ 		};
+ 
  		gpmc: gpmc at 50000000 {
  			compatible = "ti,am3352-gpmc";
  			ti,hwmods = "gpmc";
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130621/c7462e4f/attachment.sig>

             reply	other threads:[~2013-06-21  5:54 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-21  5:54 Stephen Rothwell [this message]
2013-06-21  5:54 ` linux-next: manual merge of the arm-soc tree with the mfd tree Stephen Rothwell
2013-06-21  5:54 ` Stephen Rothwell
2013-06-21  5:59 ` Gupta, Pekon
2013-06-21  5:59   ` Gupta, Pekon
2013-06-21  5:59   ` Gupta, Pekon
  -- strict thread matches above, loose matches on Subject: below --
2013-06-28  6:01 Stephen Rothwell
2013-06-28  6:01 ` Stephen Rothwell
2013-06-28  6:01 ` Stephen Rothwell
2013-02-11  6:06 Stephen Rothwell
2013-02-11  6:06 ` Stephen Rothwell
2013-02-11  6:06 ` Stephen Rothwell
2013-02-11 18:52 ` Tony Lindgren
2013-02-11 18:52   ` Tony Lindgren
2013-02-11 18:52   ` Tony Lindgren
2013-02-11 19:08   ` Olof Johansson
2013-02-11 19:08     ` Olof Johansson
2013-02-12 14:46   ` Roger Quadros
2013-02-12 14:46     ` Roger Quadros
2013-02-12 14:46     ` Roger Quadros
2013-02-12 14:53     ` Samuel Ortiz
2013-02-12 14:53       ` Samuel Ortiz
2013-02-04  6:04 Stephen Rothwell
2013-02-04  6:04 ` Stephen Rothwell
2013-02-04  6:04 ` Stephen Rothwell
2012-05-01  5:34 Stephen Rothwell
2012-05-01  5:34 ` Stephen Rothwell
2012-05-01  5:34 ` Stephen Rothwell
2012-05-01 22:56 ` Linus Walleij
2012-05-01 22:56   ` Linus Walleij
2012-04-17  3:34 Stephen Rothwell
2012-04-17  3:34 ` Stephen Rothwell
2012-04-17  3:34 ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130621155408.7e4a4c891ff4d74627b57a45@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=arnd@arndb.de \
    --cc=avinashphilip@ti.com \
    --cc=balbi@ti.com \
    --cc=benoit.cousson@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=olof@lixom.net \
    --cc=panto@antoniou-consulting.com \
    --cc=pekon@ti.com \
    --cc=rachna@ti.com \
    --cc=sameo@linux.intel.com \
    --cc=sebastian@breakpoint.cc \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.