RE: linux-next: manual merge of the net-next tree with the arm-soc tree

[Yoshihiro Shimoda]

Hi Stephen,

> From: Stephen Rothwell, Sent: Wednesday, February 17, 2021 6:18 AM
> On Tue, 16 Feb 2021 11:53:56 + Yoshihiro Shimoda 
>  wrote:
> >
> > > From: Stephen Rothwell, Sent: Tuesday, February 16, 2021 11:05 AM
> > 
> > > diff --cc arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> > > index 2407b2d89c1e,48fa8776e36f..
> > > --- 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";
> > >   };
> > >
> > >  + {
> > >  +status = "okay";
> > >  +clocks = <_clk>;
> > >  +};
> > >  +
> > >  + {
> > >  +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

Re: linux-next: manual merge of the net-next tree with the arm-soc tree

[Stephen Rothwell]

Hi Yoshihiro,

On Tue, 16 Feb 2021 11:53:56 + Yoshihiro Shimoda 
 wrote:
>
> > From: Stephen Rothwell, Sent: Tuesday, February 16, 2021 11:05 AM  
> 
> > diff --cc arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> > index 2407b2d89c1e,48fa8776e36f..
> > --- 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";
> >   };
> > 
> >  + {
> >  +  status = "okay";
> >  +  clocks = <_clk>;
> >  +};
> >  +
> >  + {
> >  +  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


pgpfHI1agRGzs.pgp
Description: OpenPGP digital signature

RE: linux-next: manual merge of the net-next tree with the arm-soc tree

[nobuhiro1.iwamatsu]

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(岩松 信洋 □ＳＷＣ◯ＡＣＴ)
> Sent: Tuesday, February 16, 2021 10:47 PM
> To: Naresh Kamboju ; Yoshihiro Shimoda 
> ; Stephen
> Rothwell 
> Cc: David Miller ; Networking ; 
> Olof Johansson ; Arnd
> Bergmann ; ARM ; Bartosz 
> Golaszewski
> ; Linux Next Mailing List 
> ; Linux Kernel Mailing List
> ; lkft-tri...@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 @@
> 
>   {
>   status = "okay";
> +};`
> +
> + {
> + status = "okay";
> + phy-handle = <>;
> + phy-mode = "rgmii-id";
> + clocks = <>, <>;
> + 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


0001-arm64-dts-visconti-Fix-parse-error-for-TMPV7708-RM-m.patch
Description: 0001-arm64-dts-visconti-Fix-parse-error-for-TMPV7708-RM-m.patch

RE: linux-next: manual merge of the net-next tree with the arm-soc tree

[nobuhiro1.iwamatsu]

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 @@
 
  {
status = "okay";
+};`
+
+ {
+   status = "okay";
+   phy-handle = <>;
+   phy-mode = "rgmii-id";
+   clocks = <>, <>;
+   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

Re: linux-next: manual merge of the net-next tree with the arm-soc tree

[Naresh Kamboju]

On Tue, 16 Feb 2021 at 17:26, Yoshihiro Shimoda
 wrote:
>
> Hi,
>
> > From: Stephen Rothwell, Sent: Tuesday, February 16, 2021 11:05 AM
> 
> > diff --cc arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> > index 2407b2d89c1e,48fa8776e36f..
> > --- 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";
> >   };
> >
> >  + {
> >  +status = "okay";
> >  +clocks = <_clk>;
> >  +};
> >  +
> >  + {
> >  +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

RE: linux-next: manual merge of the net-next tree with the arm-soc tree

[Yoshihiro Shimoda]

Hi,

> From: Stephen Rothwell, Sent: Tuesday, February 16, 2021 11:05 AM

> diff --cc arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> index 2407b2d89c1e,48fa8776e36f..
> --- 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";
>   };
> 
>  + {
>  +status = "okay";
>  +clocks = <_clk>;
>  +};
>  +
>  + {
>  +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

Re: linux-next: manual merge of the net-next tree with the arm-soc tree

[Arnd Bergmann]

On Tue, Feb 16, 2021 at 3:20 AM  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 s...@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

RE: linux-next: manual merge of the net-next tree with the arm-soc tree

[nobuhiro1.iwamatsu]

Hi,

> -Original Message-
> From: Stephen Rothwell [mailto:s...@canb.auug.org.au]
> Sent: Tuesday, February 16, 2021 11:05 AM
> To: David Miller ; Networking ; 
> Olof Johansson ; Arnd
> Bergmann ; ARM 
> Cc: Bartosz Golaszewski ; Linux Kernel Mailing 
> List ; Linux
> Next Mailing List ; iwamatsu nobuhiro(岩松 信洋 
> □ＳＷＣ◯ＡＣＴ)
> 
> 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

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

[Stephen Rothwell]

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..
--- 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";
  };
  
 + {
 +  status = "okay";
 +  clocks = <_clk>;
 +};
 +
 + {
 +  status = "okay";
++};`
++
+  {
+   status = "okay";
+   phy-handle = <>;
+   phy-mode = "rgmii-id";
+   clocks = <>, <>;
+   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..
--- 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 = <15000>;
 +  #clock-cells = <0>;
 +  };
 +
+   clk125mhz: clk125mhz {
+   compatible = "fixed-clock";
+   clock-frequency = <12500>;
+   #clock-cells = <0>;
+   clock-output-names = "clk125mhz";
+   };
+ 
+   clk300mhz: clk300mhz {
+   compatible = "fixed-clock";
+   clock-frequency = <3>;
+   #clock-cells = <0>;
+   clock-output-names = "clk300mhz";
+   };
+ 
soc {
#address-cells = <2>;
#size-cells = <2>;
@@@ -402,11 -399,16 +416,22 @@@
status = "disabled";
};
  
 +  wdt: wdt@2833 {
 +  compatible = "toshiba,visconti-wdt";
 +  reg = <0 0x2833 0 0x1000>;
 +  status = "disabled";
 +  };
++
+   piether: ethernet@2800 {
+   compatible = "toshiba,visconti-dwmac", 
"snps,dwmac-4.20a";
+   reg = <0 0x2800 0 0x1>;
+   interrupts = ;
+   interrupt-names = "macirq";
+   snps,txpbl = <4>;
+   snps,rxpbl = <4>;
+   snps,tso;
+   status = "disabled";
+   };
};
  };
  


pgpm0sBGsiF1m.pgp
Description: OpenPGP digital signature

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

[Stephen Rothwell]

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


pgpfTsWq324Om.pgp
Description: OpenPGP digital signature

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

[Stephen Rothwell]

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..
--- 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@612c {
 +  compatible = "brcm,iproc-pdc-mbox";
 +  reg = <0x612c 0x445>;  /* PDC FS0 regs */
 +  interrupts = ;
 +  #mbox-cells = <1>;
 +  brcm,rx-status-len = <32>;
 +  brcm,use-bcm-hdr;
 +  };
 +
 +  pdc1: iproc-pdc1@612e {
 +  compatible = "brcm,iproc-pdc-mbox";
 +  reg = <0x612e 0x445>;  /* PDC FS1 regs */
 +  interrupts = ;
 +  #mbox-cells = <1>;
 +  brcm,rx-status-len = <32>;
 +  brcm,use-bcm-hdr;
 +  };
 +
 +  pdc2: iproc-pdc2@6130 {
 +  compatible = "brcm,iproc-pdc-mbox";
 +  reg = <0x6130 0x445>;  /* PDC FS2 regs */
 +  interrupts = ;
 +  #mbox-cells = <1>;
 +  brcm,rx-status-len = <32>;
 +  brcm,use-bcm-hdr;
 +  };
 +
 +  pdc3: iproc-pdc3@6132 {
 +  compatible = "brcm,iproc-pdc-mbox";
 +  reg = <0x6132 0x445>;  /* PDC FS3 regs */
 +  interrupts = ;
 +  #mbox-cells = <1>;
 +  brcm,rx-status-len = <32>;
 +  brcm,use-bcm-hdr;
 +  };
 +
+   enet: ethernet@6100 {
+   compatible = "brcm,ns2-amac";
+   reg = <0x6100 0x1000>,
+ <0x6109 0x1000>,
+ <0x6103 0x100>;
+   reg-names = "amac_base", "idm_base", "nicpm_base";
+   interrupts = ;
+   phy-handle = <>;
+   phy-mode = "rgmii";
+   status = "disabled";
+   };
+ 
dma0: dma@6136 {
compatible = "arm,pl330", "arm,primecell";
reg = <0x6136 0x1000>;

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

[Stephen Rothwell]

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..
--- 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@612c {
 +  compatible = "brcm,iproc-pdc-mbox";
 +  reg = <0x612c 0x445>;  /* PDC FS0 regs */
 +  interrupts = ;
 +  #mbox-cells = <1>;
 +  brcm,rx-status-len = <32>;
 +  brcm,use-bcm-hdr;
 +  };
 +
 +  pdc1: iproc-pdc1@612e {
 +  compatible = "brcm,iproc-pdc-mbox";
 +  reg = <0x612e 0x445>;  /* PDC FS1 regs */
 +  interrupts = ;
 +  #mbox-cells = <1>;
 +  brcm,rx-status-len = <32>;
 +  brcm,use-bcm-hdr;
 +  };
 +
 +  pdc2: iproc-pdc2@6130 {
 +  compatible = "brcm,iproc-pdc-mbox";
 +  reg = <0x6130 0x445>;  /* PDC FS2 regs */
 +  interrupts = ;
 +  #mbox-cells = <1>;
 +  brcm,rx-status-len = <32>;
 +  brcm,use-bcm-hdr;
 +  };
 +
 +  pdc3: iproc-pdc3@6132 {
 +  compatible = "brcm,iproc-pdc-mbox";
 +  reg = <0x6132 0x445>;  /* PDC FS3 regs */
 +  interrupts = ;
 +  #mbox-cells = <1>;
 +  brcm,rx-status-len = <32>;
 +  brcm,use-bcm-hdr;
 +  };
 +
+   enet: ethernet@6100 {
+   compatible = "brcm,ns2-amac";
+   reg = <0x6100 0x1000>,
+ <0x6109 0x1000>,
+ <0x6103 0x100>;
+   reg-names = "amac_base", "idm_base", "nicpm_base";
+   interrupts = ;
+   phy-handle = <>;
+   phy-mode = "rgmii";
+   status = "disabled";
+   };
+ 
dma0: dma@6136 {
compatible = "arm,pl330", "arm,primecell";
reg = <0x6136 0x1000>;

Re: linux-next: manual merge of the net-next tree with the arm-soc tree

[Duc Dang]

On Tue, Jul 26, 2016 at 7:53 PM, Stephen Rothwell  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..
> --- 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@1f61 {
> compatible = "apm,xgene2-sgenet";
> status = "disabled";
> -   reg = <0x0 0x1f61 0x0 0x1>,
> +   reg = <0x0 0x1f61 0x0 0xd100>,
>  -<0x0 0x1f60 0x0 0Xd100>,
>  -<0x0 0x2000 0x0 0X2>;
>  +<0x0 0x1f60 0x0 0xd100>,
>  +<0x0 0x2000 0x0 0x2>;
> interrupts = <0 96 4>,
>  <0 97 4>;
> dma-coherent;
Regards,
Duc Dang.

Re: linux-next: manual merge of the net-next tree with the arm-soc tree

[Duc Dang]

On Tue, Jul 26, 2016 at 7:53 PM, Stephen Rothwell  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..
> --- 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@1f61 {
> compatible = "apm,xgene2-sgenet";
> status = "disabled";
> -   reg = <0x0 0x1f61 0x0 0x1>,
> +   reg = <0x0 0x1f61 0x0 0xd100>,
>  -<0x0 0x1f60 0x0 0Xd100>,
>  -<0x0 0x2000 0x0 0X2>;
>  +<0x0 0x1f60 0x0 0xd100>,
>  +<0x0 0x2000 0x0 0x2>;
> interrupts = <0 96 4>,
>  <0 97 4>;
> dma-coherent;
Regards,
Duc Dang.

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

[Stephen Rothwell]

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..
--- 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@1f61 {
compatible = "apm,xgene2-sgenet";
status = "disabled";
-   reg = <0x0 0x1f61 0x0 0x1>,
+   reg = <0x0 0x1f61 0x0 0xd100>,
 -<0x0 0x1f60 0x0 0Xd100>,
 -<0x0 0x2000 0x0 0X2>;
 +<0x0 0x1f60 0x0 0xd100>,
 +<0x0 0x2000 0x0 0x2>;
interrupts = <0 96 4>,
 <0 97 4>;
dma-coherent;

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

[Stephen Rothwell]

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..
--- 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@1f61 {
compatible = "apm,xgene2-sgenet";
status = "disabled";
-   reg = <0x0 0x1f61 0x0 0x1>,
+   reg = <0x0 0x1f61 0x0 0xd100>,
 -<0x0 0x1f60 0x0 0Xd100>,
 -<0x0 0x2000 0x0 0X2>;
 +<0x0 0x1f60 0x0 0xd100>,
 +<0x0 0x2000 0x0 0x2>;
interrupts = <0 96 4>,
 <0 97 4>;
dma-coherent;

Re: linux-next: manual merge of the net-next tree with the arm-soc tree

[Arnd Bergmann]

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

Re: linux-next: manual merge of the net-next tree with the arm-soc tree

[Arnd Bergmann]

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

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

[Stephen Rothwell]

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..
--- 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-names = "default";
 +  pinctrl-0 = <_sel>;
 +  nand_sel: nand_sel {
 +  function = "nand";
 +  groups = "nand_grp";
 +  };
 +};
++
+ _mux_iproc {
+   mdio@10 {
+   gphy0: eth-phy@10 {
+   reg = <0x10>;
+   };
+   };
+ };
diff --cc arch/arm64/boot/dts/broadcom/ns2.dtsi
index d1dc812daaab,46b78fa89f4c..
--- 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@6559 {
 +  compatible = "arm,cci-400";
 +  #address-cells = <1>;
 +  #size-cells = <1>;
 +  reg = <0x6559 0x1000>;
 +  ranges = <0 0x6559 0x1>;
 +
 +  pmu@9000 {
 +  compatible = "arm,cci-400-pmu,r1",
 +   "arm,cci-400-pmu";
 +  reg = <0x9000 0x4000>;
 +  interrupts = ,
 +   ,
 +   ,
 +   ,
 +   ,
 +   ;
 +  };
 +  };
 +
+   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@6603 {
compatible = "arm,sp804", "arm,primecell";
reg = <0x6603 0x1000>;

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

[Stephen Rothwell]

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..
--- 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-names = "default";
 +  pinctrl-0 = <_sel>;
 +  nand_sel: nand_sel {
 +  function = "nand";
 +  groups = "nand_grp";
 +  };
 +};
++
+ _mux_iproc {
+   mdio@10 {
+   gphy0: eth-phy@10 {
+   reg = <0x10>;
+   };
+   };
+ };
diff --cc arch/arm64/boot/dts/broadcom/ns2.dtsi
index d1dc812daaab,46b78fa89f4c..
--- 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@6559 {
 +  compatible = "arm,cci-400";
 +  #address-cells = <1>;
 +  #size-cells = <1>;
 +  reg = <0x6559 0x1000>;
 +  ranges = <0 0x6559 0x1>;
 +
 +  pmu@9000 {
 +  compatible = "arm,cci-400-pmu,r1",
 +   "arm,cci-400-pmu";
 +  reg = <0x9000 0x4000>;
 +  interrupts = ,
 +   ,
 +   ,
 +   ,
 +   ,
 +   ;
 +  };
 +  };
 +
+   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@6603 {
compatible = "arm,sp804", "arm,primecell";
reg = <0x6603 0x1000>;

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

[Stephen Rothwell]

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..
--- 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

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

[Stephen Rothwell]

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..
--- 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

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

[Stephen Rothwell]

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 Rothwells...@canb.auug.org.au

diff --cc arch/arm/boot/dts/rk3288.dtsi
index 2a878a35facc,910dcad2088a..
--- 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 _pull_none>;
 +  };
 +
 +  ddrio_pwroff: ddrio-pwroff {
 +  rockchip,pins = <0 1 RK_FUNC_1 _pull_none>;
 +  };
 +
 +  ddr0_retention: ddr0-retention {
 +  rockchip,pins = <0 2 RK_FUNC_1 _pull_up>;
 +  };
 +
 +  ddr1_retention: ddr1-retention {
 +  rockchip,pins = <0 3 RK_FUNC_1 _pull_up>;
 +  };
 +  };
 +
i2c0 {
i2c0_xfer: i2c0-xfer {
rockchip,pins = <0 15 RK_FUNC_1 
_pull_none>,


pgpFIuGY6SdUM.pgp
Description: OpenPGP digital signature

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

[Stephen Rothwell]

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 Rothwells...@canb.auug.org.au

diff --cc arch/arm/boot/dts/rk3288.dtsi
index 2a878a35facc,910dcad2088a..
--- 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,


pgpFIuGY6SdUM.pgp
Description: OpenPGP digital signature

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

[Stephen Rothwell]

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 Rothwells...@canb.auug.org.au

diff --cc arch/arm/boot/dts/rk3188.dtsi
index 82732f5249b2,7f25bc51f2ee..
--- 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 = ;
 +  };
 +
 +  emmc_cmd: emmc-cmd {
 +  rockchip,pins = ;
 +  };
 +
 +  emmc_rst: emmc-rst {
 +  rockchip,pins = ;
 +  };
 +
 +  /*
 +   * 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 = , /* tx_en */
+   , /* txd1 */
+   , /* txd0 */
+   , /* rxd0 */
+   , /* rxd1 */
+   , /* mac_clk */
+   , /* rx_err */
+   ; /* crs_dvalid */
+   };
+ 
+   emac_mdio: emac-mdio {
+   rockchip,pins = ,
+   ;
+   };
+   };
+ 
i2c0 {
i2c0_xfer: i2c0-xfer {
rockchip,pins = ,
diff --cc arch/arm/boot/dts/rk3xxx.dtsi
index 7332d12eb565,208b1df6bcb0..
--- 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@1018 {
 +  compatible = "rockchip,rk3066-usb", "snps,dwc2";
 +  reg = <0x1018 0x4>;
 +  interrupts = ;
 +  clocks = < HCLK_OTG0>;
 +  clock-names = "otg";
 +  status = "disabled";
 +  };
 +
 +  usb_host: usb@101c {
 +  compatible = "snps,dwc2";
 +  reg = <0x101c 0x4>;
 +  interrupts = ;
 +  clocks = < HCLK_OTG1>;
 +  clock-names = "otg";
 +  status = "disabled";
 +  };
 +
+   emac: ethernet@10204000 {
+   compatible = "snps,arc-emac";
+   reg = <0x10204000 0x3c>;
+   interrupts = ;
+   #address-cells = <1>;
+   #size-cells = <0>;
+ 
+   rockchip,grf = <>;
+ 
+   clocks = < HCLK_EMAC>, < 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>;


signature.asc
Description: PGP signature

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

[Stephen Rothwell]

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 Rothwells...@canb.auug.org.au

diff --cc arch/arm/boot/dts/rk3188.dtsi
index 82732f5249b2,7f25bc51f2ee..
--- 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..
--- 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@1018 {
 +  compatible = rockchip,rk3066-usb, snps,dwc2;
 +  reg = 0x1018 0x4;
 +  interrupts = GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH;
 +  clocks = cru HCLK_OTG0;
 +  clock-names = otg;
 +  status = disabled;
 +  };
 +
 +  usb_host: usb@101c {
 +  compatible = snps,dwc2;
 +  reg = 0x101c 0x4;
 +  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;


signature.asc
Description: PGP signature

Re: linux-next: manual merge of the net-next tree with the arm-soc tree

[Arnd Bergmann]

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: linux-next: manual merge of the net-next tree with the arm-soc tree

[Arnd Bergmann]

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
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

[Stephen Rothwell]

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 Rothwells...@canb.auug.org.au

diff --cc arch/arm/boot/dts/rk3188-radxarock.dts
index 2c2313ff67c6,d63d685ea6cc..
--- 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 = ;
 +  };
 +  };
 +
+   lan8720a  {
+   phy_int: phy-int {
+   rockchip,pins = ;
+   };
+   };
+ 
ir-receiver {
ir_recv_pin: ir-recv-pin {
rockchip,pins = ;


signature.asc
Description: PGP signature

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

[Stephen Rothwell]

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 Rothwells...@canb.auug.org.au

diff --cc arch/arm/boot/dts/rk3188-radxarock.dts
index 2c2313ff67c6,d63d685ea6cc..
--- 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;


signature.asc
Description: PGP signature

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

[Stephen Rothwell]

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 Rothwells...@canb.auug.org.au

diff --cc Documentation/devicetree/bindings/net/stmmac.txt
index 9a0c1b7bee29,5748351fb9df..
--- 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:
  


pgpnMiDJC4Z8d.pgp
Description: PGP signature

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

[Stephen Rothwell]

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 Rothwells...@canb.auug.org.au

diff --cc Documentation/devicetree/bindings/net/stmmac.txt
index 9a0c1b7bee29,5748351fb9df..
--- 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:
  


pgpnMiDJC4Z8d.pgp
Description: PGP signature