public inbox for linux-arm-kernel@lists.infradead.org
 help / color / mirror / Atom feed
From: jason@lakedaemon.net (Jason Cooper)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] [ARM] Enable the second I2C bus on Marvell Kirkwood
Date: Mon, 1 Oct 2012 20:52:48 -0400	[thread overview]
Message-ID: <20121002005248.GN17765@titan.lakedaemon.net> (raw)
In-Reply-To: <20121001235932.GA678@obsidianresearch.com>

On Mon, Oct 01, 2012 at 05:59:32PM -0600, Jason Gunthorpe wrote:
> 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>

Thanks for the patch, Jason.  Looks good.  One small note, please don't
forget to CC: the maintainers in future submissions.  In this case,
myself and Andrew Lunn.

thx,

Jason.

> ---
>  arch/arm/mach-kirkwood/board-dt.c |    2 ++
>  arch/arm/mach-kirkwood/common.c   |    1 +
>  2 files changed, 3 insertions(+), 0 deletions(-)
> 
> of_serial specifies the tclk frequency (via clock-frequency) in the
> DT, should the i2c have the same option?
> 
> diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
> index d00223e..4428f2f 100644
> --- a/arch/arm/mach-kirkwood/board-dt.c
> +++ b/arch/arm/mach-kirkwood/board-dt.c
> @@ -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),
> diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
> index 4177304..0cc2bd2 100644
> --- a/arch/arm/mach-kirkwood/common.c
> +++ b/arch/arm/mach-kirkwood/common.c
> @@ -278,6 +278,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.
> -- 
> 1.7.5.4
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  reply	other threads:[~2012-10-02  0:52 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-01 23:59 [PATCH] [ARM] Enable the second I2C bus on Marvell Kirkwood Jason Gunthorpe
2012-10-02  0:52 ` Jason Cooper [this message]
2012-10-21  1:08 ` Jason Cooper

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20121002005248.GN17765@titan.lakedaemon.net \
    --to=jason@lakedaemon.net \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox