From: vaibhav.hiremath@linaro.org (Vaibhav Hiremath)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH-V2 10/12] i2c: pxa: Add support for pxa910/988 & new configuration features
Date: Mon, 15 Jun 2015 21:19:57 +0530 [thread overview]
Message-ID: <1434383399-2370-11-git-send-email-vaibhav.hiremath@linaro.org> (raw)
In-Reply-To: <1434383399-2370-1-git-send-email-vaibhav.hiremath@linaro.org>
PXA910 family of devices supports SCLK adjustment through
TWSI_ILCR & TWSI_IWCR registers (for all supported modes).
This patch also adds these two new register entries to
"struct pxa_reg_layout" and "struct pxa_i2c".
As discussed in the previous patch-series, the idea here is to add standard
DT properties for ilcr and iwcr configuration fields.
In case of Master ilcr is used for low/high time and in case of slave mode
of operation iwcr is used for setup/hold time.
Signed-off-by: Jett.Zhou <jtzhou@marvell.com>
Signed-off-by: Yi Zhang <yizhang@marvell.com>
Signed-off-by: Vaibhav Hiremath <vaibhav.hiremath@linaro.org>
---
drivers/i2c/busses/i2c-pxa.c | 42 +++++++++++++++++++++++++++++++++++++++++-
1 file changed, 41 insertions(+), 1 deletion(-)
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index c753411..97f9c7c 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -46,12 +46,15 @@ struct pxa_reg_layout {
u32 icr;
u32 isr;
u32 isar;
+ u32 ilcr;
+ u32 iwcr;
};
enum pxa_i2c_types {
REGS_PXA2XX,
REGS_PXA3XX,
REGS_CE4100,
+ REGS_PXA910,
};
/*
@@ -79,12 +82,22 @@ static struct pxa_reg_layout pxa_reg_layout[] = {
.isr = 0x04,
/* no isar register */
},
+ [REGS_PXA910] = {
+ .ibmr = 0x00,
+ .idbr = 0x08,
+ .icr = 0x10,
+ .isr = 0x18,
+ .isar = 0x20,
+ .ilcr = 0x28,
+ .iwcr = 0x30,
+ },
};
static const struct platform_device_id i2c_pxa_id_table[] = {
{ "pxa2xx-i2c", REGS_PXA2XX },
{ "pxa3xx-pwri2c", REGS_PXA3XX },
{ "ce4100-i2c", REGS_CE4100 },
+ { "pxa910-i2c", REGS_PXA910 },
{ },
};
MODULE_DEVICE_TABLE(platform, i2c_pxa_id_table);
@@ -124,6 +137,24 @@ MODULE_DEVICE_TABLE(platform, i2c_pxa_id_table);
#define ISR_SAD (1 << 9) /* slave address detected */
#define ISR_BED (1 << 10) /* bus error no ACK/NAK */
+/* bit field shift & mask */
+#define ILCR_SLV_SHIFT 0
+#define ILCR_SLV_MASK (0x1FF << ILCR_SLV_SHIFT)
+#define ILCR_FLV_SHIFT 9
+#define ILCR_FLV_MASK (0x1FF << ILCR_FLV_SHIFT)
+#define ILCR_HLVL_SHIFT 18
+#define ILCR_HLVL_MASK (0x1FF << ILCR_HLVL_SHIFT)
+#define ILCR_HLVH_SHIFT 27
+#define ILCR_HLVH_MASK (0x1F << ILCR_HLVH_SHIFT)
+
+#define IWCR_CNT_SHIFT 0
+#define IWCR_CNT_MASK (0x1F << IWCR_CNT_SHIFT)
+#define IWCR_HS_CNT1_SHIFT 5
+#define IWCR_HS_CNT1_MASK (0x1F << IWCR_HS_CNT1_SHIFT)
+#define IWCR_HS_CNT2_SHIFT 10
+#define IWCR_HS_CNT2_MASK (0x1F << IWCR_HS_CNT2_SHIFT)
+
+
struct pxa_i2c {
spinlock_t lock;
wait_queue_head_t wait;
@@ -150,6 +181,8 @@ struct pxa_i2c {
void __iomem *reg_icr;
void __iomem *reg_isr;
void __iomem *reg_isar;
+ void __iomem *reg_ilcr;
+ void __iomem *reg_iwcr;
unsigned long iobase;
unsigned long iosize;
@@ -169,6 +202,8 @@ struct pxa_i2c {
#define _ICR(i2c) ((i2c)->reg_icr)
#define _ISR(i2c) ((i2c)->reg_isr)
#define _ISAR(i2c) ((i2c)->reg_isar)
+#define _ILCR(i2c) ((i2c)->reg_ilcr)
+#define _IWCR(i2c) ((i2c)->reg_iwcr)
/*
* I2C Slave mode address
@@ -1141,7 +1176,7 @@ static const struct i2c_algorithm i2c_pxa_pio_algorithm = {
static const struct of_device_id i2c_pxa_dt_ids[] = {
{ .compatible = "mrvl,pxa-i2c", .data = (void *)REGS_PXA2XX },
{ .compatible = "mrvl,pwri2c", .data = (void *)REGS_PXA3XX },
- { .compatible = "mrvl,mmp-twsi", .data = (void *)REGS_PXA2XX },
+ { .compatible = "mrvl,mmp-twsi", .data = (void *)REGS_PXA910 },
{}
};
MODULE_DEVICE_TABLE(of, i2c_pxa_dt_ids);
@@ -1255,6 +1290,11 @@ static int i2c_pxa_probe(struct platform_device *dev)
if (i2c_type != REGS_CE4100)
i2c->reg_isar = i2c->reg_base + pxa_reg_layout[i2c_type].isar;
+ if (i2c_type == REGS_PXA910) {
+ i2c->reg_ilcr = i2c->reg_base + pxa_reg_layout[i2c_type].ilcr;
+ i2c->reg_iwcr = i2c->reg_base + pxa_reg_layout[i2c_type].iwcr;
+ }
+
i2c->iobase = res->start;
i2c->iosize = resource_size(res);
--
1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: Vaibhav Hiremath <vaibhav.hiremath-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
To: linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org,
robert.jarzmik-GANU6spQydw@public.gmane.org,
Vaibhav Hiremath
<vaibhav.hiremath-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>,
"Jett.Zhou" <jtzhou-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org>,
Yi Zhang <yizhang-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org>
Subject: [PATCH-V2 10/12] i2c: pxa: Add support for pxa910/988 & new configuration features
Date: Mon, 15 Jun 2015 21:19:57 +0530 [thread overview]
Message-ID: <1434383399-2370-11-git-send-email-vaibhav.hiremath@linaro.org> (raw)
In-Reply-To: <1434383399-2370-1-git-send-email-vaibhav.hiremath-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
PXA910 family of devices supports SCLK adjustment through
TWSI_ILCR & TWSI_IWCR registers (for all supported modes).
This patch also adds these two new register entries to
"struct pxa_reg_layout" and "struct pxa_i2c".
As discussed in the previous patch-series, the idea here is to add standard
DT properties for ilcr and iwcr configuration fields.
In case of Master ilcr is used for low/high time and in case of slave mode
of operation iwcr is used for setup/hold time.
Signed-off-by: Jett.Zhou <jtzhou-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org>
Signed-off-by: Yi Zhang <yizhang-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org>
Signed-off-by: Vaibhav Hiremath <vaibhav.hiremath-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
---
drivers/i2c/busses/i2c-pxa.c | 42 +++++++++++++++++++++++++++++++++++++++++-
1 file changed, 41 insertions(+), 1 deletion(-)
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index c753411..97f9c7c 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -46,12 +46,15 @@ struct pxa_reg_layout {
u32 icr;
u32 isr;
u32 isar;
+ u32 ilcr;
+ u32 iwcr;
};
enum pxa_i2c_types {
REGS_PXA2XX,
REGS_PXA3XX,
REGS_CE4100,
+ REGS_PXA910,
};
/*
@@ -79,12 +82,22 @@ static struct pxa_reg_layout pxa_reg_layout[] = {
.isr = 0x04,
/* no isar register */
},
+ [REGS_PXA910] = {
+ .ibmr = 0x00,
+ .idbr = 0x08,
+ .icr = 0x10,
+ .isr = 0x18,
+ .isar = 0x20,
+ .ilcr = 0x28,
+ .iwcr = 0x30,
+ },
};
static const struct platform_device_id i2c_pxa_id_table[] = {
{ "pxa2xx-i2c", REGS_PXA2XX },
{ "pxa3xx-pwri2c", REGS_PXA3XX },
{ "ce4100-i2c", REGS_CE4100 },
+ { "pxa910-i2c", REGS_PXA910 },
{ },
};
MODULE_DEVICE_TABLE(platform, i2c_pxa_id_table);
@@ -124,6 +137,24 @@ MODULE_DEVICE_TABLE(platform, i2c_pxa_id_table);
#define ISR_SAD (1 << 9) /* slave address detected */
#define ISR_BED (1 << 10) /* bus error no ACK/NAK */
+/* bit field shift & mask */
+#define ILCR_SLV_SHIFT 0
+#define ILCR_SLV_MASK (0x1FF << ILCR_SLV_SHIFT)
+#define ILCR_FLV_SHIFT 9
+#define ILCR_FLV_MASK (0x1FF << ILCR_FLV_SHIFT)
+#define ILCR_HLVL_SHIFT 18
+#define ILCR_HLVL_MASK (0x1FF << ILCR_HLVL_SHIFT)
+#define ILCR_HLVH_SHIFT 27
+#define ILCR_HLVH_MASK (0x1F << ILCR_HLVH_SHIFT)
+
+#define IWCR_CNT_SHIFT 0
+#define IWCR_CNT_MASK (0x1F << IWCR_CNT_SHIFT)
+#define IWCR_HS_CNT1_SHIFT 5
+#define IWCR_HS_CNT1_MASK (0x1F << IWCR_HS_CNT1_SHIFT)
+#define IWCR_HS_CNT2_SHIFT 10
+#define IWCR_HS_CNT2_MASK (0x1F << IWCR_HS_CNT2_SHIFT)
+
+
struct pxa_i2c {
spinlock_t lock;
wait_queue_head_t wait;
@@ -150,6 +181,8 @@ struct pxa_i2c {
void __iomem *reg_icr;
void __iomem *reg_isr;
void __iomem *reg_isar;
+ void __iomem *reg_ilcr;
+ void __iomem *reg_iwcr;
unsigned long iobase;
unsigned long iosize;
@@ -169,6 +202,8 @@ struct pxa_i2c {
#define _ICR(i2c) ((i2c)->reg_icr)
#define _ISR(i2c) ((i2c)->reg_isr)
#define _ISAR(i2c) ((i2c)->reg_isar)
+#define _ILCR(i2c) ((i2c)->reg_ilcr)
+#define _IWCR(i2c) ((i2c)->reg_iwcr)
/*
* I2C Slave mode address
@@ -1141,7 +1176,7 @@ static const struct i2c_algorithm i2c_pxa_pio_algorithm = {
static const struct of_device_id i2c_pxa_dt_ids[] = {
{ .compatible = "mrvl,pxa-i2c", .data = (void *)REGS_PXA2XX },
{ .compatible = "mrvl,pwri2c", .data = (void *)REGS_PXA3XX },
- { .compatible = "mrvl,mmp-twsi", .data = (void *)REGS_PXA2XX },
+ { .compatible = "mrvl,mmp-twsi", .data = (void *)REGS_PXA910 },
{}
};
MODULE_DEVICE_TABLE(of, i2c_pxa_dt_ids);
@@ -1255,6 +1290,11 @@ static int i2c_pxa_probe(struct platform_device *dev)
if (i2c_type != REGS_CE4100)
i2c->reg_isar = i2c->reg_base + pxa_reg_layout[i2c_type].isar;
+ if (i2c_type == REGS_PXA910) {
+ i2c->reg_ilcr = i2c->reg_base + pxa_reg_layout[i2c_type].ilcr;
+ i2c->reg_iwcr = i2c->reg_base + pxa_reg_layout[i2c_type].iwcr;
+ }
+
i2c->iobase = res->start;
i2c->iosize = resource_size(res);
--
1.9.1
next prev parent reply other threads:[~2015-06-15 15:49 UTC|newest]
Thread overview: 125+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <vaibhav.hiremath@linaro.org>
2015-06-02 18:45 ` [PATCH-RESEND 0/3] i2c: core/pxa: Add support for hardware lock Vaibhav Hiremath
2015-06-02 18:45 ` Vaibhav Hiremath
2015-06-02 18:45 ` [PATCH-RESEND 1/3] i2c: core: append hardware lock with bus lock Vaibhav Hiremath
2015-06-02 18:45 ` Vaibhav Hiremath
2015-06-02 18:45 ` [PATCH-RESEND 2/3] i2c: pxa: Add support for hardware lock Vaibhav Hiremath
2015-06-02 18:45 ` Vaibhav Hiremath
2015-06-02 18:45 ` [PATCH-RESEND 3/3] i2c: pxa: Add pin ctrl support for CP core access Vaibhav Hiremath
2015-06-02 18:45 ` Vaibhav Hiremath
2015-06-16 8:28 ` [PATCH-RESEND 0/3] i2c: core/pxa: Add support for hardware lock Vaibhav Hiremath
2015-06-16 8:28 ` Vaibhav Hiremath
2015-07-07 6:43 ` Vaibhav Hiremath
2015-07-07 6:43 ` Vaibhav Hiremath
2015-10-25 9:52 ` Wolfram Sang
2015-10-25 9:52 ` Wolfram Sang
2015-06-15 15:49 ` [PATCH-V2 00/12] i2c: pxa: Fixes, cleanup and support for pxa910 family Vaibhav Hiremath
2015-06-15 15:49 ` Vaibhav Hiremath
2015-06-15 15:49 ` [PATCH-V2 01/12] i2c: pxa: keep i2c irq ON in suspend Vaibhav Hiremath
2015-06-15 15:49 ` Vaibhav Hiremath
2015-06-15 15:49 ` [PATCH-V2 02/12] i2c: pxa: No need to set slave addr for i2c master mode reset Vaibhav Hiremath
2015-06-15 15:49 ` Vaibhav Hiremath
2015-07-03 20:58 ` Robert Jarzmik
2015-07-03 20:58 ` Robert Jarzmik
2015-06-15 15:49 ` [PATCH-V2 03/12] i2c: pxa: Return I2C_RETRY when timeout in pio mode Vaibhav Hiremath
2015-06-15 15:49 ` Vaibhav Hiremath
2015-06-16 5:31 ` Shubhrajyoti Datta
2015-06-16 5:31 ` Shubhrajyoti Datta
2015-06-16 7:41 ` Vaibhav Hiremath
2015-06-16 7:41 ` Vaibhav Hiremath
2015-07-03 21:07 ` Robert Jarzmik
2015-07-03 21:07 ` Robert Jarzmik
2015-06-15 15:49 ` [PATCH-V2 04/12] i2c: pxa: Reset i2c controller on timeout in interrupt and " Vaibhav Hiremath
2015-06-15 15:49 ` Vaibhav Hiremath
2015-07-03 15:27 ` Robert Jarzmik
2015-07-03 15:27 ` Robert Jarzmik
2015-07-03 18:13 ` Vaibhav Hiremath
2015-07-03 18:13 ` Vaibhav Hiremath
2015-06-15 15:49 ` [PATCH-V2 05/12] i2c: pxa: Remove compile warnning in 64bit mode Vaibhav Hiremath
2015-06-15 15:49 ` Vaibhav Hiremath
2015-06-15 15:49 ` [PATCH-V2 06/12] i2c: pxa: Update debug function to dump more info on error Vaibhav Hiremath
2015-06-15 15:49 ` Vaibhav Hiremath
2015-06-15 15:49 ` [PATCH-V2 07/12] i2c:pxa: Use devm_ variants in probe function Vaibhav Hiremath
2015-06-15 15:49 ` Vaibhav Hiremath
2015-07-03 15:28 ` Robert Jarzmik
2015-07-03 15:28 ` Robert Jarzmik
2015-07-03 18:14 ` Vaibhav Hiremath
2015-07-03 18:14 ` Vaibhav Hiremath
2015-06-15 15:49 ` [PATCH-V2 08/12] i2c: pxa: enable/disable i2c module across msg xfer Vaibhav Hiremath
2015-06-15 15:49 ` Vaibhav Hiremath
2015-07-03 15:28 ` Robert Jarzmik
2015-07-03 15:28 ` Robert Jarzmik
2015-07-03 18:23 ` Vaibhav Hiremath
2015-07-03 18:23 ` Vaibhav Hiremath
2015-07-03 18:48 ` Vaibhav Hiremath
2015-07-03 18:48 ` Vaibhav Hiremath
2015-07-03 19:44 ` Robert Jarzmik
2015-07-03 19:44 ` Robert Jarzmik
2015-06-15 15:49 ` [PATCH-V2 09/12] Documentation: binding: add new property 'disable_after_xfer' to i2c-pxa Vaibhav Hiremath
2015-06-15 15:49 ` Vaibhav Hiremath
2015-06-15 15:49 ` Vaibhav Hiremath [this message]
2015-06-15 15:49 ` [PATCH-V2 10/12] i2c: pxa: Add support for pxa910/988 & new configuration features Vaibhav Hiremath
2015-06-15 15:49 ` [PATCH-V2 11/12] i2c: pxa: Add ILCR (tLow & tHigh) configuration support Vaibhav Hiremath
2015-06-15 15:49 ` Vaibhav Hiremath
2015-07-03 15:28 ` Robert Jarzmik
2015-07-03 15:28 ` Robert Jarzmik
2015-07-03 18:17 ` Vaibhav Hiremath
2015-07-03 18:17 ` Vaibhav Hiremath
2015-06-15 15:49 ` [PATCH-V2 12/12] Documentation: binding: add sclk adjustment properties to i2c-pxa Vaibhav Hiremath
2015-06-15 15:49 ` Vaibhav Hiremath
2015-06-16 13:22 ` Rob Herring
2015-06-16 13:22 ` Rob Herring
2015-06-16 14:25 ` Vaibhav Hiremath
2015-06-16 14:25 ` Vaibhav Hiremath
2015-06-29 8:52 ` [PATCH-V2 00/12] i2c: pxa: Fixes, cleanup and support for pxa910 family Vaibhav Hiremath
2015-06-29 8:52 ` Vaibhav Hiremath
2015-07-02 16:54 ` Vaibhav Hiremath
2015-07-02 16:54 ` Vaibhav Hiremath
2015-06-17 18:58 [PATCH-v2 0/3] mfd: 88pm800: Add Device tree support Vaibhav Hiremath
2015-06-17 18:58 ` Vaibhav Hiremath
2015-06-17 18:58 ` [rtc-linux] " Vaibhav Hiremath
2015-06-17 18:58 ` [PATCH-v2 1/3] mfd: 88pm800: Add device " Vaibhav Hiremath
2015-06-17 18:58 ` Vaibhav Hiremath
2015-06-17 18:58 ` [rtc-linux] " Vaibhav Hiremath
2015-06-17 18:58 ` Vaibhav Hiremath
2015-06-17 18:58 ` [PATCH-v2] rtc: 88pm80x: add " Vaibhav Hiremath
2015-06-17 18:58 ` Vaibhav Hiremath
2015-06-17 18:58 ` [rtc-linux] " Vaibhav Hiremath
2015-06-20 0:43 ` Alexandre Belloni
2015-06-20 0:43 ` Alexandre Belloni
2015-06-20 0:43 ` Alexandre Belloni
2015-06-20 0:43 ` Alexandre Belloni
2015-06-25 7:46 ` Vaibhav Hiremath
2015-06-25 7:46 ` Vaibhav Hiremath
2015-06-25 7:46 ` Vaibhav Hiremath
2015-06-25 7:46 ` Vaibhav Hiremath
2015-07-07 6:37 ` Vaibhav Hiremath
2015-07-07 6:37 ` Vaibhav Hiremath
2015-07-07 6:37 ` Vaibhav Hiremath
2015-07-07 6:37 ` Vaibhav Hiremath
2015-06-17 18:58 ` [PATCH-v2 2/3] mfd: 88pm800: Allow configuration of interrupt clear method Vaibhav Hiremath
2015-06-17 18:58 ` Vaibhav Hiremath
2015-06-17 18:58 ` [rtc-linux] " Vaibhav Hiremath
2015-06-17 18:58 ` Vaibhav Hiremath
2015-06-17 18:58 ` [PATCH-v2 3/3] mfd: devicetree: bindings: Add new 88pm800 mfd binding Vaibhav Hiremath
2015-06-17 18:58 ` Vaibhav Hiremath
2015-06-17 18:58 ` [rtc-linux] " Vaibhav Hiremath
2015-06-17 18:58 ` Vaibhav Hiremath
2015-06-23 15:37 ` Rob Herring
2015-06-23 15:37 ` Rob Herring
2015-06-23 15:37 ` [rtc-linux] " Rob Herring
2015-06-23 15:37 ` Rob Herring
2015-06-23 17:02 ` Vaibhav Hiremath
2015-06-23 17:02 ` Vaibhav Hiremath
2015-06-23 17:02 ` [rtc-linux] " Vaibhav Hiremath
2015-06-24 0:29 ` Krzysztof Kozlowski
2015-06-24 0:29 ` Krzysztof Kozlowski
2015-06-24 0:29 ` [rtc-linux] " Krzysztof Kozlowski
2015-06-24 0:29 ` Krzysztof Kozlowski
2015-06-24 5:19 ` Vaibhav Hiremath
2015-06-24 5:19 ` Vaibhav Hiremath
2015-06-24 5:19 ` [rtc-linux] " Vaibhav Hiremath
2015-06-24 5:19 ` Vaibhav Hiremath
2015-06-23 5:07 ` [PATCH-v2 0/3] mfd: 88pm800: Add Device tree support Vaibhav Hiremath
2015-06-23 5:07 ` Vaibhav Hiremath
2015-06-23 5:07 ` [rtc-linux] " Vaibhav Hiremath
2015-06-23 5:07 ` Vaibhav Hiremath
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=1434383399-2370-11-git-send-email-vaibhav.hiremath@linaro.org \
--to=vaibhav.hiremath@linaro.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.