Re: linux-next: manual merge of the devicetree tree with the arm-soc tree
On Fri, May 22, 2020 at 8:03 AM Stephen Rothwell 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. > > diff --cc Documentation/devicetree/bindings/arm/socionext/uniphier.yaml > index 10a7f0752281,113f93b9ae55.. > --- a/Documentation/devicetree/bindings/arm/socionext/uniphier.yaml > +++ b/Documentation/devicetree/bindings/arm/socionext/uniphier.yaml > @@@ -51,9 -51,8 +51,9 @@@ properties > - description: LD20 SoC boards > items: > - enum: > - - socionext,uniphier-ld20-akebi96 > - - socionext,uniphier-ld20-global > - - socionext,uniphier-ld20-ref > ++ - socionext,uniphier-ld20-akebi96 > + - socionext,uniphier-ld20-global > + - socionext,uniphier-ld20-ref > - const: socionext,uniphier-ld20 > - description: PXs3 SoC boards > items: Ok, thanks! I think can let Linus handle this in the merge window. Arnd
linux-next: manual merge of the devicetree tree with the arm-soc tree
Hi all,
Today's linux-next merge of the devicetree tree got a conflict in:
Documentation/devicetree/bindings/arm/socionext/uniphier.yaml
between commit:
82ab9b6705bd ("dt-bindings: arm: Add Akebi96 board support")
from the arm-soc tree and commit:
9f60a65bc5e6 ("dt-bindings: Clean-up schema indentation formatting")
from the devicetree 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 Documentation/devicetree/bindings/arm/socionext/uniphier.yaml
index 10a7f0752281,113f93b9ae55..
--- a/Documentation/devicetree/bindings/arm/socionext/uniphier.yaml
+++ b/Documentation/devicetree/bindings/arm/socionext/uniphier.yaml
@@@ -51,9 -51,8 +51,9 @@@ properties
- description: LD20 SoC boards
items:
- enum:
- - socionext,uniphier-ld20-akebi96
- - socionext,uniphier-ld20-global
- - socionext,uniphier-ld20-ref
++ - socionext,uniphier-ld20-akebi96
+ - socionext,uniphier-ld20-global
+ - socionext,uniphier-ld20-ref
- const: socionext,uniphier-ld20
- description: PXs3 SoC boards
items:
pgpHbLi0OKGn9.pgp
Description: OpenPGP digital signature
linux-next: manual merge of the devicetree tree with the arm-soc tree
Hi Rob,
Today's linux-next merge of the devicetree tree got a conflict in:
arch/arm64/boot/dts/amlogic/Makefile
between commit:
593d311d9f17 ("ARM64: dts: meson-gxm: Add Vega S96 board")
from the arm-soc tree and commit:
4408a86af32e ("kbuild: handle dtb-y and CONFIG_OF_ALL_DTBS natively in
Makefile.lib")
from the devicetree tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/arm64/boot/dts/amlogic/Makefile
index b503e9b00cd3,4eb8f829472e..
--- a/arch/arm64/boot/dts/amlogic/Makefile
+++ b/arch/arm64/boot/dts/amlogic/Makefile
@@@ -22,8 -19,3 +22,4 @@@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-n
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q200.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q201.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-rbox-pro.dtb
+dtb-$(CONFIG_ARCH_MESON) += meson-gxm-vega-s96.dtb
-
- always:= $(dtb-y)
- subdir-y := $(dts-dirs)
- clean-files := *.dtb
linux-next: manual merge of the devicetree tree with the arm-soc tree
Hi Rob,
Today's linux-next merge of the devicetree tree got a conflict in:
arch/arm64/boot/dts/amlogic/Makefile
between commit:
593d311d9f17 ("ARM64: dts: meson-gxm: Add Vega S96 board")
from the arm-soc tree and commit:
4408a86af32e ("kbuild: handle dtb-y and CONFIG_OF_ALL_DTBS natively in
Makefile.lib")
from the devicetree tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/arm64/boot/dts/amlogic/Makefile
index b503e9b00cd3,4eb8f829472e..
--- a/arch/arm64/boot/dts/amlogic/Makefile
+++ b/arch/arm64/boot/dts/amlogic/Makefile
@@@ -22,8 -19,3 +22,4 @@@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-n
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q200.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q201.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-rbox-pro.dtb
+dtb-$(CONFIG_ARCH_MESON) += meson-gxm-vega-s96.dtb
-
- always:= $(dtb-y)
- subdir-y := $(dts-dirs)
- clean-files := *.dtb
linux-next: manual merge of the devicetree tree with the arm-soc tree
Hi Rob,
Today's linux-next merge of the devicetree tree got a conflict in:
arch/arm64/boot/dts/allwinner/Makefile
between commit:
d7341305863b ("arm64: allwinner: h5: add NanoPi NEO Plus2 DT support")
from the arm-soc tree and commit:
4408a86af32e ("kbuild: handle dtb-y and CONFIG_OF_ALL_DTBS natively in
Makefile.lib")
from the devicetree 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/allwinner/Makefile
index 16fa7b9839e6,4dab590d24a5..
--- a/arch/arm64/boot/dts/allwinner/Makefile
+++ b/arch/arm64/boot/dts/allwinner/Makefile
@@@ -9,8 -8,3 +9,4 @@@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-o
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-prime.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus2.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-neo2.dtb
+dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-neo-plus2.dtb
-
- always:= $(dtb-y)
- subdir-y := $(dts-dirs)
- clean-files := *.dtb
linux-next: manual merge of the devicetree tree with the arm-soc tree
Hi Rob,
Today's linux-next merge of the devicetree tree got a conflict in:
arch/arm64/boot/dts/allwinner/Makefile
between commit:
d7341305863b ("arm64: allwinner: h5: add NanoPi NEO Plus2 DT support")
from the arm-soc tree and commit:
4408a86af32e ("kbuild: handle dtb-y and CONFIG_OF_ALL_DTBS natively in
Makefile.lib")
from the devicetree 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/allwinner/Makefile
index 16fa7b9839e6,4dab590d24a5..
--- a/arch/arm64/boot/dts/allwinner/Makefile
+++ b/arch/arm64/boot/dts/allwinner/Makefile
@@@ -9,8 -8,3 +9,4 @@@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-o
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-prime.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus2.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-neo2.dtb
+dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-neo-plus2.dtb
-
- always:= $(dtb-y)
- subdir-y := $(dts-dirs)
- clean-files := *.dtb
linux-next: manual merge of the devicetree tree with the arm-soc tree
Hi Rob,
Today's linux-next merge of the devicetree tree got a conflict in:
arch/arm/mach-bcm/board_bcm21664.c
between commit:
406c8f6c9954 ("ARM: bcm21664: Remove reset code")
from the arm-soc tree and commit:
850bea2335e4 ("arm: Remove unnecessary of_platform_populate with default
match table")
from the devicetree 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/arm/mach-bcm/board_bcm21664.c
index 65b3db06e57a,0d7034c57334..
--- a/arch/arm/mach-bcm/board_bcm21664.c
+++ b/arch/arm/mach-bcm/board_bcm21664.c
@@@ -11,15 -11,54 +11,12 @@@
* GNU General Public License for more details.
*/
- #include
-#include
-#include
--
#include
#include "kona_l2_cache.h"
-#define RSTMGR_DT_STRING "brcm,bcm21664-resetmgr"
-
-#define RSTMGR_REG_WR_ACCESS_OFFSET 0
-#define RSTMGR_REG_CHIP_SOFT_RST_OFFSET 4
-
-#define RSTMGR_WR_PASSWORD0xa5a5
-#define RSTMGR_WR_PASSWORD_SHIFT 8
-#define RSTMGR_WR_ACCESS_ENABLE 1
-
-static void bcm21664_restart(enum reboot_mode mode, const char *cmd)
-{
- void __iomem *base;
- struct device_node *resetmgr;
-
- resetmgr = of_find_compatible_node(NULL, NULL, RSTMGR_DT_STRING);
- if (!resetmgr) {
- pr_emerg("Couldn't find " RSTMGR_DT_STRING "\n");
- return;
- }
- base = of_iomap(resetmgr, 0);
- if (!base) {
- pr_emerg("Couldn't map " RSTMGR_DT_STRING "\n");
- return;
- }
-
- /*
- * A soft reset is triggered by writing a 0 to bit 0 of the soft reset
- * register. To write to that register we must first write the password
- * and the enable bit in the write access enable register.
- */
- writel((RSTMGR_WR_PASSWORD << RSTMGR_WR_PASSWORD_SHIFT) |
- RSTMGR_WR_ACCESS_ENABLE,
- base + RSTMGR_REG_WR_ACCESS_OFFSET);
- writel(0, base + RSTMGR_REG_CHIP_SOFT_RST_OFFSET);
-
- /* Wait for reset */
- while (1);
-}
-
static void __init bcm21664_init(void)
{
- of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
kona_l2_cache_init();
}
linux-next: manual merge of the devicetree tree with the arm-soc tree
Hi Rob,
Today's linux-next merge of the devicetree tree got a conflict in:
arch/arm/mach-bcm/board_bcm21664.c
between commit:
406c8f6c9954 ("ARM: bcm21664: Remove reset code")
from the arm-soc tree and commit:
850bea2335e4 ("arm: Remove unnecessary of_platform_populate with default
match table")
from the devicetree 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/arm/mach-bcm/board_bcm21664.c
index 65b3db06e57a,0d7034c57334..
--- a/arch/arm/mach-bcm/board_bcm21664.c
+++ b/arch/arm/mach-bcm/board_bcm21664.c
@@@ -11,15 -11,54 +11,12 @@@
* GNU General Public License for more details.
*/
- #include
-#include
-#include
--
#include
#include "kona_l2_cache.h"
-#define RSTMGR_DT_STRING "brcm,bcm21664-resetmgr"
-
-#define RSTMGR_REG_WR_ACCESS_OFFSET 0
-#define RSTMGR_REG_CHIP_SOFT_RST_OFFSET 4
-
-#define RSTMGR_WR_PASSWORD0xa5a5
-#define RSTMGR_WR_PASSWORD_SHIFT 8
-#define RSTMGR_WR_ACCESS_ENABLE 1
-
-static void bcm21664_restart(enum reboot_mode mode, const char *cmd)
-{
- void __iomem *base;
- struct device_node *resetmgr;
-
- resetmgr = of_find_compatible_node(NULL, NULL, RSTMGR_DT_STRING);
- if (!resetmgr) {
- pr_emerg("Couldn't find " RSTMGR_DT_STRING "\n");
- return;
- }
- base = of_iomap(resetmgr, 0);
- if (!base) {
- pr_emerg("Couldn't map " RSTMGR_DT_STRING "\n");
- return;
- }
-
- /*
- * A soft reset is triggered by writing a 0 to bit 0 of the soft reset
- * register. To write to that register we must first write the password
- * and the enable bit in the write access enable register.
- */
- writel((RSTMGR_WR_PASSWORD << RSTMGR_WR_PASSWORD_SHIFT) |
- RSTMGR_WR_ACCESS_ENABLE,
- base + RSTMGR_REG_WR_ACCESS_OFFSET);
- writel(0, base + RSTMGR_REG_CHIP_SOFT_RST_OFFSET);
-
- /* Wait for reset */
- while (1);
-}
-
static void __init bcm21664_init(void)
{
- of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
kona_l2_cache_init();
}
Re: linux-next: manual merge of the devicetree tree with the arm-soc tree
On Wed, 12 Mar 2014 15:36:58 -0700, Olof Johansson wrote:
> On Wed, Mar 12, 2014 at 3:03 PM, Mark Brown wrote:
> > Hi Grant,
> >
> > Today's linux-next merge of the devicetree tree got a conflict in
> > include/asm-generic/vmlinux.lds.h between commit 6c3ff8b11a16ec69 ("ARM:
> > Introduce CPU_METHOD_OF_DECLARE() for cpu hotplug/smp") from the tree and
> > commit f618c4703a14672d27 ("drivers: of: add support for custom reserved
> > memory drivers") from the devicetree tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary (no action
> > is required).
>
> LGTM from the arm-soc side.
Ditto
g.
>
>
> -Olof
--
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 devicetree tree with the arm-soc tree
On Wed, 12 Mar 2014 15:36:58 -0700, Olof Johansson o...@lixom.net wrote: On Wed, Mar 12, 2014 at 3:03 PM, Mark Brown broo...@kernel.org wrote: Hi Grant, Today's linux-next merge of the devicetree tree got a conflict in include/asm-generic/vmlinux.lds.h between commit 6c3ff8b11a16ec69 (ARM: Introduce CPU_METHOD_OF_DECLARE() for cpu hotplug/smp) from the tree and commit f618c4703a14672d27 (drivers: of: add support for custom reserved memory drivers) from the devicetree tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). LGTM from the arm-soc side. Ditto g. -Olof -- 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 devicetree tree with the arm-soc tree
On Wed, Mar 12, 2014 at 3:03 PM, Mark Brown wrote:
> Hi Grant,
>
> Today's linux-next merge of the devicetree tree got a conflict in
> include/asm-generic/vmlinux.lds.h between commit 6c3ff8b11a16ec69 ("ARM:
> Introduce CPU_METHOD_OF_DECLARE() for cpu hotplug/smp") from the tree and
> commit f618c4703a14672d27 ("drivers: of: add support for custom reserved
> memory drivers") from the devicetree tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
LGTM from the arm-soc side.
-Olof
--
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 devicetree tree with the arm-soc tree
Hi Grant,
Today's linux-next merge of the devicetree tree got a conflict in
include/asm-generic/vmlinux.lds.h between commit 6c3ff8b11a16ec69 ("ARM:
Introduce CPU_METHOD_OF_DECLARE() for cpu hotplug/smp") from the tree and
commit f618c4703a14672d27 ("drivers: of: add support for custom reserved memory
drivers") from the devicetree tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
diff --cc include/asm-generic/vmlinux.lds.h
index bd02ca7a1d55,f10f64fcc815..
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@@ -167,15 -167,16 +167,25 @@@
#define CLK_OF_TABLES()
#endif
+#ifdef CONFIG_SMP
+#define CPU_METHOD_OF_TABLES() . = ALIGN(8); \
+ VMLINUX_SYMBOL(__cpu_method_of_table_begin) = .; \
+ *(__cpu_method_of_table) \
+ VMLINUX_SYMBOL(__cpu_method_of_table_end) = .;
+#else
+#define CPU_METHOD_OF_TABLES()
+#endif
+
+ #ifdef CONFIG_OF_RESERVED_MEM
+ #define RESERVEDMEM_OF_TABLES() \
+ . = ALIGN(8); \
+ VMLINUX_SYMBOL(__reservedmem_of_table) = .; \
+ *(__reservedmem_of_table) \
+ *(__reservedmem_of_table_end)
+ #else
+ #define RESERVEDMEM_OF_TABLES()
+ #endif
+
#define KERNEL_DTB() \
STRUCT_ALIGN(); \
VMLINUX_SYMBOL(__dtb_start) = .;\
@@@ -499,8 -500,8 +509,9 @@@
TRACE_SYSCALLS()\
MEM_DISCARD(init.rodata)\
CLK_OF_TABLES() \
+ RESERVEDMEM_OF_TABLES() \
CLKSRC_OF_TABLES() \
+ CPU_METHOD_OF_TABLES() \
KERNEL_DTB()\
IRQCHIP_OF_MATCH_TABLE()
pgpjGyG1mByJh.pgp
Description: PGP signature
linux-next: manual merge of the devicetree tree with the arm-soc tree
Hi Grant, Today's linux-next merge of the devicetree tree got a conflict in include/asm-generic/vmlinux.lds.h between commit 6c3ff8b11a16ec69 (ARM: Introduce CPU_METHOD_OF_DECLARE() for cpu hotplug/smp) from the tree and commit f618c4703a14672d27 (drivers: of: add support for custom reserved memory drivers) from the devicetree tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). diff --cc include/asm-generic/vmlinux.lds.h index bd02ca7a1d55,f10f64fcc815.. --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@@ -167,15 -167,16 +167,25 @@@ #define CLK_OF_TABLES() #endif +#ifdef CONFIG_SMP +#define CPU_METHOD_OF_TABLES() . = ALIGN(8); \ + VMLINUX_SYMBOL(__cpu_method_of_table_begin) = .; \ + *(__cpu_method_of_table) \ + VMLINUX_SYMBOL(__cpu_method_of_table_end) = .; +#else +#define CPU_METHOD_OF_TABLES() +#endif + + #ifdef CONFIG_OF_RESERVED_MEM + #define RESERVEDMEM_OF_TABLES() \ + . = ALIGN(8); \ + VMLINUX_SYMBOL(__reservedmem_of_table) = .; \ + *(__reservedmem_of_table) \ + *(__reservedmem_of_table_end) + #else + #define RESERVEDMEM_OF_TABLES() + #endif + #define KERNEL_DTB() \ STRUCT_ALIGN(); \ VMLINUX_SYMBOL(__dtb_start) = .;\ @@@ -499,8 -500,8 +509,9 @@@ TRACE_SYSCALLS()\ MEM_DISCARD(init.rodata)\ CLK_OF_TABLES() \ + RESERVEDMEM_OF_TABLES() \ CLKSRC_OF_TABLES() \ + CPU_METHOD_OF_TABLES() \ KERNEL_DTB()\ IRQCHIP_OF_MATCH_TABLE() pgpjGyG1mByJh.pgp Description: PGP signature
Re: linux-next: manual merge of the devicetree tree with the arm-soc tree
On Wed, Mar 12, 2014 at 3:03 PM, Mark Brown broo...@kernel.org wrote: Hi Grant, Today's linux-next merge of the devicetree tree got a conflict in include/asm-generic/vmlinux.lds.h between commit 6c3ff8b11a16ec69 (ARM: Introduce CPU_METHOD_OF_DECLARE() for cpu hotplug/smp) from the tree and commit f618c4703a14672d27 (drivers: of: add support for custom reserved memory drivers) from the devicetree tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). LGTM from the arm-soc side. -Olof -- 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 devicetree tree with the arm-soc tree
Stephen,
On Fri, Jan 17, 2014 at 02:08:53PM +1100, Stephen Rothwell wrote:
> Hi Grant,
>
> Today's linux-next merge of the devicetree tree got a conflict in
> arch/arm/boot/dts/dove.dtsi between commits 40aad3c1a9b6 ("dt/bindings:
> Remove all references to device_type "ethernet-phy"") and b31b32119abe
> ("ARM: dove: sort DT nodes by address") from the devicetree tree and
> commit 351291754df3 ("dt/bindings: remove device_type "network"
> references") from the devicetree tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good, thanks.
Jason.
--
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 devicetree tree with the arm-soc tree
Hi Grant,
Today's linux-next merge of the devicetree tree got a conflict in
arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts between commit
6b6430e82331 ("ARM: orion5x: Fix typo in device_type property of phy
node") from the arm-soc tree and commit 40aad3c1a9b6 ("dt/bindings:
Remove all references to device_type "ethernet-phy"") from the devicetree
tree.
I fixed it up (removed the line) and can carry the fix as necessary (no
action is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
pgpcRG_IgnDgL.pgp
Description: PGP signature
linux-next: manual merge of the devicetree tree with the arm-soc tree
Hi Grant,
Today's linux-next merge of the devicetree tree got a conflict in
arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts between commit
261e7735d0ed ("ARM: kirkwood: NETGEAR ReadyNAS Duo v2 .dts cleanup") from
the arm-soc tree and commit 40aad3c1a9b6 ("dt/bindings: Remove all
references to device_type "ethernet-phy"") from the devicetree 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/kirkwood-netgear_readynas_duo_v2.dts
index 4d2a8db9ab77,00c0669b1b8c..
--- a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
+++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
@@@ -241,8 -210,7 +241,7 @@@
{
status = "okay";
- ethphy0: ethernet-phy@0 {
+ ethphy0: ethernet-phy@0 { /* Marvell 88E1318 */
- device_type = "ethernet-phy";
reg = <0>;
};
};
pgp3vSJ5wLaDI.pgp
Description: PGP signature
linux-next: manual merge of the devicetree tree with the arm-soc tree
Hi Grant,
Today's linux-next merge of the devicetree tree got a conflict in
arch/arm/boot/dts/dove.dtsi between commits 40aad3c1a9b6 ("dt/bindings:
Remove all references to device_type "ethernet-phy"") and b31b32119abe
("ARM: dove: sort DT nodes by address") from the devicetree tree and
commit 351291754df3 ("dt/bindings: remove device_type "network"
references") from the devicetree 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/dove.dtsi
index 8de1031233ae,39ffabe04cc5..
--- a/arch/arm/boot/dts/dove.dtsi
+++ b/arch/arm/boot/dts/dove.dtsi
@@@ -170,224 -192,34 +170,222 @@@
status = "disabled";
};
- gpio0: gpio-ctrl@d0400 {
- compatible = "marvell,orion-gpio";
- #gpio-cells = <2>;
- gpio-controller;
- reg = <0xd0400 0x20>;
- ngpios = <32>;
+ spi1: spi-ctrl@14600 {
+ compatible = "marvell,orion-spi";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ cell-index = <1>;
+ interrupts = <5>;
+ reg = <0x14600 0x28>;
+ clocks = <_clk 0>;
+ status = "disabled";
+ };
+
+ mbusc: mbus-ctrl@2 {
+ compatible = "marvell,mbus-controller";
+ reg = <0x2 0x80>, <0x800100 0x8>;
+ };
+
+ bridge_intc: bridge-interrupt-ctrl@20110 {
+ compatible = "marvell,orion-bridge-intc";
interrupt-controller;
- #interrupt-cells = <2>;
- interrupts = <12>, <13>, <14>, <60>;
+ #interrupt-cells = <1>;
+ reg = <0x20110 0x8>;
+ interrupts = <0>;
+ marvell,#interrupts = <5>;
};
- gpio1: gpio-ctrl@d0420 {
- compatible = "marvell,orion-gpio";
- #gpio-cells = <2>;
- gpio-controller;
- reg = <0xd0420 0x20>;
- ngpios = <32>;
+ intc: main-interrupt-ctrl@20200 {
+ compatible = "marvell,orion-intc";
interrupt-controller;
- #interrupt-cells = <2>;
- interrupts = <61>;
+ #interrupt-cells = <1>;
+ reg = <0x20200 0x10>, <0x20210 0x10>;
};
- gpio2: gpio-ctrl@e8400 {
- compatible = "marvell,orion-gpio";
- #gpio-cells = <2>;
- gpio-controller;
- reg = <0xe8400 0x0c>;
- ngpios = <8>;
+ timer: timer@20300 {
+ compatible = "marvell,orion-timer";
+ reg = <0x20300 0x20>;
+ interrupt-parent = <_intc>;
+ interrupts = <1>, <2>;
+ clocks = <_clk 0>;
+ };
+
+ crypto: crypto-engine@3 {
+ compatible = "marvell,orion-crypto";
+ reg = <0x3 0x1>,
+<0xe000 0x800>;
+ reg-names = "regs", "sram";
+ interrupts = <31>;
+ clocks = <_clk 15>;
+ status = "okay";
+ };
+
+ ehci0: usb-host@5 {
+ compatible = "marvell,orion-ehci";
+ reg = <0x5 0x1000>;
+ interrupts = <24>;
+ clocks = <_clk 0>;
+ status = "okay";
+ };
+
+ ehci1: usb-host@51000 {
+ compatible = "marvell,orion-ehci";
+ reg = <0x51000 0x1000>;
+ interrupts = <25>;
+ clocks = <_clk 1>;
+
linux-next: manual merge of the devicetree tree with the arm-soc tree
Hi Grant,
Today's linux-next merge of the devicetree tree got a conflict in
arch/arm/boot/dts/dove.dtsi between commits 40aad3c1a9b6 (dt/bindings:
Remove all references to device_type ethernet-phy) and b31b32119abe
(ARM: dove: sort DT nodes by address) from the devicetree tree and
commit 351291754df3 (dt/bindings: remove device_type network
references) from the devicetree 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/dove.dtsi
index 8de1031233ae,39ffabe04cc5..
--- a/arch/arm/boot/dts/dove.dtsi
+++ b/arch/arm/boot/dts/dove.dtsi
@@@ -170,224 -192,34 +170,222 @@@
status = disabled;
};
- gpio0: gpio-ctrl@d0400 {
- compatible = marvell,orion-gpio;
- #gpio-cells = 2;
- gpio-controller;
- reg = 0xd0400 0x20;
- ngpios = 32;
+ spi1: spi-ctrl@14600 {
+ compatible = marvell,orion-spi;
+ #address-cells = 1;
+ #size-cells = 0;
+ cell-index = 1;
+ interrupts = 5;
+ reg = 0x14600 0x28;
+ clocks = core_clk 0;
+ status = disabled;
+ };
+
+ mbusc: mbus-ctrl@2 {
+ compatible = marvell,mbus-controller;
+ reg = 0x2 0x80, 0x800100 0x8;
+ };
+
+ bridge_intc: bridge-interrupt-ctrl@20110 {
+ compatible = marvell,orion-bridge-intc;
interrupt-controller;
- #interrupt-cells = 2;
- interrupts = 12, 13, 14, 60;
+ #interrupt-cells = 1;
+ reg = 0x20110 0x8;
+ interrupts = 0;
+ marvell,#interrupts = 5;
};
- gpio1: gpio-ctrl@d0420 {
- compatible = marvell,orion-gpio;
- #gpio-cells = 2;
- gpio-controller;
- reg = 0xd0420 0x20;
- ngpios = 32;
+ intc: main-interrupt-ctrl@20200 {
+ compatible = marvell,orion-intc;
interrupt-controller;
- #interrupt-cells = 2;
- interrupts = 61;
+ #interrupt-cells = 1;
+ reg = 0x20200 0x10, 0x20210 0x10;
};
- gpio2: gpio-ctrl@e8400 {
- compatible = marvell,orion-gpio;
- #gpio-cells = 2;
- gpio-controller;
- reg = 0xe8400 0x0c;
- ngpios = 8;
+ timer: timer@20300 {
+ compatible = marvell,orion-timer;
+ reg = 0x20300 0x20;
+ interrupt-parent = bridge_intc;
+ interrupts = 1, 2;
+ clocks = core_clk 0;
+ };
+
+ crypto: crypto-engine@3 {
+ compatible = marvell,orion-crypto;
+ reg = 0x3 0x1,
+0xe000 0x800;
+ reg-names = regs, sram;
+ interrupts = 31;
+ clocks = gate_clk 15;
+ status = okay;
+ };
+
+ ehci0: usb-host@5 {
+ compatible = marvell,orion-ehci;
+ reg = 0x5 0x1000;
+ interrupts = 24;
+ clocks = gate_clk 0;
+ status = okay;
+ };
+
+ ehci1: usb-host@51000 {
+ compatible = marvell,orion-ehci;
+ reg = 0x51000 0x1000;
+ interrupts = 25;
+ clocks = gate_clk 1;
+ status = okay;
+ };
+
+ xor0: dma-engine@60800 {
+
linux-next: manual merge of the devicetree tree with the arm-soc tree
Hi Grant,
Today's linux-next merge of the devicetree tree got a conflict in
arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts between commit
261e7735d0ed (ARM: kirkwood: NETGEAR ReadyNAS Duo v2 .dts cleanup) from
the arm-soc tree and commit 40aad3c1a9b6 (dt/bindings: Remove all
references to device_type ethernet-phy) from the devicetree 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/kirkwood-netgear_readynas_duo_v2.dts
index 4d2a8db9ab77,00c0669b1b8c..
--- a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
+++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
@@@ -241,8 -210,7 +241,7 @@@
mdio {
status = okay;
- ethphy0: ethernet-phy@0 {
+ ethphy0: ethernet-phy@0 { /* Marvell 88E1318 */
- device_type = ethernet-phy;
reg = 0;
};
};
pgp3vSJ5wLaDI.pgp
Description: PGP signature
linux-next: manual merge of the devicetree tree with the arm-soc tree
Hi Grant, Today's linux-next merge of the devicetree tree got a conflict in arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts between commit 6b6430e82331 (ARM: orion5x: Fix typo in device_type property of phy node) from the arm-soc tree and commit 40aad3c1a9b6 (dt/bindings: Remove all references to device_type ethernet-phy) from the devicetree tree. I fixed it up (removed the line) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpcRG_IgnDgL.pgp Description: PGP signature
Re: linux-next: manual merge of the devicetree tree with the arm-soc tree
Stephen, On Fri, Jan 17, 2014 at 02:08:53PM +1100, Stephen Rothwell wrote: Hi Grant, Today's linux-next merge of the devicetree tree got a conflict in arch/arm/boot/dts/dove.dtsi between commits 40aad3c1a9b6 (dt/bindings: Remove all references to device_type ethernet-phy) and b31b32119abe (ARM: dove: sort DT nodes by address) from the devicetree tree and commit 351291754df3 (dt/bindings: remove device_type network references) from the devicetree tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). Looks good, thanks. Jason. -- 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/
