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

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

[Mark Brown]

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

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..000000000000
--- 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()
  

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

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

[Olof Johansson]

On Wed, Mar 12, 2014 at 3:03 PM, Mark Brown <broonie@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

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

[Grant Likely]

On Wed, 12 Mar 2014 15:36:58 -0700, Olof Johansson <olof@lixom.net> wrote:
> On Wed, Mar 12, 2014 at 3:03 PM, Mark Brown <broonie@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

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

[Arnd Bergmann]

On Fri, May 22, 2020 at 8:03 AM Stephen Rothwell <sfr@canb.auug.org.au> 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..000000000000
> --- 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

[Stephen Rothwell]

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

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

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

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

[Stephen Rothwell]

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

Hi all,

This is now a conflict between the arm-soc tree and Linus' tree.

On Thu, 14 Nov 2019 13:21:31 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> Today's linux-next merge of the devicetree tree got a conflict in:
> 
>   Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml
> 
> between commit:
> 
>   577dd5de0990 ("arm64: dts: juno: add GPU subsystem")
> 
> from the arm-soc tree and commit:
> 
>   3afd6389f320 ("dt-bindings: gpu: mali-midgard: add samsung exynos 5420 compatible")
> 
> 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/gpu/arm,mali-midgard.yaml
> index 018f3ae4b43c,c9bdf1074305..000000000000
> --- a/Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml
> +++ b/Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml
> @@@ -21,11 -29,8 +29,12 @@@ properties
>         - items:
>             - enum:
>                - amlogic,meson-gxm-mali
> +              - realtek,rtd1295-mali
>             - const: arm,mali-t820
>  +      - items:
>  +          - enum:
>  +             - arm,juno-mali
>  +          - const: arm,mali-t624
>         - items:
>             - enum:
>                - rockchip,rk3288-mali
> @@@ -34,16 -40,8 +44,7 @@@
>             - enum:
>                - rockchip,rk3399-mali
>             - const: arm,mali-t860
> -       - items:
> -           - enum:
> -              - samsung,exynos5250-mali
> -           - const: arm,mali-t604
> -       - items:
> -           - enum:
> -              - samsung,exynos5433-mali
> -           - const: arm,mali-t760
>   
> -           # "arm,mali-t628"
>  -          # "arm,mali-t624"
>             # "arm,mali-t830"
>             # "arm,mali-t880"
>   

-- 
Cheers,
Stephen Rothwell

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

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

[Stephen Rothwell]

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

Hi all,

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

  Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml

between commit:

  577dd5de0990 ("arm64: dts: juno: add GPU subsystem")

from the arm-soc tree and commit:

  3afd6389f320 ("dt-bindings: gpu: mali-midgard: add samsung exynos 5420 compatible")

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/gpu/arm,mali-midgard.yaml
index 018f3ae4b43c,c9bdf1074305..000000000000
--- a/Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml
+++ b/Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml
@@@ -21,11 -29,8 +29,12 @@@ properties
        - items:
            - enum:
               - amlogic,meson-gxm-mali
+              - realtek,rtd1295-mali
            - const: arm,mali-t820
 +      - items:
 +          - enum:
 +             - arm,juno-mali
 +          - const: arm,mali-t624
        - items:
            - enum:
               - rockchip,rk3288-mali
@@@ -34,16 -40,8 +44,7 @@@
            - enum:
               - rockchip,rk3399-mali
            - const: arm,mali-t860
-       - items:
-           - enum:
-              - samsung,exynos5250-mali
-           - const: arm,mali-t604
-       - items:
-           - enum:
-              - samsung,exynos5433-mali
-           - const: arm,mali-t760
  
-           # "arm,mali-t628"
 -          # "arm,mali-t624"
            # "arm,mali-t830"
            # "arm,mali-t880"
  

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

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

[Stephen Rothwell]

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

[Stephen Rothwell]

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

[Stephen Rothwell]

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..000000000000
--- 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 <linux/of_platform.h>
 -#include <linux/of_address.h>
 -#include <linux/io.h>
--
  #include <asm/mach/arch.h>
  
  #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_PASSWORD		0xa5a5
 -#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

[Jason Cooper]

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.

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

[Stephen Rothwell]

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

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

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

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

[Stephen Rothwell]

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

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

diff --cc arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
index 4d2a8db9ab77,00c0669b1b8c..000000000000
--- 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>;
  	};
  };

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

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

[Stephen Rothwell]

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

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

diff --cc arch/arm/boot/dts/dove.dtsi
index 8de1031233ae,39ffabe04cc5..000000000000
--- 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@20000 {
 +				compatible = "marvell,mbus-controller";
 +				reg = <0x20000 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@30000 {
 +				compatible = "marvell,orion-crypto";
 +				reg = <0x30000 0x10000>,
 +				      <0xffffe000 0x800>;
 +				reg-names = "regs", "sram";
 +				interrupts = <31>;
 +				clocks = <&gate_clk 15>;
 +				status = "okay";
 +			};
 +
 +			ehci0: usb-host@50000 {
 +				compatible = "marvell,orion-ehci";
 +				reg = <0x50000 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 {
 +				compatible = "marvell,orion-xor";
 +				reg = <0x60800 0x100
 +				       0x60a00 0x100>;
 +				clocks = <&gate_clk 23>;
 +				status = "okay";
 +
 +				channel0 {
 +					interrupts = <39>;
 +					dmacap,memcpy;
 +					dmacap,xor;
 +				};
 +
 +				channel1 {
 +					interrupts = <40>;
 +					dmacap,memcpy;
 +					dmacap,xor;
 +				};
 +			};
 +
 +			xor1: dma-engine@60900 {
 +				compatible = "marvell,orion-xor";
 +				reg = <0x60900 0x100
 +				       0x60b00 0x100>;
 +				clocks = <&gate_clk 24>;
 +				status = "okay";
 +
 +				channel0 {
 +					interrupts = <42>;
 +					dmacap,memcpy;
 +					dmacap,xor;
 +				};
 +
 +				channel1 {
 +					interrupts = <43>;
 +					dmacap,memcpy;
 +					dmacap,xor;
 +				};
 +			};
 +
 +			sdio1: sdio-host@90000 {
 +				compatible = "marvell,dove-sdhci";
 +				reg = <0x90000 0x100>;
 +				interrupts = <36>, <38>;
 +				clocks = <&gate_clk 9>;
 +				pinctrl-0 = <&pmx_sdio1>;
 +				pinctrl-names = "default";
 +				status = "disabled";
 +			};
 +
 +			eth: ethernet-ctrl@72000 {
 +				compatible = "marvell,orion-eth";
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <0x72000 0x4000>;
 +				clocks = <&gate_clk 2>;
 +				marvell,tx-checksum-limit = <1600>;
 +				status = "disabled";
 +
 +				ethernet-port@0 {
- 					device_type = "network";
 +					compatible = "marvell,orion-eth-port";
 +					reg = <0>;
 +					interrupts = <29>;
 +					/* overwrite MAC address in bootloader */
 +					local-mac-address = [00 00 00 00 00 00];
 +					phy-handle = <&ethphy>;
 +				};
 +			};
 +
 +			mdio: mdio-bus@72004 {
 +				compatible = "marvell,orion-mdio";
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <0x72004 0x84>;
 +				interrupts = <30>;
 +				clocks = <&gate_clk 2>;
 +				status = "disabled";
 +
 +				ethphy: ethernet-phy {
- 					device_type = "ethernet-phy";
 +					/* set phy address in board file */
 +				};
 +			};
 +
 +			sdio0: sdio-host@92000 {
 +				compatible = "marvell,dove-sdhci";
 +				reg = <0x92000 0x100>;
 +				interrupts = <35>, <37>;
 +				clocks = <&gate_clk 8>;
 +				pinctrl-0 = <&pmx_sdio0>;
 +				pinctrl-names = "default";
 +				status = "disabled";
 +			};
 +
 +			sata0: sata-host@a0000 {
 +				compatible = "marvell,orion-sata";
 +				reg = <0xa0000 0x2400>;
 +				interrupts = <62>;
 +				clocks = <&gate_clk 3>;
 +				phys = <&sata_phy0>;
 +				phy-names = "port0";
 +				nr-ports = <1>;
 +				status = "disabled";
 +			};
 +
 +			sata_phy0: sata-phy@a2000 {
 +				compatible = "marvell,mvebu-sata-phy";
 +				reg = <0xa2000 0x0334>;
 +				clocks = <&gate_clk 3>;
 +				clock-names = "sata";
 +				#phy-cells = <0>;
 +				status = "ok";
 +			};
 +
 +			audio0: audio-controller@b0000 {
 +				compatible = "marvell,dove-audio";
 +				reg = <0xb0000 0x2210>;
 +				interrupts = <19>, <20>;
 +				clocks = <&gate_clk 12>;
 +				clock-names = "internal";
 +				status = "disabled";
 +			};
 +
 +			audio1: audio-controller@b4000 {
 +				compatible = "marvell,dove-audio";
 +				reg = <0xb4000 0x2210>;
 +				interrupts = <21>, <22>;
 +				clocks = <&gate_clk 13>;
 +				clock-names = "internal";
 +				status = "disabled";
 +			};
 +
 +			thermal: thermal-diode@d001c {
 +				compatible = "marvell,dove-thermal";
 +				reg = <0xd001c 0x0c>, <0xd005c 0x08>;
 +			};
 +
 +			gate_clk: clock-gating-ctrl@d0038 {
 +				compatible = "marvell,dove-gating-clock";
 +				reg = <0xd0038 0x4>;
 +				clocks = <&core_clk 0>;
 +				#clock-cells = <1>;
 +			};
 +
 +			pmu_intc: pmu-interrupt-ctrl@d0050 {
 +				compatible = "marvell,dove-pmu-intc";
 +				interrupt-controller;
 +				#interrupt-cells = <1>;
 +				reg = <0xd0050 0x8>;
 +				interrupts = <33>;
 +				marvell,#interrupts = <7>;
  			};
  
  			pinctrl: pin-ctrl@d0200 {

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