Hi,
On Fri, Nov 28, 2014 at 10:36:17AM +1100, Stephen Rothwell wrote:
> 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 [email protected]
>
> 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@01c20058 {
> + apb2_mux: apb2_mux@01c20058 {
> + #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@01c20058 {
> #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";
> };
>
I'm not exactly sure why there is still conflicts between my branches
and arm-soc, since the previous branch that generates these conflicts
was supposed to be dropped, but the correct fix is:
apb2: clk@01c20058 {
#clock-cells = <0>;
compatible = "allwinner,sun4i-a10-apb1-clk";
reg = <0x01c20058 0x4>;
clocks = <&osc32k>, <&osc24M>, <&pll6 0>, <&pll6 0>;
clock-output-names = "apb2";
};
with the apb2_mux node dropped entirely.
Thanks!
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
signature.asc
Description: Digital signature
