Merge tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC board updates from Olof Johansson:
 "Board updates for 3.12.  Again, a bit of domain overlap with SoC and
  DT branches, but most of this is around legacy code and board support.
  We've found that platform maintainers have a hard time separating all
  of these out and might move towards fewer branches for next release.

   - Removal of a number of Marvell Kirkwood board files, since contents
     is now common and mostly configured via DT.
   - Device-tree updates for Marvell Dove, including irqchip and
     clocksource setup.
   - Defconfig updates.  Gotta go somewhere.  One new one for Renesas
     Lager.
   - New backlight drivers for backlights used on Renesas shmobile
     platforms.
   - Removal of Renesas leds driver.
   - Shuffling of some of the new Broadcom platforms to give room for
     others in the same mach directory.  More in 3.13"

* tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (67 commits)
  mmc: sdhci-bcm-kona: Staticize sdhci_bcm_kona_card_event
  mmc: sdhci-bcm-kona: Remove unneeded version.h inclusion
  ARM: bcm: Make secure API call optional
  ARM: DT: binding fixup to align with vendor-prefixes.txt (drivers)
  ARM: mmc: fix NONREMOVABLE test in sdhci-bcm-kona
  ARM: bcm: Rename board_bcm
  mmc: sdhci-bcm-kona: make linker-section warning go away
  ARM: tegra: defconfig updates
  ARM: dove: add initial DT file for Globalscale D2Plug
  ARM: dove: add GPIO IR receiver node to SolidRun CuBox
  ARM: dove: add common pinmux functions to DT
  ARM: dove: add cpu device tree node
  ARM: dove: update dove_defconfig with SI5351, PCI, and xHCI
  arch/arm/mach-kirkwood: Avoid using ARRAY_AND_SIZE(e) as a function argument
  ARM: kirkwood: fix DT building and update defconfig
  ARM: kirkwood: Remove all remaining trace of DNS-320/325 platform code
  ARM: configs: disable DEBUG_LL in bcm_defconfig
  ARM: bcm281xx: Board specific reboot code
  ARM bcm281xx: Turn on socket & network support.
  ARM: bcm281xx: Turn on L2 cache.
  ...

1 files changed, 32 insertions, 2 deletions

diff --git a/arch/arm/boot/dts/orion5x.dtsi b/arch/arm/boot/dts/orion5x.dtsi
index 892c64e3f1e1..e06c37e91ac6 100644
--- a/arch/arm/boot/dts/orion5x.dtsi
+++ b/arch/arm/boot/dts/orion5x.dtsi
@@ -16,11 +16,12 @@
         aliases {
                 gpio0 = &gpio0;
         };
+
         intc: interrupt-controller {
-                compatible = "marvell,orion-intc", "marvell,intc";
+                compatible = "marvell,orion-intc";
                 interrupt-controller;
                 #interrupt-cells = <1>;
-                reg = <0xf1020204 0x04>;
+                reg = <0xf1020200 0x08>;
         };
 
         ocp@f1000000 {
@@ -132,5 +133,34 @@
                         interrupts = <28>;
                         status = "okay";
                 };
+
+                mdio: mdio-bus@72004 {
+                        compatible = "marvell,orion-mdio";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0x72004 0x84>;
+                        interrupts = <22>;
+                        status = "disabled";
+
+                        /* add phy nodes in board file */
+                };
+
+                eth: ethernet-controller@72000 {
+                        compatible = "marvell,orion-eth";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0x72000 0x4000>;
+                        marvell,tx-checksum-limit = <1600>;
+                        status = "disabled";
+
+                        ethernet-port@0 {
+                                device_type = "network";
+                                compatible = "marvell,orion-eth-port";
+                                reg = <0>;
+                                /* overwrite MAC address in bootloader */
+                                local-mac-address = [00 00 00 00 00 00];
+                                /* set phy-handle property in board file */
+                        };
+                };
         };
 };