linux-next: manual merge of the keystone tree with the arm-soc tree
Hi Santosh,
Today's linux-next merge of the keystone tree got a conflict in:
arch/arm/boot/dts/keystone-k2g.dtsi
between commit:
8dccafaa281aa1d24 ("arm: dts: fix unit-address leading 0s")
from the arm-soc tree and various commits from the keystone 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.
diff --cc arch/arm/boot/dts/keystone-k2g.dtsi
index a1ae69d712f7,6f3521d18125..
--- a/arch/arm/boot/dts/keystone-k2g.dtsi
+++ b/arch/arm/boot/dts/keystone-k2g.dtsi
@@@ -133,7 -136,40 +136,40 @@@
clocks = <_clks 0x0009 1>;
};
+ i2c0: i2c@253 {
+ compatible = "ti,keystone-i2c";
+ reg = <0x0253 0x400>;
+ clocks = <_clks 0x003a 0>;
+ power-domains = <_pds 0x003a>;
+ interrupts = ;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "disabled";
+ };
+
+ i2c1: i2c@2530400 {
+ compatible = "ti,keystone-i2c";
+ reg = <0x02530400 0x400>;
+ clocks = <_clks 0x003b 0>;
+ power-domains = <_pds 0x003b>;
+ interrupts = ;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "disabled";
+ };
+
+ i2c2: i2c@2530800 {
+ compatible = "ti,keystone-i2c";
+ reg = <0x02530800 0x400>;
+ clocks = <_clks 0x003c 0>;
+ power-domains = <_pds 0x003c>;
+ interrupts = ;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "disabled";
+ };
+
- kirq0: keystone_irq@026202a0 {
+ kirq0: keystone_irq@26202a0 {
compatible = "ti,keystone-irq";
interrupts = ;
interrupt-controller;
signature.asc
Description: PGP signature
linux-next: manual merge of the keystone tree with the arm-soc tree
Hi Santosh,
Today's linux-next merge of the keystone tree got a conflict in:
arch/arm/boot/dts/keystone-k2g.dtsi
between commit:
8dccafaa281aa1d24 ("arm: dts: fix unit-address leading 0s")
from the arm-soc tree and various commits from the keystone 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.
diff --cc arch/arm/boot/dts/keystone-k2g.dtsi
index a1ae69d712f7,6f3521d18125..
--- a/arch/arm/boot/dts/keystone-k2g.dtsi
+++ b/arch/arm/boot/dts/keystone-k2g.dtsi
@@@ -133,7 -136,40 +136,40 @@@
clocks = <_clks 0x0009 1>;
};
+ i2c0: i2c@253 {
+ compatible = "ti,keystone-i2c";
+ reg = <0x0253 0x400>;
+ clocks = <_clks 0x003a 0>;
+ power-domains = <_pds 0x003a>;
+ interrupts = ;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "disabled";
+ };
+
+ i2c1: i2c@2530400 {
+ compatible = "ti,keystone-i2c";
+ reg = <0x02530400 0x400>;
+ clocks = <_clks 0x003b 0>;
+ power-domains = <_pds 0x003b>;
+ interrupts = ;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "disabled";
+ };
+
+ i2c2: i2c@2530800 {
+ compatible = "ti,keystone-i2c";
+ reg = <0x02530800 0x400>;
+ clocks = <_clks 0x003c 0>;
+ power-domains = <_pds 0x003c>;
+ interrupts = ;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "disabled";
+ };
+
- kirq0: keystone_irq@026202a0 {
+ kirq0: keystone_irq@26202a0 {
compatible = "ti,keystone-irq";
interrupts = ;
interrupt-controller;
signature.asc
Description: PGP signature
Re: linux-next: manual merge of the keystone tree with the arm-soc tree
On Monday 24 March 2014 09:23 PM, Balbi, Felipe wrote:
> On Mon, Mar 24, 2014 at 08:00:03PM -0400, Santosh Shilimkar wrote:
>> On Monday 24 March 2014 07:55 PM, Stephen Rothwell wrote:
>>> Hi Santosh,
>>>
>>> Today's linux-next merge of the keystone tree got a conflict in
>>> arch/arm/boot/dts/Makefile between commit ba5a37e52194 ("ARM: mvebu: Move
>>> kirkwood DT boards into mach-mvebu") from the arm-soc tree and commit
>>> 400550ae7e77 ("ARM: dts: Build all keystone dt blobs") from the keystone
>>> tree.
>>>
>>> I fixed it up (see below) and can carry the fix as necessary (no action
>>> is required).
>>>
>> Looks fine. Thanks
>
> wow, not even a mention of my original patch [1]. I also couldn't find
> your patch [2] anywhere in the mailing list archives, not even google
> could find it. The only place that commit was ever mentioned was this
> very thread.
>
I thought, we closed the thread mentioning about the patch applied
on the same thread. [1]
> The patch I wrote was valid for v3.14-rc7 (the base where it was
> written), I'd expect to, at a minimum, have a mention or a Reported-by
> or at least see your patch in the mailing list.
>
> Anyway, it's just a patch. Nevermind.
>
I missed to add the reported-by tag and also should have just pasted
the patch in the reply. Sorry about that.
regards,
Santosh
[1] http://www.spinics.net/lists/devicetree/msg27351.html
--
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 keystone tree with the arm-soc tree
On Monday 24 March 2014 09:23 PM, Balbi, Felipe wrote: On Mon, Mar 24, 2014 at 08:00:03PM -0400, Santosh Shilimkar wrote: On Monday 24 March 2014 07:55 PM, Stephen Rothwell wrote: Hi Santosh, Today's linux-next merge of the keystone tree got a conflict in arch/arm/boot/dts/Makefile between commit ba5a37e52194 (ARM: mvebu: Move kirkwood DT boards into mach-mvebu) from the arm-soc tree and commit 400550ae7e77 (ARM: dts: Build all keystone dt blobs) from the keystone tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). Looks fine. Thanks wow, not even a mention of my original patch [1]. I also couldn't find your patch [2] anywhere in the mailing list archives, not even google could find it. The only place that commit was ever mentioned was this very thread. I thought, we closed the thread mentioning about the patch applied on the same thread. [1] The patch I wrote was valid for v3.14-rc7 (the base where it was written), I'd expect to, at a minimum, have a mention or a Reported-by or at least see your patch in the mailing list. Anyway, it's just a patch. Nevermind. I missed to add the reported-by tag and also should have just pasted the patch in the reply. Sorry about that. regards, Santosh [1] http://www.spinics.net/lists/devicetree/msg27351.html -- 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 keystone tree with the arm-soc tree
On Mon, Mar 24, 2014 at 08:00:03PM -0400, Santosh Shilimkar wrote:
> On Monday 24 March 2014 07:55 PM, Stephen Rothwell wrote:
> > Hi Santosh,
> >
> > Today's linux-next merge of the keystone tree got a conflict in
> > arch/arm/boot/dts/Makefile between commit ba5a37e52194 ("ARM: mvebu: Move
> > kirkwood DT boards into mach-mvebu") from the arm-soc tree and commit
> > 400550ae7e77 ("ARM: dts: Build all keystone dt blobs") from the keystone
> > tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary (no action
> > is required).
> >
> Looks fine. Thanks
wow, not even a mention of my original patch [1]. I also couldn't find
your patch [2] anywhere in the mailing list archives, not even google
could find it. The only place that commit was ever mentioned was this
very thread.
The patch I wrote was valid for v3.14-rc7 (the base where it was
written), I'd expect to, at a minimum, have a mention or a Reported-by
or at least see your patch in the mailing list.
Anyway, it's just a patch. Nevermind.
[1] http://marc.info/?l=linux-arm-kernel=139463982310448=2
[2]
https://git.kernel.org/cgit/linux/kernel/git/ssantosh/linux-keystone.git/commit/?h=next=400550ae7e778302a45d2952ac75907903e2610c
--
balbi
signature.asc
Description: Digital signature
Re: linux-next: manual merge of the keystone tree with the arm-soc tree
On Monday 24 March 2014 07:55 PM, Stephen Rothwell wrote:
> Hi Santosh,
>
> Today's linux-next merge of the keystone tree got a conflict in
> arch/arm/boot/dts/Makefile between commit ba5a37e52194 ("ARM: mvebu: Move
> kirkwood DT boards into mach-mvebu") from the arm-soc tree and commit
> 400550ae7e77 ("ARM: dts: Build all keystone dt blobs") from the keystone
> tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
Looks fine. Thanks
Regards,
Santosh
--
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 keystone tree with the arm-soc tree
Hi Santosh,
Today's linux-next merge of the keystone tree got a conflict in
arch/arm/boot/dts/Makefile between commit ba5a37e52194 ("ARM: mvebu: Move
kirkwood DT boards into mach-mvebu") from the arm-soc tree and commit
400550ae7e77 ("ARM: dts: Build all keystone dt blobs") from the keystone
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/Makefile
index 94939ee0c10b,49ff796dc02e..
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -82,9 -81,11 +82,12 @@@ dtb-$(CONFIG_ARCH_HIGHBANK) += highbank
ecx-2000.dtb
dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \
integratorcp.dtb
+ dtb-$(CONFIG_ARCH_KEYSTONE) += k2hk-evm.dtb \
+ k2l-evm.dtb \
+ k2e-evm.dtb
-dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb
-dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \
+kirkwood := \
+ kirkwood-b3.dtb \
+ kirkwood-cloudbox.dtb \
kirkwood-db-88f6281.dtb \
kirkwood-db-88f6282.dtb \
kirkwood-dns320.dtb \
pgpC2TCNxLJdd.pgp
Description: PGP signature
linux-next: manual merge of the keystone tree with the arm-soc tree
Hi Santosh, Today's linux-next merge of the keystone tree got a conflict in arch/arm/boot/dts/Makefile between commit ba5a37e52194 (ARM: mvebu: Move kirkwood DT boards into mach-mvebu) from the arm-soc tree and commit 400550ae7e77 (ARM: dts: Build all keystone dt blobs) from the keystone 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/Makefile index 94939ee0c10b,49ff796dc02e.. --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@@ -82,9 -81,11 +82,12 @@@ dtb-$(CONFIG_ARCH_HIGHBANK) += highbank ecx-2000.dtb dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \ integratorcp.dtb + dtb-$(CONFIG_ARCH_KEYSTONE) += k2hk-evm.dtb \ + k2l-evm.dtb \ + k2e-evm.dtb -dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb -dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \ +kirkwood := \ + kirkwood-b3.dtb \ + kirkwood-cloudbox.dtb \ kirkwood-db-88f6281.dtb \ kirkwood-db-88f6282.dtb \ kirkwood-dns320.dtb \ pgpC2TCNxLJdd.pgp Description: PGP signature
Re: linux-next: manual merge of the keystone tree with the arm-soc tree
On Monday 24 March 2014 07:55 PM, Stephen Rothwell wrote: Hi Santosh, Today's linux-next merge of the keystone tree got a conflict in arch/arm/boot/dts/Makefile between commit ba5a37e52194 (ARM: mvebu: Move kirkwood DT boards into mach-mvebu) from the arm-soc tree and commit 400550ae7e77 (ARM: dts: Build all keystone dt blobs) from the keystone tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). Looks fine. Thanks Regards, Santosh -- 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 keystone tree with the arm-soc tree
On Mon, Mar 24, 2014 at 08:00:03PM -0400, Santosh Shilimkar wrote: On Monday 24 March 2014 07:55 PM, Stephen Rothwell wrote: Hi Santosh, Today's linux-next merge of the keystone tree got a conflict in arch/arm/boot/dts/Makefile between commit ba5a37e52194 (ARM: mvebu: Move kirkwood DT boards into mach-mvebu) from the arm-soc tree and commit 400550ae7e77 (ARM: dts: Build all keystone dt blobs) from the keystone tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). Looks fine. Thanks wow, not even a mention of my original patch [1]. I also couldn't find your patch [2] anywhere in the mailing list archives, not even google could find it. The only place that commit was ever mentioned was this very thread. The patch I wrote was valid for v3.14-rc7 (the base where it was written), I'd expect to, at a minimum, have a mention or a Reported-by or at least see your patch in the mailing list. Anyway, it's just a patch. Nevermind. [1] http://marc.info/?l=linux-arm-kernelm=139463982310448w=2 [2] https://git.kernel.org/cgit/linux/kernel/git/ssantosh/linux-keystone.git/commit/?h=nextid=400550ae7e778302a45d2952ac75907903e2610c -- balbi signature.asc Description: Digital signature
