LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* linux-next: manual merge of the net-next tree with the arm-soc tree
@ 2015-01-27  2:04 Stephen Rothwell
  0 siblings, 0 replies; 23+ messages in thread
From: Stephen Rothwell @ 2015-01-27  2:04 UTC (permalink / raw)
  To: David Miller, netdev, Olof Johansson, Arnd Bergmann, linux-arm-kernel
  Cc: linux-next, linux-kernel, Roger Chen, Chris Zhong, Heiko Stuebner

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

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
arch/arm/boot/dts/rk3288.dtsi between commit eecfe981cecd ("ARM: dts:
rockchip: add RK3288 suspend support") from the arm-soc tree and commit
3d3fb74afc9b ("ARM: dts: rockchip: add gmac info for rk3288") from the
net-next 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/rk3288.dtsi
index 2a878a35facc,910dcad2088a..000000000000
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@@ -734,24 -741,11 +750,29 @@@
  			bias-disable;
  		};
  
+ 		pcfg_pull_none_12ma: pcfg-pull-none-12ma {
+ 			bias-disable;
+ 			drive-strength = <12>;
+ 		};
+ 
 +		sleep {
 +			global_pwroff: global-pwroff {
 +				rockchip,pins = <0 0 RK_FUNC_1 &pcfg_pull_none>;
 +			};
 +
 +			ddrio_pwroff: ddrio-pwroff {
 +				rockchip,pins = <0 1 RK_FUNC_1 &pcfg_pull_none>;
 +			};
 +
 +			ddr0_retention: ddr0-retention {
 +				rockchip,pins = <0 2 RK_FUNC_1 &pcfg_pull_up>;
 +			};
 +
 +			ddr1_retention: ddr1-retention {
 +				rockchip,pins = <0 3 RK_FUNC_1 &pcfg_pull_up>;
 +			};
 +		};
 +
  		i2c0 {
  			i2c0_xfer: i2c0-xfer {
  				rockchip,pins = <0 15 RK_FUNC_1 &pcfg_pull_none>,

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 23+ messages in thread

* RE: linux-next: manual merge of the net-next tree with the arm-soc tree
  2021-02-16 21:17   ` Stephen Rothwell
@ 2021-02-17  0:23     ` Yoshihiro Shimoda
  0 siblings, 0 replies; 23+ messages in thread
From: Yoshihiro Shimoda @ 2021-02-17  0:23 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: David Miller, Networking, Olof Johansson, Arnd Bergmann, ARM,
	Bartosz Golaszewski, Nobuhiro Iwamatsu, Linux Next Mailing List,
	Linux Kernel Mailing List

Hi Stephen,

> From: Stephen Rothwell, Sent: Wednesday, February 17, 2021 6:18 AM
> On Tue, 16 Feb 2021 11:53:56 +0000 Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> wrote:
> >
> > > From: Stephen Rothwell, Sent: Tuesday, February 16, 2021 11:05 AM
> > <snip>
> > > diff --cc arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> > > index 2407b2d89c1e,48fa8776e36f..000000000000
> > > --- a/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> > > +++ b/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> > > @@@ -42,11 -42,20 +42,29 @@@
> > >   	clock-names = "apb_pclk";
> > >   };
> > >
> > >  +&wdt {
> > >  +	status = "okay";
> > >  +	clocks = <&wdt_clk>;
> > >  +};
> > >  +
> > >  +&gpio {
> > >  +	status = "okay";
> > > ++};`
> >
> > This ` causes the following build error on the next-20210216.
> >
> >   DTC     arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dtb
> > Error: arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts:52.3-4 syntax error
> > FATAL ERROR: Unable to parse input tree
> > scripts/Makefile.lib:336: recipe for target 'arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dtb' failed
> > make[2]: *** [arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dtb] Error 1
> > scripts/Makefile.build:530: recipe for target 'arch/arm64/boot/dts/toshiba' failed
> 
> Sorry about that ( ` is nect to ESC on my keyboard) it will be fixed up
> in today's resolution.

Thank you for the reply! I understood it.

Best regards,
Yoshihiro Shimoda


^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: linux-next: manual merge of the net-next tree with the arm-soc tree
  2021-02-16 11:53 ` Yoshihiro Shimoda
  2021-02-16 12:28   ` Naresh Kamboju
@ 2021-02-16 21:17   ` Stephen Rothwell
  2021-02-17  0:23     ` Yoshihiro Shimoda
  1 sibling, 1 reply; 23+ messages in thread
From: Stephen Rothwell @ 2021-02-16 21:17 UTC (permalink / raw)
  To: Yoshihiro Shimoda
  Cc: David Miller, Networking, Olof Johansson, Arnd Bergmann, ARM,
	Bartosz Golaszewski, Nobuhiro Iwamatsu, Linux Next Mailing List,
	Linux Kernel Mailing List

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

Hi Yoshihiro,

On Tue, 16 Feb 2021 11:53:56 +0000 Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> wrote:
>
> > From: Stephen Rothwell, Sent: Tuesday, February 16, 2021 11:05 AM  
> <snip>
> > diff --cc arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> > index 2407b2d89c1e,48fa8776e36f..000000000000
> > --- a/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> > +++ b/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> > @@@ -42,11 -42,20 +42,29 @@@
> >   	clock-names = "apb_pclk";
> >   };
> > 
> >  +&wdt {
> >  +	status = "okay";
> >  +	clocks = <&wdt_clk>;
> >  +};
> >  +
> >  +&gpio {
> >  +	status = "okay";
> > ++};`  
> 
> This ` causes the following build error on the next-20210216.
> 
>   DTC     arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dtb
> Error: arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts:52.3-4 syntax error
> FATAL ERROR: Unable to parse input tree
> scripts/Makefile.lib:336: recipe for target 'arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dtb' failed
> make[2]: *** [arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dtb] Error 1
> scripts/Makefile.build:530: recipe for target 'arch/arm64/boot/dts/toshiba' failed

Sorry about that ( ` is nect to ESC on my keyboard) it will be fixed up
in today's resolution.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 23+ messages in thread

* RE: linux-next: manual merge of the net-next tree with the arm-soc tree
  2021-02-16 13:47     ` nobuhiro1.iwamatsu
@ 2021-02-16 14:21       ` nobuhiro1.iwamatsu
  0 siblings, 0 replies; 23+ messages in thread
From: nobuhiro1.iwamatsu @ 2021-02-16 14:21 UTC (permalink / raw)
  To: naresh.kamboju, yoshihiro.shimoda.uh, sfr
  Cc: davem, netdev, olof, arnd, linux-arm-kernel, bgolaszewski,
	linux-next, linux-kernel, lkft-triage

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

Hi,

I attached a patch which revise this issue.
If I need to send with git send-email, please let me know.

Best regards,
  Nobuhiro

> -----Original Message-----
> From: iwamatsu nobuhiro(岩松 信洋 □SWC◯ACT)
> Sent: Tuesday, February 16, 2021 10:47 PM
> To: Naresh Kamboju <naresh.kamboju@linaro.org>; Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>; Stephen
> Rothwell <sfr@canb.auug.org.au>
> Cc: David Miller <davem@davemloft.net>; Networking <netdev@vger.kernel.org>; Olof Johansson <olof@lixom.net>; Arnd
> Bergmann <arnd@arndb.de>; ARM <linux-arm-kernel@lists.infradead.org>; Bartosz Golaszewski
> <bgolaszewski@baylibre.com>; Linux Next Mailing List <linux-next@vger.kernel.org>; Linux Kernel Mailing List
> <linux-kernel@vger.kernel.org>; lkft-triage@lists.linaro.org
> Subject: RE: linux-next: manual merge of the net-next tree with the arm-soc tree
> 
> Hi,
> 
> Thnaks for your report.
> 
> > LKFT builders also found this problem while building arm64 dtb.
> >
> > > This ` causes the following build error on the next-20210216.
> > >
> > >   DTC     arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dtb
> > > Error: arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts:52.3-4 syntax error
> > > FATAL ERROR: Unable to parse input tree
> > > scripts/Makefile.lib:336: recipe for target 'arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dtb' failed
> > > make[2]: *** [arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dtb] Error 1
> > > scripts/Makefile.build:530: recipe for target 'arch/arm64/boot/dts/toshiba' failed
> >
> > ref:
> > https://gitlab.com/Linaro/lkft/mirrors/next/linux-next/-/jobs/1033072509#L382
> >
> 
> This seems to be a problem fixing the conflict.
> 
> https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=c5e188ea08290d9b6625b4bef322012c0b
> 1902d7
> 
> ```
> diff --git a/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts b/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> index 2407b2d89c1e9..3760df93a89b5 100644
> --- a/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> +++ b/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> @@ -49,4 +49,22 @@
> 
>  &gpio {
>  	status = "okay";
> +};`
> +
> +&piether {
> +	status = "okay";
> +	phy-handle = <&phy0>;
> +	phy-mode = "rgmii-id";
> +	clocks = <&clk300mhz>, <&clk125mhz>;
> +	clock-names = "stmmaceth", "phy_ref_clk";
> +
> +	mdio0 {
> +		#address-cells = <1>;
> +		#size-cells = <0>;
> +		compatible = "snps,dwmac-mdio";
> +		phy0: ethernet-phy@1 {
> +			device_type = "ethernet-phy";
> +			reg = <0x1>;
> +		};
> +	};
>  };
> ```
> 
> Stephen, could you fix this?
> 
> Best regards,
>   Nobuhiro

[-- Attachment #2: 0001-arm64-dts-visconti-Fix-parse-error-for-TMPV7708-RM-m.patch --]
[-- Type: application/octet-stream, Size: 1151 bytes --]

From 7d852e61df20487efd2ae3627cce498b85d2e884 Mon Sep 17 00:00:00 2001
From: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
Date: Tue, 16 Feb 2021 23:05:09 +0900
Subject: [PATCH] arm64: dts: visconti: Fix parse error for TMPV7708 RM main
 board

The patch fix commit: c5e188ea08290d9 ("Merge remote-tracking branch
'net-next/master'").
This merge commit fixes tmpv7708-rm-mbrc.dts's conflict, but the typo
causes a parse error. This removes this typo.

ref: https://gitlab.com/Linaro/lkft/mirrors/next/linux-next/-/jobs/1033072509#L382
Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org>
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
---
 arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts b/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
index 3760df93a89b57..230f487dd6b2e3 100644
--- a/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
+++ b/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
@@ -49,7 +49,7 @@ &wdt {
 
 &gpio {
 	status = "okay";
-};`
+};
 
 &piether {
 	status = "okay";
-- 
2.30.0


^ permalink raw reply	[flat|nested] 23+ messages in thread

* RE: linux-next: manual merge of the net-next tree with the arm-soc tree
  2021-02-16 12:28   ` Naresh Kamboju
@ 2021-02-16 13:47     ` nobuhiro1.iwamatsu
  2021-02-16 14:21       ` nobuhiro1.iwamatsu
  0 siblings, 1 reply; 23+ messages in thread
From: nobuhiro1.iwamatsu @ 2021-02-16 13:47 UTC (permalink / raw)
  To: naresh.kamboju, yoshihiro.shimoda.uh, sfr
  Cc: davem, netdev, olof, arnd, linux-arm-kernel, bgolaszewski,
	linux-next, linux-kernel, lkft-triage

Hi,

Thnaks for your report.

> LKFT builders also found this problem while building arm64 dtb.
> 
> > This ` causes the following build error on the next-20210216.
> >
> >   DTC     arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dtb
> > Error: arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts:52.3-4 syntax error
> > FATAL ERROR: Unable to parse input tree
> > scripts/Makefile.lib:336: recipe for target 'arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dtb' failed
> > make[2]: *** [arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dtb] Error 1
> > scripts/Makefile.build:530: recipe for target 'arch/arm64/boot/dts/toshiba' failed
> 
> ref:
> https://gitlab.com/Linaro/lkft/mirrors/next/linux-next/-/jobs/1033072509#L382
> 

This seems to be a problem fixing the conflict.

https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=c5e188ea08290d9b6625b4bef322012c0b1902d7

```
diff --git a/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts b/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
index 2407b2d89c1e9..3760df93a89b5 100644
--- a/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
+++ b/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
@@ -49,4 +49,22 @@
 
 &gpio {
 	status = "okay";
+};`
+
+&piether {
+	status = "okay";
+	phy-handle = <&phy0>;
+	phy-mode = "rgmii-id";
+	clocks = <&clk300mhz>, <&clk125mhz>;
+	clock-names = "stmmaceth", "phy_ref_clk";
+
+	mdio0 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "snps,dwmac-mdio";
+		phy0: ethernet-phy@1 {
+			device_type = "ethernet-phy";
+			reg = <0x1>;
+		};
+	};
 };
```

Stephen, could you fix this?

Best regards,
  Nobuhiro

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: linux-next: manual merge of the net-next tree with the arm-soc tree
  2021-02-16 11:53 ` Yoshihiro Shimoda
@ 2021-02-16 12:28   ` Naresh Kamboju
  2021-02-16 13:47     ` nobuhiro1.iwamatsu
  2021-02-16 21:17   ` Stephen Rothwell
  1 sibling, 1 reply; 23+ messages in thread
From: Naresh Kamboju @ 2021-02-16 12:28 UTC (permalink / raw)
  To: Yoshihiro Shimoda
  Cc: Stephen Rothwell, David Miller, Networking, Olof Johansson,
	Arnd Bergmann, ARM, Bartosz Golaszewski, Nobuhiro Iwamatsu,
	Linux Next Mailing List, Linux Kernel Mailing List, lkft-triage

On Tue, 16 Feb 2021 at 17:26, Yoshihiro Shimoda
<yoshihiro.shimoda.uh@renesas.com> wrote:
>
> Hi,
>
> > From: Stephen Rothwell, Sent: Tuesday, February 16, 2021 11:05 AM
> <snip>
> > diff --cc arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> > index 2407b2d89c1e,48fa8776e36f..000000000000
> > --- a/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> > +++ b/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> > @@@ -42,11 -42,20 +42,29 @@@
> >       clock-names = "apb_pclk";
> >   };
> >
> >  +&wdt {
> >  +    status = "okay";
> >  +    clocks = <&wdt_clk>;
> >  +};
> >  +
> >  +&gpio {
> >  +    status = "okay";
> > ++};`
>

LKFT builders also found this problem while building arm64 dtb.

> This ` causes the following build error on the next-20210216.
>
>   DTC     arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dtb
> Error: arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts:52.3-4 syntax error
> FATAL ERROR: Unable to parse input tree
> scripts/Makefile.lib:336: recipe for target 'arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dtb' failed
> make[2]: *** [arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dtb] Error 1
> scripts/Makefile.build:530: recipe for target 'arch/arm64/boot/dts/toshiba' failed

ref:
https://gitlab.com/Linaro/lkft/mirrors/next/linux-next/-/jobs/1033072509#L382

- Naresh

^ permalink raw reply	[flat|nested] 23+ messages in thread

* RE: linux-next: manual merge of the net-next tree with the arm-soc tree
  2021-02-16  2:04 Stephen Rothwell
  2021-02-16  2:20 ` nobuhiro1.iwamatsu
@ 2021-02-16 11:53 ` Yoshihiro Shimoda
  2021-02-16 12:28   ` Naresh Kamboju
  2021-02-16 21:17   ` Stephen Rothwell
  1 sibling, 2 replies; 23+ messages in thread
From: Yoshihiro Shimoda @ 2021-02-16 11:53 UTC (permalink / raw)
  To: Stephen Rothwell, David Miller, Networking, Olof Johansson,
	Arnd Bergmann, ARM
  Cc: Bartosz Golaszewski, Nobuhiro Iwamatsu, Linux Next Mailing List,
	Linux Kernel Mailing List

Hi,

> From: Stephen Rothwell, Sent: Tuesday, February 16, 2021 11:05 AM
<snip>
> diff --cc arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> index 2407b2d89c1e,48fa8776e36f..000000000000
> --- a/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> +++ b/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> @@@ -42,11 -42,20 +42,29 @@@
>   	clock-names = "apb_pclk";
>   };
> 
>  +&wdt {
>  +	status = "okay";
>  +	clocks = <&wdt_clk>;
>  +};
>  +
>  +&gpio {
>  +	status = "okay";
> ++};`

This ` causes the following build error on the next-20210216.

  DTC     arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dtb
Error: arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts:52.3-4 syntax error
FATAL ERROR: Unable to parse input tree
scripts/Makefile.lib:336: recipe for target 'arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dtb' failed
make[2]: *** [arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dtb] Error 1
scripts/Makefile.build:530: recipe for target 'arch/arm64/boot/dts/toshiba' failed

Best regards,
Yoshihiro Shimoda


^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: linux-next: manual merge of the net-next tree with the arm-soc tree
  2021-02-16  2:20 ` nobuhiro1.iwamatsu
@ 2021-02-16 10:11   ` Arnd Bergmann
  0 siblings, 0 replies; 23+ messages in thread
From: Arnd Bergmann @ 2021-02-16 10:11 UTC (permalink / raw)
  To: Nobuhiro Iwamatsu
  Cc: Stephen Rothwell, David Miller, Networking, Olof Johansson,
	Arnd Bergmann, Linux ARM, Bartosz Golaszewski, linux-kernel,
	Linux-Next Mailing List

On Tue, Feb 16, 2021 at 3:20 AM <nobuhiro1.iwamatsu@toshiba.co.jp> wrote:
> >
> > 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.
> >
>
> This is because the DTS changes are included in net-next. This patch should be merged via the soc tree.
> I had the same problem before. How is it correct to send a DTS patch?
> Should I separate into different series?

I have already sent the pull requests for the dts files to Linus, so that's
not changing any more for this time, and he will just have to fix it up
when he pulls both branches.

In the future, please send all dts updates to soc@kernel.org (after the
binding and driver is merged) rather than together with the device drivers.

Sending the devicetree binding updates is a little trickier, as we tend to
want them merged both with the driver and the dts files. One way to do
this is to have a shared branch for the bindings updates, and then base both
the driver branch and the dts branch on top of the same commits for that.

A simpler alternative is to merge only the driver and binding changes in
one release, and send the dts changes for the following release. This
obviously takes longer to complete.

       Arnd

^ permalink raw reply	[flat|nested] 23+ messages in thread

* RE: linux-next: manual merge of the net-next tree with the arm-soc tree
  2021-02-16  2:04 Stephen Rothwell
@ 2021-02-16  2:20 ` nobuhiro1.iwamatsu
  2021-02-16 10:11   ` Arnd Bergmann
  2021-02-16 11:53 ` Yoshihiro Shimoda
  1 sibling, 1 reply; 23+ messages in thread
From: nobuhiro1.iwamatsu @ 2021-02-16  2:20 UTC (permalink / raw)
  To: sfr, davem, netdev, olof, arnd, linux-arm-kernel
  Cc: bgolaszewski, linux-kernel, linux-next

Hi,

> -----Original Message-----
> From: Stephen Rothwell [mailto:sfr@canb.auug.org.au]
> Sent: Tuesday, February 16, 2021 11:05 AM
> To: David Miller <davem@davemloft.net>; Networking <netdev@vger.kernel.org>; Olof Johansson <olof@lixom.net>; Arnd
> Bergmann <arnd@arndb.de>; ARM <linux-arm-kernel@lists.infradead.org>
> Cc: Bartosz Golaszewski <bgolaszewski@baylibre.com>; Linux Kernel Mailing List <linux-kernel@vger.kernel.org>; Linux
> Next Mailing List <linux-next@vger.kernel.org>; iwamatsu nobuhiro(岩松 信洋 □SWC◯ACT)
> <nobuhiro1.iwamatsu@toshiba.co.jp>
> Subject: linux-next: manual merge of the net-next tree with the arm-soc tree
> 
> Hi all,
> 
> Today's linux-next merge of the net-next tree got conflicts in:
> 
>   arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
>   arch/arm64/boot/dts/toshiba/tmpv7708.dtsi
> 
> between commits:
> 
>   4fd18fc38757 ("arm64: dts: visconti: Add watchdog support for TMPV7708 SoC")
>   0109a17564fc ("arm: dts: visconti: Add DT support for Toshiba Visconti5 GPIO driver")
> 
> from the arm-soc tree and commit:
> 
>   ec8a42e73432 ("arm: dts: visconti: Add DT support for Toshiba Visconti5 ethernet controller")
> 
> from the net-next 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.
> 

This is because the DTS changes are included in net-next. This patch should be merged via the soc tree.
I had the same problem before. How is it correct to send a DTS patch?
Should I separate into different series?

Best regards,
  Nobuhiro

^ permalink raw reply	[flat|nested] 23+ messages in thread

* linux-next: manual merge of the net-next tree with the arm-soc tree
@ 2021-02-16  2:04 Stephen Rothwell
  2021-02-16  2:20 ` nobuhiro1.iwamatsu
  2021-02-16 11:53 ` Yoshihiro Shimoda
  0 siblings, 2 replies; 23+ messages in thread
From: Stephen Rothwell @ 2021-02-16  2:04 UTC (permalink / raw)
  To: David Miller, Networking, Olof Johansson, Arnd Bergmann, ARM
  Cc: Bartosz Golaszewski, Linux Kernel Mailing List,
	Linux Next Mailing List, Nobuhiro Iwamatsu

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

Hi all,

Today's linux-next merge of the net-next tree got conflicts in:

  arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
  arch/arm64/boot/dts/toshiba/tmpv7708.dtsi

between commits:

  4fd18fc38757 ("arm64: dts: visconti: Add watchdog support for TMPV7708 SoC")
  0109a17564fc ("arm: dts: visconti: Add DT support for Toshiba Visconti5 GPIO driver")

from the arm-soc tree and commit:

  ec8a42e73432 ("arm: dts: visconti: Add DT support for Toshiba Visconti5 ethernet controller")

from the net-next 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/toshiba/tmpv7708-rm-mbrc.dts
index 2407b2d89c1e,48fa8776e36f..000000000000
--- a/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
+++ b/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
@@@ -42,11 -42,20 +42,29 @@@
  	clock-names = "apb_pclk";
  };
  
 +&wdt {
 +	status = "okay";
 +	clocks = <&wdt_clk>;
 +};
 +
 +&gpio {
 +	status = "okay";
++};`
++
+ &piether {
+ 	status = "okay";
+ 	phy-handle = <&phy0>;
+ 	phy-mode = "rgmii-id";
+ 	clocks = <&clk300mhz>, <&clk125mhz>;
+ 	clock-names = "stmmaceth", "phy_ref_clk";
+ 
+ 	mdio0 {
+ 		#address-cells = <1>;
+ 		#size-cells = <0>;
+ 		compatible = "snps,dwmac-mdio";
+ 		phy0: ethernet-phy@1 {
+ 			device_type = "ethernet-phy";
+ 			reg = <0x1>;
+ 		};
+ 	};
  };
diff --cc arch/arm64/boot/dts/toshiba/tmpv7708.dtsi
index 4264f3e6ac9c,3366786699fc..000000000000
--- a/arch/arm64/boot/dts/toshiba/tmpv7708.dtsi
+++ b/arch/arm64/boot/dts/toshiba/tmpv7708.dtsi
@@@ -134,12 -134,20 +134,26 @@@
  		#clock-cells = <0>;
  	};
  
 +	wdt_clk: wdt-clk {
 +		compatible = "fixed-clock";
 +		clock-frequency = <150000000>;
 +		#clock-cells = <0>;
 +	};
 +
+ 	clk125mhz: clk125mhz {
+ 		compatible = "fixed-clock";
+ 		clock-frequency = <125000000>;
+ 		#clock-cells = <0>;
+ 		clock-output-names = "clk125mhz";
+ 	};
+ 
+ 	clk300mhz: clk300mhz {
+ 		compatible = "fixed-clock";
+ 		clock-frequency = <300000000>;
+ 		#clock-cells = <0>;
+ 		clock-output-names = "clk300mhz";
+ 	};
+ 
  	soc {
  		#address-cells = <2>;
  		#size-cells = <2>;
@@@ -402,11 -399,16 +416,22 @@@
  			status = "disabled";
  		};
  
 +		wdt: wdt@28330000 {
 +			compatible = "toshiba,visconti-wdt";
 +			reg = <0 0x28330000 0 0x1000>;
 +			status = "disabled";
 +		};
++
+ 		piether: ethernet@28000000 {
+ 			compatible = "toshiba,visconti-dwmac", "snps,dwmac-4.20a";
+ 			reg = <0 0x28000000 0 0x10000>;
+ 			interrupts = <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>;
+ 			interrupt-names = "macirq";
+ 			snps,txpbl = <4>;
+ 			snps,rxpbl = <4>;
+ 			snps,tso;
+ 			status = "disabled";
+ 		};
  	};
  };
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 23+ messages in thread

* linux-next: manual merge of the net-next tree with the arm-soc tree
@ 2019-09-05  3:42 Stephen Rothwell
  0 siblings, 0 replies; 23+ messages in thread
From: Stephen Rothwell @ 2019-09-05  3:42 UTC (permalink / raw)
  To: David Miller, Networking, Olof Johansson, Arnd Bergmann, ARM
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Stephen Boyd

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

Hi all,

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

  drivers/net/ethernet/nuvoton/w90p910_ether.c

between commit:

  00d2fbf73d55 ("net: remove w90p910-ether driver")

from the arm-soc tree and commit:

  d1a55841ab24 ("net: Remove dev_err() usage after platform_get_irq()")

from the net-next tree.

I fixed it up (I removed the file) 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 23+ messages in thread

* linux-next: manual merge of the net-next tree with the arm-soc tree
@ 2016-12-01  1:31 Stephen Rothwell
  0 siblings, 0 replies; 23+ messages in thread
From: Stephen Rothwell @ 2016-12-01  1:31 UTC (permalink / raw)
  To: David Miller, Networking, Olof Johansson, Arnd Bergmann, ARM
  Cc: linux-next, linux-kernel, Jon Mason, Rob Rice, Florian Fainelli

Hi all,

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

  arch/arm64/boot/dts/broadcom/ns2.dtsi

between commit:

  e79249143f46 ("arm64: dts: Add Broadcom Northstar2 device tree entries for PDC driver.")

from the arm-soc tree and commit:

  dddc3c9d7d02 ("arm64: dts: NS2: add AMAC ethernet support")

from the net-next 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/broadcom/ns2.dtsi
index 863503d78f57,773ed593da4d..000000000000
--- a/arch/arm64/boot/dts/broadcom/ns2.dtsi
+++ b/arch/arm64/boot/dts/broadcom/ns2.dtsi
@@@ -197,42 -191,18 +197,54 @@@
  
  		#include "ns2-clock.dtsi"
  
 +		pdc0: iproc-pdc0@612c0000 {
 +			compatible = "brcm,iproc-pdc-mbox";
 +			reg = <0x612c0000 0x445>;  /* PDC FS0 regs */
 +			interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
 +			#mbox-cells = <1>;
 +			brcm,rx-status-len = <32>;
 +			brcm,use-bcm-hdr;
 +		};
 +
 +		pdc1: iproc-pdc1@612e0000 {
 +			compatible = "brcm,iproc-pdc-mbox";
 +			reg = <0x612e0000 0x445>;  /* PDC FS1 regs */
 +			interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>;
 +			#mbox-cells = <1>;
 +			brcm,rx-status-len = <32>;
 +			brcm,use-bcm-hdr;
 +		};
 +
 +		pdc2: iproc-pdc2@61300000 {
 +			compatible = "brcm,iproc-pdc-mbox";
 +			reg = <0x61300000 0x445>;  /* PDC FS2 regs */
 +			interrupts = <GIC_SPI 191 IRQ_TYPE_LEVEL_HIGH>;
 +			#mbox-cells = <1>;
 +			brcm,rx-status-len = <32>;
 +			brcm,use-bcm-hdr;
 +		};
 +
 +		pdc3: iproc-pdc3@61320000 {
 +			compatible = "brcm,iproc-pdc-mbox";
 +			reg = <0x61320000 0x445>;  /* PDC FS3 regs */
 +			interrupts = <GIC_SPI 193 IRQ_TYPE_LEVEL_HIGH>;
 +			#mbox-cells = <1>;
 +			brcm,rx-status-len = <32>;
 +			brcm,use-bcm-hdr;
 +		};
 +
+ 		enet: ethernet@61000000 {
+ 			compatible = "brcm,ns2-amac";
+ 			reg = <0x61000000 0x1000>,
+ 			      <0x61090000 0x1000>,
+ 			      <0x61030000 0x100>;
+ 			reg-names = "amac_base", "idm_base", "nicpm_base";
+ 			interrupts = <GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH>;
+ 			phy-handle = <&gphy0>;
+ 			phy-mode = "rgmii";
+ 			status = "disabled";
+ 		};
+ 
  		dma0: dma@61360000 {
  			compatible = "arm,pl330", "arm,primecell";
  			reg = <0x61360000 0x1000>;

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: linux-next: manual merge of the net-next tree with the arm-soc tree
  2016-07-27  2:53 Stephen Rothwell
@ 2016-07-27 20:41 ` Duc Dang
  0 siblings, 0 replies; 23+ messages in thread
From: Duc Dang @ 2016-07-27 20:41 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: David Miller, netdev, Olof Johansson, Arnd Bergmann, linux-arm,
	linux-next, Linux Kernel Mailing List, Bjorn Helgaas,
	Iyappan Subramanian

On Tue, Jul 26, 2016 at 7:53 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
>   arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
>
> between commit:
>
>   cafc4cd0c8b8 ("arm64: dts: apm: Use lowercase consistently for hex constants")
>
> from the arm-soc tree and commit:
>
>   8e694cd2762c ("dtb: xgene: Add MDIO node")
>
> from the net-next 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.

Thanks for taking care of this, Stephen. The fix looks fine.

>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
> index 21028b145d91,2e1e5daa1dc7..000000000000
> --- a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
> +++ b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
> @@@ -628,9 -636,9 +636,9 @@@
>                 sgenet0: ethernet@1f610000 {
>                         compatible = "apm,xgene2-sgenet";
>                         status = "disabled";
> -                       reg = <0x0 0x1f610000 0x0 0x10000>,
> +                       reg = <0x0 0x1f610000 0x0 0xd100>,
>  -                            <0x0 0x1f600000 0x0 0Xd100>,
>  -                            <0x0 0x20000000 0x0 0X20000>;
>  +                            <0x0 0x1f600000 0x0 0xd100>,
>  +                            <0x0 0x20000000 0x0 0x20000>;
>                         interrupts = <0 96 4>,
>                                      <0 97 4>;
>                         dma-coherent;
Regards,
Duc Dang.

^ permalink raw reply	[flat|nested] 23+ messages in thread

* linux-next: manual merge of the net-next tree with the arm-soc tree
@ 2016-07-27  2:53 Stephen Rothwell
  2016-07-27 20:41 ` Duc Dang
  0 siblings, 1 reply; 23+ messages in thread
From: Stephen Rothwell @ 2016-07-27  2:53 UTC (permalink / raw)
  To: David Miller, netdev, Olof Johansson, Arnd Bergmann, linux-arm-kernel
  Cc: linux-next, linux-kernel, Bjorn Helgaas, Duc Dang, Iyappan Subramanian

Hi all,

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

  arch/arm64/boot/dts/apm/apm-shadowcat.dtsi

between commit:

  cafc4cd0c8b8 ("arm64: dts: apm: Use lowercase consistently for hex constants")

from the arm-soc tree and commit:

  8e694cd2762c ("dtb: xgene: Add MDIO node")

from the net-next 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/apm/apm-shadowcat.dtsi
index 21028b145d91,2e1e5daa1dc7..000000000000
--- a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
+++ b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
@@@ -628,9 -636,9 +636,9 @@@
  		sgenet0: ethernet@1f610000 {
  			compatible = "apm,xgene2-sgenet";
  			status = "disabled";
- 			reg = <0x0 0x1f610000 0x0 0x10000>,
+ 			reg = <0x0 0x1f610000 0x0 0xd100>,
 -			      <0x0 0x1f600000 0x0 0Xd100>,
 -			      <0x0 0x20000000 0x0 0X20000>;
 +			      <0x0 0x1f600000 0x0 0xd100>,
 +			      <0x0 0x20000000 0x0 0x20000>;
  			interrupts = <0 96 4>,
  				     <0 97 4>;
  			dma-coherent;

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: linux-next: manual merge of the net-next tree with the arm-soc tree
  2016-06-21  1:18 Stephen Rothwell
@ 2016-06-21  8:56 ` Arnd Bergmann
  0 siblings, 0 replies; 23+ messages in thread
From: Arnd Bergmann @ 2016-06-21  8:56 UTC (permalink / raw)
  To: linux-arm-kernel
  Cc: Stephen Rothwell, David Miller, netdev, Olof Johansson,
	Florian Fainelli, Pramod Kumar, linux-kernel,
	Yendapally Reddy Dhananjaya Reddy, linux-next, Jon Mason

On Tuesday, June 21, 2016 11:18:39 AM CEST Stephen Rothwell wrote:
> Today's linux-next merge of the net-next tree got conflicts in:
> 
>   arch/arm64/boot/dts/broadcom/ns2-svk.dts
>   arch/arm64/boot/dts/broadcom/ns2.dtsi
> 
> between commits:
> 
>   97b1504a30b3 ("arm64: dts: enable pinctrl for Broadcom NS2 SoC")
>   5dcc9c7618df ("arm64: dts: NS2: Add CCI-400 PMU support")
> 
> from the arm-soc tree and commit:
> 
>   5f1a067bfa0a ("dt: mdio-mux: Add mdio multiplexer driver node")
> 
> from the net-next 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!

I don't see a good way to resolve the conflict before the merge window,
but it's simple enough that we can just send it this way and let
Linus handle it.

	Arnd

^ permalink raw reply	[flat|nested] 23+ messages in thread

* linux-next: manual merge of the net-next tree with the arm-soc tree
@ 2016-06-21  1:18 Stephen Rothwell
  2016-06-21  8:56 ` Arnd Bergmann
  0 siblings, 1 reply; 23+ messages in thread
From: Stephen Rothwell @ 2016-06-21  1:18 UTC (permalink / raw)
  To: David Miller, netdev, Olof Johansson, Arnd Bergmann, linux-arm-kernel
  Cc: linux-next, linux-kernel, Pramod Kumar,
	Yendapally Reddy Dhananjaya Reddy, Florian Fainelli, Jon Mason

Hi all,

Today's linux-next merge of the net-next tree got conflicts in:

  arch/arm64/boot/dts/broadcom/ns2-svk.dts
  arch/arm64/boot/dts/broadcom/ns2.dtsi

between commits:

  97b1504a30b3 ("arm64: dts: enable pinctrl for Broadcom NS2 SoC")
  5dcc9c7618df ("arm64: dts: NS2: Add CCI-400 PMU support")

from the arm-soc tree and commit:

  5f1a067bfa0a ("dt: mdio-mux: Add mdio multiplexer driver node")

from the net-next 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/broadcom/ns2-svk.dts
index b062a44a39c7,ea5603fd106a..000000000000
--- a/arch/arm64/boot/dts/broadcom/ns2-svk.dts
+++ b/arch/arm64/boot/dts/broadcom/ns2-svk.dts
@@@ -161,11 -141,10 +169,19 @@@
  	};
  };
  
 +&pinctrl {
 +	pinctrl-names = "default";
 +	pinctrl-0 = <&nand_sel>;
 +	nand_sel: nand_sel {
 +		function = "nand";
 +		groups = "nand_grp";
 +	};
 +};
++
+ &mdio_mux_iproc {
+ 	mdio@10 {
+ 		gphy0: eth-phy@10 {
+ 			reg = <0x10>;
+ 		};
+ 	};
+ };
diff --cc arch/arm64/boot/dts/broadcom/ns2.dtsi
index d1dc812daaab,46b78fa89f4c..000000000000
--- a/arch/arm64/boot/dts/broadcom/ns2.dtsi
+++ b/arch/arm64/boot/dts/broadcom/ns2.dtsi
@@@ -279,26 -263,45 +279,65 @@@
  				      IRQ_TYPE_LEVEL_HIGH)>;
  		};
  
 +		cci@65590000 {
 +			compatible = "arm,cci-400";
 +			#address-cells = <1>;
 +			#size-cells = <1>;
 +			reg = <0x65590000 0x1000>;
 +			ranges = <0 0x65590000 0x10000>;
 +
 +			pmu@9000 {
 +				compatible = "arm,cci-400-pmu,r1",
 +					     "arm,cci-400-pmu";
 +				reg = <0x9000 0x4000>;
 +				interrupts = <GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH>,
 +					     <GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>,
 +					     <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH>,
 +					     <GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH>,
 +					     <GIC_SPI 348 IRQ_TYPE_LEVEL_HIGH>,
 +					     <GIC_SPI 349 IRQ_TYPE_LEVEL_HIGH>;
 +			};
 +		};
 +
+ 		mdio_mux_iproc: mdio-mux@6602023c {
+ 			compatible = "brcm,mdio-mux-iproc";
+ 			reg = <0x6602023c 0x14>;
+ 			#address-cells = <1>;
+ 			#size-cells = <0>;
+ 
+ 			mdio@0 {
+ 				reg = <0x0>;
+ 				#address-cells = <1>;
+ 				#size-cells = <0>;
+ 
+ 				pci_phy0: pci-phy@0 {
+ 					compatible = "brcm,ns2-pcie-phy";
+ 					reg = <0x0>;
+ 					#phy-cells = <0>;
+ 					status = "disabled";
+ 				};
+ 			};
+ 
+ 			mdio@7 {
+ 				reg = <0x7>;
+ 				#address-cells = <1>;
+ 				#size-cells = <0>;
+ 
+ 				pci_phy1: pci-phy@0 {
+ 					compatible = "brcm,ns2-pcie-phy";
+ 					reg = <0x0>;
+ 					#phy-cells = <0>;
+ 					status = "disabled";
+ 				};
+ 			};
+ 
+ 			mdio@10 {
+ 				reg = <0x10>;
+ 				#address-cells = <1>;
+ 				#size-cells = <0>;
+ 			};
+ 		};
+ 
  		timer0: timer@66030000 {
  			compatible = "arm,sp804", "arm,primecell";
  			reg = <0x66030000 0x1000>;

^ permalink raw reply	[flat|nested] 23+ messages in thread

* linux-next: manual merge of the net-next tree with the arm-soc tree
@ 2016-05-10  0:18 Stephen Rothwell
  0 siblings, 0 replies; 23+ messages in thread
From: Stephen Rothwell @ 2016-05-10  0:18 UTC (permalink / raw)
  To: David Miller, netdev, Olof Johansson, Arnd Bergmann, linux-arm-kernel
  Cc: linux-next, linux-kernel, Bjorn Andersson, Andy Gross

Hi all,

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

  include/linux/soc/qcom/smd.h

between commit:

  b853cb9628bf ("soc: qcom: smd: Make callback pass channel reference")

from the arm-soc tree and commit:

  43315f31adc2 ("soc: qcom: smd: Introduce compile stubs")

from the net-next 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.

I wasn't sure if the new functions introduced by b853cb9628bf also
needed compile stubs.
-- 
Cheers,
Stephen Rothwell

diff --cc include/linux/soc/qcom/smd.h
index cb2f81559bc0,46a984f5e3a3..000000000000
--- a/include/linux/soc/qcom/smd.h
+++ b/include/linux/soc/qcom/smd.h
@@@ -44,23 -42,42 +44,49 @@@ struct qcom_smd_driver 
  
  	int (*probe)(struct qcom_smd_device *dev);
  	void (*remove)(struct qcom_smd_device *dev);
 -	int (*callback)(struct qcom_smd_device *, const void *, size_t);
 +	qcom_smd_cb_t callback;
  };
  
+ #if IS_ENABLED(CONFIG_QCOM_SMD)
+ 
  int qcom_smd_driver_register(struct qcom_smd_driver *drv);
  void qcom_smd_driver_unregister(struct qcom_smd_driver *drv);
  
 +void *qcom_smd_get_drvdata(struct qcom_smd_channel *channel);
 +void qcom_smd_set_drvdata(struct qcom_smd_channel *channel, void *data);
 +
+ int qcom_smd_send(struct qcom_smd_channel *channel, const void *data, int len);
+ 
+ #else
+ 
+ static inline int qcom_smd_driver_register(struct qcom_smd_driver *drv)
+ {
+ 	return -ENXIO;
+ }
+ 
+ static inline void qcom_smd_driver_unregister(struct qcom_smd_driver *drv)
+ {
+ 	/* This shouldn't be possible */
+ 	WARN_ON(1);
+ }
+ 
+ static inline int qcom_smd_send(struct qcom_smd_channel *channel,
+ 				const void *data, int len)
+ {
+ 	/* This shouldn't be possible */
+ 	WARN_ON(1);
+ 	return -ENXIO;
+ }
+ 
+ #endif
+ 
  #define module_qcom_smd_driver(__smd_driver) \
  	module_driver(__smd_driver, qcom_smd_driver_register, \
  		      qcom_smd_driver_unregister)
  
- int qcom_smd_send(struct qcom_smd_channel *channel, const void *data, int len);
  
 +struct qcom_smd_channel *qcom_smd_open_channel(struct qcom_smd_channel *channel,
 +					       const char *name,
 +					       qcom_smd_cb_t cb);
 +
  #endif

^ permalink raw reply	[flat|nested] 23+ messages in thread

* linux-next: manual merge of the net-next tree with the arm-soc tree
@ 2014-09-25  2:58 Stephen Rothwell
  0 siblings, 0 replies; 23+ messages in thread
From: Stephen Rothwell @ 2014-09-25  2:58 UTC (permalink / raw)
  To: David Miller, netdev, Olof Johansson, Arnd Bergmann, linux-arm-kernel
  Cc: linux-next, linux-kernel, Romain Perier, Heiko Stuebner

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

Hi all,

Today's linux-next merge of the net-next tree got conflicts in
arch/arm/boot/dts/rk3188.dtsi and arch/arm/boot/dts/rk3xxx.dtsi between
commits fd14e6f9b461 ("ARM: dts: rockchip: add dwc2 controllers for
rk3066 and rk3188") and 4ff4ae1258a9 ("ARM: dts: rockchip: add emmc
nodes for rk3066 and rk3188") from the arm-soc tree and commit
18ec91e1947f ("ARM: dts: Add emac nodes to the rk3188 device tree")
from the net-next 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/rk3188.dtsi
index 82732f5249b2,7f25bc51f2ee..000000000000
--- a/arch/arm/boot/dts/rk3188.dtsi
+++ b/arch/arm/boot/dts/rk3188.dtsi
@@@ -147,27 -147,24 +147,45 @@@
  			bias-disable;
  		};
  
 +		emmc {
 +			emmc_clk: emmc-clk {
 +				rockchip,pins = <RK_GPIO0 24 RK_FUNC_2 &pcfg_pull_none>;
 +			};
 +
 +			emmc_cmd: emmc-cmd {
 +				rockchip,pins = <RK_GPIO0 26 RK_FUNC_2 &pcfg_pull_up>;
 +			};
 +
 +			emmc_rst: emmc-rst {
 +				rockchip,pins = <RK_GPIO0 27 RK_FUNC_2 &pcfg_pull_none>;
 +			};
 +
 +			/*
 +			 * The data pins are shared between nandc and emmc and
 +			 * not accessible through pinctrl. Also they should've
 +			 * been already set correctly by firmware, as
 +			 * flash/emmc is the boot-device.
 +			 */
 +		};
 +
+ 		emac {
+ 			emac_xfer: emac-xfer {
+ 				rockchip,pins = <RK_GPIO3 16 RK_FUNC_2 &pcfg_pull_none>, /* tx_en */
+ 						<RK_GPIO3 17 RK_FUNC_2 &pcfg_pull_none>, /* txd1 */
+ 						<RK_GPIO3 18 RK_FUNC_2 &pcfg_pull_none>, /* txd0 */
+ 						<RK_GPIO3 19 RK_FUNC_2 &pcfg_pull_none>, /* rxd0 */
+ 						<RK_GPIO3 20 RK_FUNC_2 &pcfg_pull_none>, /* rxd1 */
+ 						<RK_GPIO3 21 RK_FUNC_2 &pcfg_pull_none>, /* mac_clk */
+ 						<RK_GPIO3 22 RK_FUNC_2 &pcfg_pull_none>, /* rx_err */
+ 						<RK_GPIO3 23 RK_FUNC_2 &pcfg_pull_none>; /* crs_dvalid */
+ 			};
+ 
+ 			emac_mdio: emac-mdio {
+ 				rockchip,pins = <RK_GPIO3 24 RK_FUNC_2 &pcfg_pull_none>,
+ 						<RK_GPIO3 25 RK_FUNC_2 &pcfg_pull_none>;
+ 			};
+ 		};
+ 
  		i2c0 {
  			i2c0_xfer: i2c0-xfer {
  				rockchip,pins = <RK_GPIO1 24 RK_FUNC_1 &pcfg_pull_none>,
diff --cc arch/arm/boot/dts/rk3xxx.dtsi
index 7332d12eb565,208b1df6bcb0..000000000000
--- a/arch/arm/boot/dts/rk3xxx.dtsi
+++ b/arch/arm/boot/dts/rk3xxx.dtsi
@@@ -134,24 -91,23 +134,41 @@@
  		status = "disabled";
  	};
  
 +	usb_otg: usb@10180000 {
 +		compatible = "rockchip,rk3066-usb", "snps,dwc2";
 +		reg = <0x10180000 0x40000>;
 +		interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
 +		clocks = <&cru HCLK_OTG0>;
 +		clock-names = "otg";
 +		status = "disabled";
 +	};
 +
 +	usb_host: usb@101c0000 {
 +		compatible = "snps,dwc2";
 +		reg = <0x101c0000 0x40000>;
 +		interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
 +		clocks = <&cru HCLK_OTG1>;
 +		clock-names = "otg";
 +		status = "disabled";
 +	};
 +
+ 	emac: ethernet@10204000 {
+ 		compatible = "snps,arc-emac";
+ 		reg = <0x10204000 0x3c>;
+ 		interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
+ 		#address-cells = <1>;
+ 		#size-cells = <0>;
+ 
+ 		rockchip,grf = <&grf>;
+ 
+ 		clocks = <&cru HCLK_EMAC>, <&cru SCLK_MAC>;
+ 		clock-names = "hclk", "macref";
+ 		max-speed = <100>;
+ 		phy-mode = "rmii";
+ 
+ 		status = "disabled";
+ 	};
+ 
  	mmc0: dwmmc@10214000 {
  		compatible = "rockchip,rk2928-dw-mshc";
  		reg = <0x10214000 0x1000>;

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: linux-next: manual merge of the net-next tree with the arm-soc tree
  2014-09-10  4:48 Stephen Rothwell
@ 2014-09-10  8:06 ` Arnd Bergmann
  0 siblings, 0 replies; 23+ messages in thread
From: Arnd Bergmann @ 2014-09-10  8:06 UTC (permalink / raw)
  To: linux-arm-kernel
  Cc: Stephen Rothwell, David Miller, netdev, Olof Johansson,
	linux-next, Romain Perier, linux-kernel, Heiko Stübner

On Wednesday 10 September 2014 14:48:37 Stephen Rothwell wrote:
> Today's linux-next merge of the net-next tree got a conflict in
> arch/arm/boot/dts/rk3188-radxarock.dts between commit 4721ab855d1a
> ("ARM: dts: rockchip: add hym8563 rtc to Radxa Rock board") from the
> arm-soc tree and commit c6ec956b73db ("ARM: dts: Enable emac node on
> the rk3188-radxarock boards") from the net-next tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 

Thanks, looks good.

	Arnd

^ permalink raw reply	[flat|nested] 23+ messages in thread

* linux-next: manual merge of the net-next tree with the arm-soc tree
@ 2014-09-10  4:48 Stephen Rothwell
  2014-09-10  8:06 ` Arnd Bergmann
  0 siblings, 1 reply; 23+ messages in thread
From: Stephen Rothwell @ 2014-09-10  4:48 UTC (permalink / raw)
  To: David Miller, netdev, Olof Johansson, Arnd Bergmann, linux-arm-kernel
  Cc: linux-next, linux-kernel, Romain Perier, Heiko Stübner

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

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
arch/arm/boot/dts/rk3188-radxarock.dts between commit 4721ab855d1a
("ARM: dts: rockchip: add hym8563 rtc to Radxa Rock board") from the
arm-soc tree and commit c6ec956b73db ("ARM: dts: Enable emac node on
the rk3188-radxarock boards") from the net-next 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/rk3188-radxarock.dts
index 2c2313ff67c6,d63d685ea6cc..000000000000
--- a/arch/arm/boot/dts/rk3188-radxarock.dts
+++ b/arch/arm/boot/dts/rk3188-radxarock.dts
@@@ -209,12 -217,12 +225,18 @@@
  		};
  	};
  
 +	hym8563 {
 +		rtc_int: rtc-int {
 +			rockchip,pins = <RK_GPIO0 0 RK_FUNC_GPIO &pcfg_pull_up>;
 +		};
 +	};
 +
+ 	lan8720a  {
+ 		phy_int: phy-int {
+ 			rockchip,pins = <RK_GPIO3 26 RK_FUNC_GPIO &pcfg_pull_up>;
+ 		};
+ 	};
+ 
  	ir-receiver {
  		ir_recv_pin: ir-recv-pin {
  			rockchip,pins = <RK_GPIO0 10 RK_FUNC_GPIO &pcfg_pull_none>;

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 23+ messages in thread

* linux-next: manual merge of the net-next tree with the arm-soc tree
@ 2014-03-31  2:24 Stephen Rothwell
  0 siblings, 0 replies; 23+ messages in thread
From: Stephen Rothwell @ 2014-03-31  2:24 UTC (permalink / raw)
  To: David Miller, netdev, Olof Johansson, Arnd Bergmann, linux-arm-kernel
  Cc: linux-next, linux-kernel, Sergei Shtylyov, Dinh Nguyen

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

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
Documentation/devicetree/bindings/net/stmmac.txt between commit
50b4af414d41 ("dts: stmmac: Document the clocks property in the stmmac
base document") from the arm-soc tree and commit e8f08ee0ad86 ("DT: net:
document Ethernet bindings in one place") from the net-next 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 Documentation/devicetree/bindings/net/stmmac.txt
index 9a0c1b7bee29,5748351fb9df..000000000000
--- a/Documentation/devicetree/bindings/net/stmmac.txt
+++ b/Documentation/devicetree/bindings/net/stmmac.txt
@@@ -31,13 -30,7 +30,11 @@@ Optional properties
  - resets: Should contain a phandle to the STMMAC reset signal, if any
  - reset-names: Should contain the reset signal name "stmmaceth", if a
  	reset phandle is given
- - max-frame-size:	Maximum Transfer Unit (IEEE defined MTU), rather
- 			than the maximum frame size.
+ - max-frame-size: See ethernet.txt file in the same directory
 +- clocks: If present, the first clock should be the GMAC main clock,
 +  further clocks may be specified in derived bindings.
 +- clocks-names: One name for each entry in the clocks property, the
 +  first one should be "stmmaceth".
  
  Examples:
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: linux-next: manual merge of the net-next tree with the arm-soc tree
  2012-01-04  4:06 Stephen Rothwell
@ 2012-01-04  4:46 ` Richard Zhao
  0 siblings, 0 replies; 23+ messages in thread
From: Richard Zhao @ 2012-01-04  4:46 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: David Miller, netdev, Arnd Bergmann, linux-kernel, linux-next,
	Olof Johansson, Richard Zhao, linux-arm-kernel,
	Lothar Waßmann

On Wed, Jan 04, 2012 at 03:06:58PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the net-next tree got a conflict in
> drivers/net/ethernet/freescale/fec.c between commit 0ebafefcaa7a ("net:
> fec: add clk_prepare/clk_unprepare") from the arm-soc tree and commit
> e163cc97f9ac ("net/fec: fix the .remove code") from the net-next tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.
It's good. 

Thanks
Richard
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc drivers/net/ethernet/freescale/fec.c
> index 112af9b,b0b0445..0000000
> --- a/drivers/net/ethernet/freescale/fec.c
> +++ b/drivers/net/ethernet/freescale/fec.c
> @@@ -1638,13 -1657,18 +1657,18 @@@ fec_drv_remove(struct platform_device *
>   	struct net_device *ndev = platform_get_drvdata(pdev);
>   	struct fec_enet_private *fep = netdev_priv(ndev);
>   	struct resource *r;
> + 	int i;
>   
> - 	fec_stop(ndev);
> + 	unregister_netdev(ndev);
>   	fec_enet_mii_remove(fep);
> + 	for (i = 0; i < FEC_IRQ_NUM; i++) {
> + 		int irq = platform_get_irq(pdev, i);
> + 		if (irq > 0)
> + 			free_irq(irq, ndev);
> + 	}
>  -	clk_disable(fep->clk);
>  +	clk_disable_unprepare(fep->clk);
>   	clk_put(fep->clk);
>   	iounmap(fep->hwp);
> - 	unregister_netdev(ndev);
>   	free_netdev(ndev);
>   
>   	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);



> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel



^ permalink raw reply	[flat|nested] 23+ messages in thread

* linux-next: manual merge of the net-next tree with the arm-soc tree
@ 2012-01-04  4:06 Stephen Rothwell
  2012-01-04  4:46 ` Richard Zhao
  0 siblings, 1 reply; 23+ messages in thread
From: Stephen Rothwell @ 2012-01-04  4:06 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Olof Johansson, Arnd Bergmann,
	linux-arm-kernel, Richard Zhao, Lothar Waßmann

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

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
drivers/net/ethernet/freescale/fec.c between commit 0ebafefcaa7a ("net:
fec: add clk_prepare/clk_unprepare") from the arm-soc tree and commit
e163cc97f9ac ("net/fec: fix the .remove code") from the net-next tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/ethernet/freescale/fec.c
index 112af9b,b0b0445..0000000
--- a/drivers/net/ethernet/freescale/fec.c
+++ b/drivers/net/ethernet/freescale/fec.c
@@@ -1638,13 -1657,18 +1657,18 @@@ fec_drv_remove(struct platform_device *
  	struct net_device *ndev = platform_get_drvdata(pdev);
  	struct fec_enet_private *fep = netdev_priv(ndev);
  	struct resource *r;
+ 	int i;
  
- 	fec_stop(ndev);
+ 	unregister_netdev(ndev);
  	fec_enet_mii_remove(fep);
+ 	for (i = 0; i < FEC_IRQ_NUM; i++) {
+ 		int irq = platform_get_irq(pdev, i);
+ 		if (irq > 0)
+ 			free_irq(irq, ndev);
+ 	}
 -	clk_disable(fep->clk);
 +	clk_disable_unprepare(fep->clk);
  	clk_put(fep->clk);
  	iounmap(fep->hwp);
- 	unregister_netdev(ndev);
  	free_netdev(ndev);
  
  	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 23+ messages in thread

end of thread, other threads:[~2021-02-17  0:25 UTC | newest]

Thread overview: 23+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-27  2:04 linux-next: manual merge of the net-next tree with the arm-soc tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2021-02-16  2:04 Stephen Rothwell
2021-02-16  2:20 ` nobuhiro1.iwamatsu
2021-02-16 10:11   ` Arnd Bergmann
2021-02-16 11:53 ` Yoshihiro Shimoda
2021-02-16 12:28   ` Naresh Kamboju
2021-02-16 13:47     ` nobuhiro1.iwamatsu
2021-02-16 14:21       ` nobuhiro1.iwamatsu
2021-02-16 21:17   ` Stephen Rothwell
2021-02-17  0:23     ` Yoshihiro Shimoda
2019-09-05  3:42 Stephen Rothwell
2016-12-01  1:31 Stephen Rothwell
2016-07-27  2:53 Stephen Rothwell
2016-07-27 20:41 ` Duc Dang
2016-06-21  1:18 Stephen Rothwell
2016-06-21  8:56 ` Arnd Bergmann
2016-05-10  0:18 Stephen Rothwell
2014-09-25  2:58 Stephen Rothwell
2014-09-10  4:48 Stephen Rothwell
2014-09-10  8:06 ` Arnd Bergmann
2014-03-31  2:24 Stephen Rothwell
2012-01-04  4:06 Stephen Rothwell
2012-01-04  4:46 ` Richard Zhao

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).