linux-kernel - linux-next: manual merge of the sunxi tree with the arm-soc 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>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20141128103617.13a1821c@canb.auug.org.au>
Date:	Fri, 28 Nov 2014 10:36:17 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Maxime Ripard <maxime.ripard@...e-electrons.com>,
	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,
	Chen-Yu Tsai <wens@...e.org>
Subject: linux-next: manual merge of the sunxi tree with the arm-soc tree

Hi Maxime,

Today's linux-next merge of the sunxi tree got a conflict in
arch/arm/boot/dts/sun6i-a31.dtsi between commit 3fd0c05da46c ("Revert
"ARM: dts: sunxi: Use sun4i-a10-apb1-clk for sun6i/sun8i apb2
clocks."") from the arm-soc tree and commit 74c947ab33c9 ("ARM: dts:
sunxi: Use sun4i-a10-apb1-clk for sun6i/sun8i apb2 clocks") from the
sunxi tree.

I fixed it up (I just used the arm-soc version for now) 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/sun6i-a31.dtsi
index 529c73803976,f47156b6572b..000000000000
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@@ -217,19 -229,11 +229,19 @@@
  					"apb1_daudio1";
  		};
  
 -		apb2: clk@...20058 {
 +		apb2_mux: apb2_mux@...20058 {
 +			#clock-cells = <0>;
 +			compatible = "allwinner,sun4i-a10-apb1-mux-clk";
 +			reg = <0x01c20058 0x4>;
 +			clocks = <&osc32k>, <&osc24M>, <&pll6 0>, <&pll6 0>;
 +			clock-output-names = "apb2_mux";
 +		};
 +
 +		apb2: apb2@...20058 {
  			#clock-cells = <0>;
- 			compatible = "allwinner,sun6i-a31-apb2-div-clk";
+ 			compatible = "allwinner,sun4i-a10-apb1-clk";
  			reg = <0x01c20058 0x4>;
- 			clocks = <&apb2_mux>;
+ 			clocks = <&osc32k>, <&osc24M>, <&pll6 0>, <&pll6 0>;
  			clock-output-names = "apb2";
  		};
  

Content of type "application/pgp-signature" skipped