linux-next: manual merge of the crypto tree with the amlogic tree

linux-next: manual merge of the crypto tree with the amlogic tree

[Stephen Rothwell]

Hi Herbert,

Today's linux-next merge of the crypto tree got a conflict in:

  arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi

between commit:

  6939db7e0dbf ("ARM64: dts: meson-gx: Add support for HDMI output")

from the amlogic tree and commit:

  1b3f6d148692 ("ARM64: dts: meson-gx: add clock CLKID_RNG0 to hwrng node")

from the crypto tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
index 4afe1c46ec11,a375cb21cc8b..000000000000
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
@@@ -621,14 -525,7 +621,19 @@@
  	compatible = "amlogic,meson-gxbb-vpu", "amlogic,meson-gx-vpu";
  };
  
 +&hdmi_tx {
 +	compatible = "amlogic,meson-gxbb-dw-hdmi", "amlogic,meson-gx-dw-hdmi";
 +	resets = <&reset RESET_HDMITX_CAPB3>,
 +		 <&reset RESET_HDMI_SYSTEM_RESET>,
 +		 <&reset RESET_HDMI_TX>;
 +	reset-names = "hdmitx_apb", "hdmitx", "hdmitx_phy";
 +	clocks = <&clkc CLKID_HDMI_PCLK>,
 +		 <&clkc CLKID_CLK81>,
 +		 <&clkc CLKID_GCLK_VENCI_INT0>;
 +	clock-names = "isfr", "iahb", "venci";
 +};
++
+ &hwrng {
+ 	clocks = <&clkc CLKID_RNG0>;
+ 	clock-names = "core";
+ };

Re: linux-next: manual merge of the crypto tree with the amlogic tree

[Herbert Xu]

On Wed, Apr 05, 2017 at 10:21:38AM +1000, Stephen Rothwell wrote:
> Hi Herbert,
> 
> Today's linux-next merge of the crypto tree got a conflict in:
> 
>   arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
> 
> between commit:
> 
>   6939db7e0dbf ("ARM64: dts: meson-gx: Add support for HDMI output")
> 
> from the amlogic tree and commit:
> 
>   1b3f6d148692 ("ARM64: dts: meson-gx: add clock CLKID_RNG0 to hwrng node")
> 
> from the crypto tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Looks good to me.  Thanks Stephen.
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

linux-next: manual merge of the crypto tree with the amlogic tree

[Stephen Rothwell]

Hi Herbert,

Today's linux-next merge of the crypto tree got a conflict in:

  arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi

between commit:

  fab6b48ccab3 ("ARM64: dts: amlogic: Add hiu and periphs buses")

from the amlogic tree and commit:

  e434cd2dc4de ("ARM64: dts: meson-gxbb: Add Hardware Random Generator node")

from the crypto tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
index 063e3b679207,83536219d9f6..000000000000
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
@@@ -214,104 -167,11 +214,109 @@@
  			};
  		};
  
 +		periphs: periphs@c8834000 {
 +			compatible = "simple-bus";
 +			reg = <0x0 0xc8834000 0x0 0x2000>;
 +			#address-cells = <2>;
 +			#size-cells = <2>;
 +			ranges = <0x0 0x0 0x0 0xc8834000 0x0 0x2000>;
 +
 +			pinctrl_periphs: pinctrl@4b0 {
 +				compatible = "amlogic,meson-gxbb-periphs-pinctrl";
 +				#address-cells = <2>;
 +				#size-cells = <2>;
 +				ranges;
 +
 +				gpio: bank@4b0 {
 +					reg = <0x0 0x004b0 0x0 0x28>,
 +					      <0x0 0x004e8 0x0 0x14>,
 +					      <0x0 0x00120 0x0 0x14>,
 +					      <0x0 0x00430 0x0 0x40>;
 +					reg-names = "mux", "pull", "pull-enable", "gpio";
 +					gpio-controller;
 +					#gpio-cells = <2>;
 +				};
 +
 +				emmc_pins: emmc {
 +					mux {
 +						groups = "emmc_nand_d07",
 +						       "emmc_cmd",
 +						       "emmc_clk";
 +						function = "emmc";
 +					};
 +				};
 +
 +				sdcard_pins: sdcard {
 +					mux {
 +						groups = "sdcard_d0",
 +						       "sdcard_d1",
 +						       "sdcard_d2",
 +						       "sdcard_d3",
 +						       "sdcard_cmd",
 +						       "sdcard_clk";
 +						function = "sdcard";
 +					};
 +				};
 +
 +				uart_a_pins: uart_a {
 +					mux {
 +						groups = "uart_tx_a",
 +						       "uart_rx_a";
 +						function = "uart_a";
 +					};
 +				};
 +
 +				uart_b_pins: uart_b {
 +					mux {
 +						groups = "uart_tx_b",
 +						       "uart_rx_b";
 +						function = "uart_b";
 +					};
 +				};
 +
 +				uart_c_pins: uart_c {
 +					mux {
 +						groups = "uart_tx_c",
 +						       "uart_rx_c";
 +						function = "uart_c";
 +					};
 +				};
 +
 +				eth_pins: eth_c {
 +					mux {
 +						groups = "eth_mdio",
 +						       "eth_mdc",
 +						       "eth_clk_rx_clk",
 +						       "eth_rx_dv",
 +						       "eth_rxd0",
 +						       "eth_rxd1",
 +						       "eth_rxd2",
 +						       "eth_rxd3",
 +						       "eth_rgmii_tx_clk",
 +						       "eth_tx_en",
 +						       "eth_txd0",
 +						       "eth_txd1",
 +						       "eth_txd2",
 +						       "eth_txd3";
 +						function = "eth";
 +					};
 +				};
 +			};
 +		};
 +
 +		hiubus: hiubus@c883c000 {
 +			compatible = "simple-bus";
 +			reg = <0x0 0xc883c000 0x0 0x2000>;
 +			#address-cells = <2>;
 +			#size-cells = <2>;
 +			ranges = <0x0 0x0 0x0 0xc883c000 0x0 0x2000>;
 +		};
 +
+ 		rng {
+ 			compatible = "amlogic,meson-rng";
+ 			reg = <0x0 0xc8834000 0x0 0x4>;
+ 		};
+ 
  		apb: apb@d0000000 {
  			compatible = "simple-bus";
  			reg = <0x0 0xd0000000 0x0 0x200000>;