All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>, 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,
	Russell King <rmk+kernel@arm.linux.org.uk>,
	Shawn Guo <shawn.guo@linaro.org>
Subject: linux-next: manual merge of the staging tree with the arm-soc tree
Date: Tue, 25 Feb 2014 17:09:53 +1100	[thread overview]
Message-ID: <20140225170953.673cf5073d5682a54c1a1771@canb.auug.org.au> (raw)

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

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
arch/arm/boot/dts/imx53-mba53.dts between commit a4a2aa9b038c ("ARM: dts:
imx53-mba53: create a container for fixed regulators") from the arm-soc
tree and commit 17b5001b5143 ("imx-drm: convert to componentised device
support") from the staging 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/imx53-mba53.dts
index 55af11037a00,9b6e76980a74..000000000000
--- a/arch/arm/boot/dts/imx53-mba53.dts
+++ b/arch/arm/boot/dts/imx53-mba53.dts
@@@ -35,27 -43,18 +35,33 @@@
  		status = "disabled";
  	};
  
+ 	imx-drm {
+ 		compatible = "fsl,imx-drm";
+ 		crtcs = <&ipu 1>;
+ 		connectors = <&disp1>, <&tve>;
+ 	};
+ 
 -	reg_3p2v: 3p2v {
 -		compatible = "regulator-fixed";
 -		regulator-name = "3P2V";
 -		regulator-min-microvolt = <3200000>;
 -		regulator-max-microvolt = <3200000>;
 -		regulator-always-on;
 +	regulators {
 +		compatible = "simple-bus";
 +		#address-cells = <1>;
 +		#size-cells = <0>;
 +
 +		reg_backlight: regulator@0 {
 +			compatible = "regulator-fixed";
 +			reg = <0>;
 +			regulator-name = "lcd-supply";
 +			gpio = <&gpio2 5 0>;
 +			startup-delay-us = <5000>;
 +		};
 +
 +		reg_3p2v: regulator@1 {
 +			compatible = "regulator-fixed";
 +			reg = <1>;
 +			regulator-name = "3P2V";
 +			regulator-min-microvolt = <3200000>;
 +			regulator-max-microvolt = <3200000>;
 +			regulator-always-on;
 +		};
  	};
  
  	sound {

[-- 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: Greg KH <greg@kroah.com>, 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,
	Russell King <rmk+kernel@arm.linux.org.uk>,
	Shawn Guo <shawn.guo@linaro.org>
Subject: linux-next: manual merge of the staging tree with the arm-soc tree
Date: Tue, 25 Feb 2014 17:09:53 +1100	[thread overview]
Message-ID: <20140225170953.673cf5073d5682a54c1a1771@canb.auug.org.au> (raw)

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

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
arch/arm/boot/dts/imx53-mba53.dts between commit a4a2aa9b038c ("ARM: dts:
imx53-mba53: create a container for fixed regulators") from the arm-soc
tree and commit 17b5001b5143 ("imx-drm: convert to componentised device
support") from the staging 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/imx53-mba53.dts
index 55af11037a00,9b6e76980a74..000000000000
--- a/arch/arm/boot/dts/imx53-mba53.dts
+++ b/arch/arm/boot/dts/imx53-mba53.dts
@@@ -35,27 -43,18 +35,33 @@@
  		status = "disabled";
  	};
  
+ 	imx-drm {
+ 		compatible = "fsl,imx-drm";
+ 		crtcs = <&ipu 1>;
+ 		connectors = <&disp1>, <&tve>;
+ 	};
+ 
 -	reg_3p2v: 3p2v {
 -		compatible = "regulator-fixed";
 -		regulator-name = "3P2V";
 -		regulator-min-microvolt = <3200000>;
 -		regulator-max-microvolt = <3200000>;
 -		regulator-always-on;
 +	regulators {
 +		compatible = "simple-bus";
 +		#address-cells = <1>;
 +		#size-cells = <0>;
 +
 +		reg_backlight: regulator@0 {
 +			compatible = "regulator-fixed";
 +			reg = <0>;
 +			regulator-name = "lcd-supply";
 +			gpio = <&gpio2 5 0>;
 +			startup-delay-us = <5000>;
 +		};
 +
 +		reg_3p2v: regulator@1 {
 +			compatible = "regulator-fixed";
 +			reg = <1>;
 +			regulator-name = "3P2V";
 +			regulator-min-microvolt = <3200000>;
 +			regulator-max-microvolt = <3200000>;
 +			regulator-always-on;
 +		};
  	};
  
  	sound {

[-- 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 staging tree with the arm-soc tree
Date: Tue, 25 Feb 2014 17:09:53 +1100	[thread overview]
Message-ID: <20140225170953.673cf5073d5682a54c1a1771@canb.auug.org.au> (raw)

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
arch/arm/boot/dts/imx53-mba53.dts between commit a4a2aa9b038c ("ARM: dts:
imx53-mba53: create a container for fixed regulators") from the arm-soc
tree and commit 17b5001b5143 ("imx-drm: convert to componentised device
support") from the staging 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/imx53-mba53.dts
index 55af11037a00,9b6e76980a74..000000000000
--- a/arch/arm/boot/dts/imx53-mba53.dts
+++ b/arch/arm/boot/dts/imx53-mba53.dts
@@@ -35,27 -43,18 +35,33 @@@
  		status = "disabled";
  	};
  
+ 	imx-drm {
+ 		compatible = "fsl,imx-drm";
+ 		crtcs = <&ipu 1>;
+ 		connectors = <&disp1>, <&tve>;
+ 	};
+ 
 -	reg_3p2v: 3p2v {
 -		compatible = "regulator-fixed";
 -		regulator-name = "3P2V";
 -		regulator-min-microvolt = <3200000>;
 -		regulator-max-microvolt = <3200000>;
 -		regulator-always-on;
 +	regulators {
 +		compatible = "simple-bus";
 +		#address-cells = <1>;
 +		#size-cells = <0>;
 +
 +		reg_backlight: regulator at 0 {
 +			compatible = "regulator-fixed";
 +			reg = <0>;
 +			regulator-name = "lcd-supply";
 +			gpio = <&gpio2 5 0>;
 +			startup-delay-us = <5000>;
 +		};
 +
 +		reg_3p2v: regulator at 1 {
 +			compatible = "regulator-fixed";
 +			reg = <1>;
 +			regulator-name = "3P2V";
 +			regulator-min-microvolt = <3200000>;
 +			regulator-max-microvolt = <3200000>;
 +			regulator-always-on;
 +		};
  	};
  
  	sound {
-------------- 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/20140225/7a9ed161/attachment-0001.sig>

             reply	other threads:[~2014-02-25  6:10 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-25  6:09 Stephen Rothwell [this message]
2014-02-25  6:09 ` linux-next: manual merge of the staging tree with the arm-soc tree Stephen Rothwell
2014-02-25  6:09 ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2014-03-18  6:10 Stephen Rothwell
2014-03-18  6:10 ` Stephen Rothwell
2014-03-18  6:10 ` Stephen Rothwell
2014-02-25  6:09 Stephen Rothwell
2014-02-25  6:09 ` Stephen Rothwell
2014-02-25  6:09 ` Stephen Rothwell
2014-02-25 16:49 ` Greg KH
2014-02-25 16:49   ` Greg KH
2014-02-25 16:51   ` Olof Johansson
2014-02-25 16:51     ` Olof Johansson
2014-02-25 16:51     ` Olof Johansson
2014-02-25 16:56     ` Greg KH
2014-02-25 16:56       ` Greg KH
2014-02-25 16:56       ` Greg KH
2014-04-02  1:55 ` Stephen Rothwell
2014-04-02  1:55   ` Stephen Rothwell
2014-04-02  1:55   ` 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=20140225170953.673cf5073d5682a54c1a1771@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=arnd@arndb.de \
    --cc=greg@kroah.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=olof@lixom.net \
    --cc=rmk+kernel@arm.linux.org.uk \
    --cc=shawn.guo@linaro.org \
    /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.