Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bff08445 authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Jason Cooper
Browse files

ARM: Kirkwood: Enable the second I2C bus 



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: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent f4a75d2e

arch/arm/mach-kirkwood/board-dt.c

+2 −0
Original line number Diff line number Diff line
@@ -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),

arch/arm/mach-kirkwood/common.c

+1 −0
Original line number Diff line number Diff line
@@ -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.