linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/8] i2c: omap: Fix missing device tree flags for omap2
Date: Wed, 13 Nov 2013 18:35:33 -0800	[thread overview]
Message-ID: <1384396537-3486-5-git-send-email-tony@atomide.com> (raw)
In-Reply-To: <1384396537-3486-1-git-send-email-tony@atomide.com>

As we claim to support device tree for mach-omap2, we
should have the necessary flags in the driver to make it
usable.

Cc: Wolfram Sang <wsa@the-dreams.de>
Cc: linux-i2c at vger.kernel.org
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

If this looks OK, I'd like to merge this as a fix via arm-soc tree
along with the other patches in this series as my later patches
depend on patches in this series.

---
 drivers/i2c/busses/i2c-omap.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 9967a6f..f04afd1 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -1037,6 +1037,20 @@ static const struct i2c_algorithm omap_i2c_algo = {
 };
 
 #ifdef CONFIG_OF
+static struct omap_i2c_bus_platform_data omap2420_pdata = {
+	.rev = OMAP_I2C_IP_VERSION_1,
+	.flags = OMAP_I2C_FLAG_NO_FIFO |
+			OMAP_I2C_FLAG_SIMPLE_CLOCK |
+			OMAP_I2C_FLAG_16BIT_DATA_REG |
+			OMAP_I2C_FLAG_BUS_SHIFT_2,
+};
+
+static struct omap_i2c_bus_platform_data omap2430_pdata = {
+	.rev = OMAP_I2C_IP_VERSION_1,
+	.flags = OMAP_I2C_FLAG_BUS_SHIFT_2 |
+			OMAP_I2C_FLAG_FORCE_19200_INT_CLK,
+};
+
 static struct omap_i2c_bus_platform_data omap3_pdata = {
 	.rev = OMAP_I2C_IP_VERSION_1,
 	.flags = OMAP_I2C_FLAG_BUS_SHIFT_2,
@@ -1055,6 +1069,14 @@ static const struct of_device_id omap_i2c_of_match[] = {
 		.compatible = "ti,omap3-i2c",
 		.data = &omap3_pdata,
 	},
+	{
+		.compatible = "ti,omap2430-i2c",
+		.data = &omap2430_pdata,
+	},
+	{
+		.compatible = "ti,omap2420-i2c",
+		.data = &omap2420_pdata,
+	},
 	{ },
 };
 MODULE_DEVICE_TABLE(of, omap_i2c_of_match);
-- 
1.8.1.1

  parent reply	other threads:[~2013-11-14  2:35 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-14  2:35 [PATCH 0/8] Various omap device tree usability fixes for v3.13 merge window Tony Lindgren
2013-11-14  2:35 ` [PATCH 1/8] net: smc91x: Fix device tree based configuration so it's usable Tony Lindgren
2013-11-14 11:03   ` Mark Rutland
2013-11-14 16:08     ` Tony Lindgren
2013-11-16 15:16       ` Tony Lindgren
2013-11-27 18:36         ` Tony Lindgren
2013-11-14  2:35 ` [PATCH 2/8] mmc: omap: Fix DMA configuration to not rely on device id Tony Lindgren
2013-11-18 18:47   ` Tony Lindgren
2013-11-26 23:33     ` Chris Ball
2013-11-26 23:52       ` Tony Lindgren
2013-11-27 20:57       ` Jarkko Nikula
2013-11-27 21:37         ` Tony Lindgren
2013-11-28 17:02           ` Jarkko Nikula
2013-11-29 16:34             ` Tony Lindgren
2013-11-27 21:47         ` Chris Ball
2013-11-27 21:59           ` Tony Lindgren
2013-11-28 16:13             ` Jarkko Nikula
2013-11-29 17:13               ` Tony Lindgren
2013-11-30  0:38   ` Joel Fernandes
2013-11-30 17:33     ` Tony Lindgren
2013-11-14  2:35 ` [PATCH 3/8] mmc: omap: Fix I2C dependency and make driver usable with device tree Tony Lindgren
2013-11-14 11:05   ` Mark Rutland
2013-11-14 17:25     ` Tony Lindgren
2013-11-26 23:34       ` Chris Ball
2013-11-14  2:35 ` Tony Lindgren [this message]
2013-11-14  6:58   ` [PATCH 4/8] i2c: omap: Fix missing device tree flags for omap2 Wolfram Sang
2013-11-14 17:34     ` Tony Lindgren
2013-11-14 17:49       ` Wolfram Sang
2013-11-14 17:53         ` Tony Lindgren
2013-11-14 11:07   ` Mark Rutland
2013-11-14 17:30     ` Tony Lindgren
2013-11-14  2:35 ` [PATCH 5/8] gpio: twl4030: Fix regression for twl gpio output Tony Lindgren
2013-11-14  9:45   ` Peter Ujfalusi
2013-11-14 17:37     ` Tony Lindgren
2013-11-18 22:45   ` Linus Walleij
2013-12-03 13:30   ` Roger Quadros
2013-12-09 13:09     ` Linus Walleij
2013-12-09 17:10       ` Tony Lindgren
2013-12-10 12:17         ` Linus Walleij
2013-12-10 15:20           ` Tony Lindgren
2013-11-14  2:35 ` [PATCH 6/8] gpio: twl4030: Fix passing of pdata in the device tree case Tony Lindgren
2013-11-18 18:27   ` Tony Lindgren
2013-11-18 22:46     ` Linus Walleij
2013-11-14  2:35 ` [PATCH 7/8] ARM: OMAP2+: Fix GPMC and simplify bootloader timings for 8250 and smc91x Tony Lindgren
2013-11-14  2:35 ` [PATCH 8/8] ARM: dts: Fix omap2 specific dtsi files by adding the missing entries Tony Lindgren
2013-11-14 23:08 ` [PATCH 9/8] i2c: Fix device tree binding for i2c-cbus-gpio Tony Lindgren
2013-11-15 18:49   ` Aaro Koskinen
2013-11-15 22:26   ` Wolfram Sang
2013-11-15 22:30     ` Tony Lindgren

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=1384396537-3486-5-git-send-email-tony@atomide.com \
    --to=tony@atomide.com \
    --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).