ARM: Kirkwood: Enable the second I2C bus
authorJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Mon, 1 Oct 2012 23:59:32 +0000 (17:59 -0600)
committerJason Cooper <jason@lakedaemon.net>
Wed, 21 Nov 2012 20:58:18 +0000 (20:58 +0000)
mv64xxx_of_config requires that the tclk frequency be found
through the clk stuff rather than through device tree, so add
another override for the 2nd controller.

Signed-off-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
arch/arm/mach-kirkwood/board-dt.c
arch/arm/mach-kirkwood/common.c

index d94872fed8c0cb2a5529260cb2ceca68d1c75a14..ecbb26f438eafda6a444d88f2a3002cf7b6923fa 100644 (file)
@@ -30,6 +30,8 @@ struct of_dev_auxdata kirkwood_auxdata_lookup[] __initdata = {
        OF_DEV_AUXDATA("marvell,orion-spi", 0xf1010600, "orion_spi.0", NULL),
        OF_DEV_AUXDATA("marvell,mv64xxx-i2c", 0xf1011000, "mv64xxx_i2c.0",
                       NULL),
+       OF_DEV_AUXDATA("marvell,mv64xxx-i2c", 0xf1011100, "mv64xxx_i2c.1",
+                      NULL),
        OF_DEV_AUXDATA("marvell,orion-wdt", 0xf1020300, "orion_wdt", NULL),
        OF_DEV_AUXDATA("marvell,orion-sata", 0xf1080000, "sata_mv.0", NULL),
        OF_DEV_AUXDATA("marvell,orion-nand", 0xf4000000, "orion_nand", NULL),
index 2c6c218fb79e217cf607da9ad510ac7dece3222f..906c22eca4e973e335bc10f9f770123c37e07237 100644 (file)
@@ -266,6 +266,7 @@ void __init kirkwood_clk_init(void)
        orion_clkdev_add("1", "pcie", pex1);
        orion_clkdev_add(NULL, "kirkwood-i2s", audio);
        orion_clkdev_add(NULL, MV64XXX_I2C_CTLR_NAME ".0", runit);
+       orion_clkdev_add(NULL, MV64XXX_I2C_CTLR_NAME ".1", runit);
 
        /* Marvell says runit is used by SPI, UART, NAND, TWSI, ...,
         * so should never be gated.