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

Commit e91cac0a authored by Andrew Lunn's avatar Andrew Lunn
Browse files

ARM: Orion: Add arch support needed for I2C via DT. 



The MV64XXX I2C driver needs a clock in order to calculate the baud
rate factors. So add an clk to the clk tree. Also add the base DT
properties for kirkwood devices.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>

Conflicts:
	arch/arm/mach-kirkwood/common.c
parent 76372120

arch/arm/boot/dts/kirkwood.dtsi

+10 −0
Original line number Diff line number Diff line
@@ -82,5 +82,15 @@ 
			/* set partition map and/or chip-delay in board dts */

			status = "disabled";

		};



		i2c@11000 {

			compatible = "marvell,mv64xxx-i2c";

			reg = <0x11000 0x20>;

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts = <29>;

			clock-frequency = <100000>;

			status = "disabled";

		};

	};

};

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

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ static struct of_device_id kirkwood_dt_match_table[] __initdata = { 


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),

	{},

};

arch/arm/mach-kirkwood/common.c

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/dma-mapping.h>

#include <linux/clk-provider.h>

#include <linux/spinlock.h>

#include <linux/mv643xx_i2c.h>

#include <net/dsa.h>

#include <asm/page.h>

#include <asm/timex.h>
@@ -276,6 +277,7 @@ void __init kirkwood_clk_init(void) 
	orion_clkdev_add("0", "pcie", pex0);

	orion_clkdev_add("1", "pcie", pex1);

	orion_clkdev_add(NULL, "kirkwood-i2s", audio);

	orion_clkdev_add(NULL, MV64XXX_I2C_CTLR_NAME ".0", runit);



	/* Marvell says runit is used by SPI, UART, NAND, TWSI, ...,

	 * so should never be gated.

arch/arm/plat-orion/common.c

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ void __init orion_clkdev_init(struct clk *tclk) 
	orion_clkdev_add(NULL, MV643XX_ETH_NAME ".2", tclk);

	orion_clkdev_add(NULL, MV643XX_ETH_NAME ".3", tclk);

	orion_clkdev_add(NULL, "orion_wdt", tclk);

	orion_clkdev_add(NULL, MV64XXX_I2C_CTLR_NAME ".0", tclk);

}



/* Fill in the resources structure and link it into the platform