From: andrew@lunn.ch (Andrew Lunn)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/16] ARM: Orion: Add arch support needed for I2C via DT.
Date: Fri, 20 Jul 2012 19:35:39 +0200 [thread overview]
Message-ID: <1342805751-18048-5-git-send-email-andrew@lunn.ch> (raw)
In-Reply-To: <1342805751-18048-1-git-send-email-andrew@lunn.ch>
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: Andrew Lunn <andrew@lunn.ch>
---
arch/arm/boot/dts/kirkwood.dtsi | 10 ++++++++++
arch/arm/mach-kirkwood/board-dt.c | 2 ++
arch/arm/mach-kirkwood/common.c | 2 ++
arch/arm/plat-orion/common.c | 1 +
4 files changed, 15 insertions(+)
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index a3350fd..e13d746 100644
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -82,5 +82,15 @@
/* set partition map and/or chip-delay in board dts */
status = "disabled";
};
+
+ i2c at 11000 {
+ compatible = "marvell,mv64xxx-i2c";
+ reg = <0x11000 0x20>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ interrupts = <29>;
+ clock-frequency = <100000>;
+ status = "disabled";
+ };
};
};
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
index 8f8da5d..24c8fdd 100644
--- a/arch/arm/mach-kirkwood/board-dt.c
+++ b/arch/arm/mach-kirkwood/board-dt.c
@@ -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),
{},
};
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index 3de2d6d..df8079e 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -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>
@@ -241,6 +242,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.
diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
index c179378..d245a87 100644
--- a/arch/arm/plat-orion/common.c
+++ b/arch/arm/plat-orion/common.c
@@ -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
--
1.7.10
next prev parent reply other threads:[~2012-07-20 17:35 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-20 17:35 [PATCH 00/16] Orion DT conversions and fixes Andrew Lunn
2012-07-20 17:35 ` [PATCH 1/16] ARM: Orion: DT support for IRQ and GPIO Controllers Andrew Lunn
2012-07-20 17:35 ` [PATCH 2/16] SPI: Refactor spi-orion to use SPI framework queue Andrew Lunn
2012-07-22 7:22 ` Linus Walleij
2012-07-22 9:53 ` Andrew Lunn
2012-07-22 19:07 ` Mark Brown
2012-07-22 19:32 ` Andrew Lunn
2012-07-22 22:42 ` Mark Brown
2012-07-23 7:27 ` Andrew Lunn
2012-07-23 9:37 ` Mark Brown
2012-07-23 10:08 ` [PATCH] spi-orion: add device tree binding Andrew Lunn
2012-07-23 10:43 ` Mark Brown
2012-07-23 10:59 ` Andrew Lunn
2012-07-23 11:12 ` Mark Brown
2012-07-23 17:43 ` Arnd Bergmann
2012-07-23 10:44 ` Mark Brown
2012-07-23 10:50 ` Andrew Lunn
2012-07-23 10:16 ` [PATCH 2/16] SPI: Refactor spi-orion to use SPI framework queue Andrew Lunn
2012-07-23 10:23 ` Mark Brown
2012-07-23 10:49 ` Andrew Lunn
2012-07-23 11:11 ` Mark Brown
2012-07-23 10:53 ` Sergei Shtylyov
2012-07-23 11:02 ` Andrew Lunn
2012-07-20 17:35 ` [PATCH 3/16] ARM: Kirkwood: Ensure runit clock always ticks Andrew Lunn
2012-07-20 17:35 ` Andrew Lunn [this message]
2012-07-20 17:35 ` [PATCH 5/16] Kirkwood: Add basic device tree support for QNAP TS219 Andrew Lunn
2012-07-20 17:35 ` [PATCH 6/16] ARM: Orion: DTify the watchdog timer Andrew Lunn
2012-07-20 17:35 ` [PATCH 7/16] ATA: sata_mv: Add device tree support Andrew Lunn
2012-07-20 17:35 ` [PATCH 8/16] ARM: Kirkwood: Use DT to configure SATA device Andrew Lunn
2012-07-20 17:35 ` [PATCH 9/16] ARM: Kirkwood: Describe DNS325 temperature sensor in DT Andrew Lunn
2012-07-20 17:35 ` [PATCH 10/16] ARM: Kirkwood: Describe IB62x0 gpio-keys " Andrew Lunn
2012-07-20 17:35 ` [PATCH 11/16] ARM: Kirkwood: Describe iConnects temperature sensor " Andrew Lunn
2012-07-20 17:35 ` [PATCH 12/16] ARM: Kirkwood: Describe Dreamplug LEDs " Andrew Lunn
2012-07-20 17:35 ` [PATCH 13/16] ARM: Kirkwood: Describe GoFlex Net LEDs and SATA " Andrew Lunn
2012-07-20 17:35 ` [PATCH 14/16] ARM: Kirkwood: Describe ib62x0 LEDs " Andrew Lunn
2012-07-20 17:35 ` [PATCH 15/16] ARM: Kirkwood: Describe iConnect " Andrew Lunn
2012-07-30 21:35 ` Adam Baker
2012-07-31 6:36 ` Andrew Lunn
2012-07-31 7:08 ` Arnaud Patard (Rtp)
2012-07-31 7:20 ` Andrew Lunn
2012-07-31 8:59 ` Arnaud Patard (Rtp)
2012-07-20 17:35 ` [PATCH 16/16] ARM: Kirkwood: Replace mrvl with marvell Andrew Lunn
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=1342805751-18048-5-git-send-email-andrew@lunn.ch \
--to=andrew@lunn.ch \
--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;
as well as URLs for NNTP newsgroup(s).