Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[mv-sheeva.git] / arch / arm / mach-kirkwood / openrd-setup.c

diff --git a/arch/arm/mach-kirkwood/openrd-setup.c b/arch/arm/mach-kirkwood/openrd-setup.c
index ad3f1ec3379689556296ef1ccf3b425c07f8007a..fd06be6188159da478ba8311dbec6f6b167e3df9 100644 (file)
--- a/arch/arm/mach-kirkwood/openrd-setup.c
+++ b/arch/arm/mach-kirkwood/openrd-setup.c
@@ -1,7 +1,7 @@
 /*
  * arch/arm/mach-kirkwood/openrd-setup.c
  *
- * Marvell OpenRD (Base|Client) Board Setup
+ * Marvell OpenRD (Base|Client|Ultimate) Board Setup
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2.  This program is licensed "as is" without any
@@ -15,6 +15,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/ata_platform.h>
 #include <linux/mv643xx_eth.h>
+#include <linux/i2c.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <mach/kirkwood.h>
@@ -60,6 +61,12 @@ static unsigned int openrd_mpp_config[] __initdata = {
        0
 };
 
+static struct i2c_board_info i2c_board_info[] __initdata = {
+       {
+               I2C_BOARD_INFO("cs42l51", 0x4a),
+       },
+};
+
 static void __init openrd_init(void)
 {
        /*
@@ -73,19 +80,33 @@ static void __init openrd_init(void)
 
        kirkwood_ehci_init();
 
+       if (machine_is_openrd_ultimate()) {
+               openrd_ge00_data.phy_addr = MV643XX_ETH_PHY_ADDR(0);
+               openrd_ge01_data.phy_addr = MV643XX_ETH_PHY_ADDR(1);
+       }
+
        kirkwood_ge00_init(&openrd_ge00_data);
-       if (machine_is_openrd_client())
+       if (!machine_is_openrd_base())
                kirkwood_ge01_init(&openrd_ge01_data);
+
        kirkwood_sata_init(&openrd_sata_data);
        kirkwood_sdio_init(&openrd_mvsdio_data);
 
        kirkwood_i2c_init();
+
+       if (machine_is_openrd_client()) {
+               i2c_register_board_info(0, i2c_board_info,
+                       ARRAY_SIZE(i2c_board_info));
+               kirkwood_audio_init();
+       }
 }
 
 static int __init openrd_pci_init(void)
 {
-       if (machine_is_openrd_base() || machine_is_openrd_client())
-               kirkwood_pcie_init();
+       if (machine_is_openrd_base() ||
+           machine_is_openrd_client() ||
+           machine_is_openrd_ultimate())
+               kirkwood_pcie_init(KW_PCIE0);
 
        return 0;
 }
@@ -116,3 +137,16 @@ MACHINE_START(OPENRD_CLIENT, "Marvell OpenRD Client Board")
        .timer          = &kirkwood_timer,
 MACHINE_END
 #endif
+
+#ifdef CONFIG_MACH_OPENRD_ULTIMATE
+MACHINE_START(OPENRD_ULTIMATE, "Marvell OpenRD Ultimate Board")
+       /* Maintainer: Dhaval Vasa <dhaval.vasa@einfochips.com> */
+       .phys_io        = KIRKWOOD_REGS_PHYS_BASE,
+       .io_pg_offst    = ((KIRKWOOD_REGS_VIRT_BASE) >> 18) & 0xfffc,
+       .boot_params    = 0x00000100,
+       .init_machine   = openrd_init,
+       .map_io         = kirkwood_map_io,
+       .init_irq       = kirkwood_init_irq,
+       .timer          = &kirkwood_timer,
+MACHINE_END
+#endif