linux-kernel - linux-next: manual merge of the arm-soc tree with the thermal tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20121126210144.d753c9f29a94d0816e8d3709@canb.auug.org.au>
Date:	Mon, 26 Nov 2012 21:01:44 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	<linux-arm-kernel@...ts.infradead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Lee Jones <lee.jones@...aro.org>,
	"hongbo.zhang" <hongbo.zhang@...aro.com>,
	Zhang Rui <rui.zhang@...el.com>
Subject: linux-next: manual merge of the arm-soc tree with the thermal tree

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/boot/dts/dbx5x0.dtsi between commit dc1956b5f84d ("Thermal: Add
ST-Ericsson DB8500 thermal properties and platform data") from the
thermal tree and commit 0563f638f052 ("ARM: ux500: Add node for the MMC
GPIO regulator") 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@...b.auug.org.au

diff --cc arch/arm/boot/dts/dbx5x0.dtsi
index 487b705,7ce45fc..0000000
--- a/arch/arm/boot/dts/dbx5x0.dtsi
+++ b/arch/arm/boot/dts/dbx5x0.dtsi
@@@ -695,10 -630,18 +664,23 @@@
  			status = "disabled";
  		};
  
 +		cpufreq-cooling {
 +			compatible = "stericsson,db8500-cpufreq-cooling";
 +			status = "disabled";
 +		 };
 +
+ 		vmmci: regulator-gpio {
+ 			compatible = "regulator-gpio";
+ 
+ 			regulator-min-microvolt = <1800000>;
+ 			regulator-max-microvolt = <2600000>;
+ 			regulator-name = "mmci-reg";
+ 			regulator-type = "voltage";
+ 
+ 			gpios = <&tc3589x_gpio 18 0x4>;
+ 			gpio-enable = <&tc3589x_gpio 17 0x4>;
+ 			states = <1800000 0x1
+ 				  2900000 0x0>;
+ 		};
  	};
  };

Content of type "application/pgp-signature" skipped