Re: [PATCH v7] i2c-designware: make SDA hold time configurable
> > New bindings are complicated. I need to check if there is an > > existing/similar one, check if it is generic enough for drivers still to > > come, etc. I didn't have the time to do this for 3.10, so it is > > 3.11 material. > > OK, thanks. I just wanted to be sure this patch wasn't forgotten as it is > useful for Haswell/Lynxpoint as well. i2c list is monitored by patchwork which is rigorously not forgetting ;) -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v7] i2c-designware: make SDA hold time configurable
On Fri, May 17, 2013 at 10:29:28AM +0200, Wolfram Sang wrote: > On Tue, May 14, 2013 at 02:07:45PM +0300, Mika Westerberg wrote: > > On Tue, Apr 09, 2013 at 12:59:54PM +0200, Christian Ruppert wrote: > > > This patch makes the SDA hold time configurable through device tree. > > > > > > Signed-off-by: Christian Ruppert > > > Signed-off-by: Pierrick Hascoet > > > > Hi Wolfram, > > > > What happened to this patch? I don't see it merged for 3.10. > > > > The reason I'm asking is that I would like to add ACPI support for the SDA > > hold time parameter analogous to the DT version. > > New bindings are complicated. I need to check if there is an > existing/similar one, check if it is generic enough for drivers still to > come, etc. I didn't have the time to do this for 3.10, so it is > 3.11 material. OK, thanks. I just wanted to be sure this patch wasn't forgotten as it is useful for Haswell/Lynxpoint as well. -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v7] i2c-designware: make SDA hold time configurable
On Tue, May 14, 2013 at 02:07:45PM +0300, Mika Westerberg wrote: > On Tue, Apr 09, 2013 at 12:59:54PM +0200, Christian Ruppert wrote: > > This patch makes the SDA hold time configurable through device tree. > > > > Signed-off-by: Christian Ruppert > > Signed-off-by: Pierrick Hascoet > > Hi Wolfram, > > What happened to this patch? I don't see it merged for 3.10. > > The reason I'm asking is that I would like to add ACPI support for the SDA > hold time parameter analogous to the DT version. New bindings are complicated. I need to check if there is an existing/similar one, check if it is generic enough for drivers still to come, etc. I didn't have the time to do this for 3.10, so it is 3.11 material. -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v7] i2c-designware: make SDA hold time configurable
On Tue, Apr 09, 2013 at 12:59:54PM +0200, Christian Ruppert wrote:
> This patch makes the SDA hold time configurable through device tree.
>
> Signed-off-by: Christian Ruppert
> Signed-off-by: Pierrick Hascoet
Hi Wolfram,
What happened to this patch? I don't see it merged for 3.10.
The reason I'm asking is that I would like to add ACPI support for the SDA
hold time parameter analogous to the DT version.
Thanks.
> ---
> .../devicetree/bindings/i2c/i2c-designware.txt | 14 ++
> drivers/i2c/busses/i2c-designware-core.c |5 +
> drivers/i2c/busses/i2c-designware-core.h |1 +
> drivers/i2c/busses/i2c-designware-platdrv.c|9 +
> 4 files changed, 29 insertions(+), 0 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/i2c/i2c-designware.txt
> b/Documentation/devicetree/bindings/i2c/i2c-designware.txt
> index e42a2ee..21fabe7 100644
> --- a/Documentation/devicetree/bindings/i2c/i2c-designware.txt
> +++ b/Documentation/devicetree/bindings/i2c/i2c-designware.txt
> @@ -10,6 +10,9 @@ Recommended properties :
>
> - clock-frequency : desired I2C bus clock frequency in Hz.
>
> +Optional properties :
> + - sda-hold-time : should contain the SDA hold time in nanoseconds.
> +
> Example :
>
> i2c@f {
> @@ -20,3 +23,14 @@ Example :
> interrupts = <11>;
> clock-frequency = <40>;
> };
> +
> + i2c@112 {
> + #address-cells = <1>;
> + #size-cells = <0>;
> + compatible = "snps,designware-i2c";
> + reg = <0x112 0x1000>;
> + interrupt-parent = <&ictl>;
> + interrupts = <12 1>;
> + clock-frequency = <40>;
> + sda-hold-time = <300>;
> + };
> diff --git a/drivers/i2c/busses/i2c-designware-core.c
> b/drivers/i2c/busses/i2c-designware-core.c
> index 94fd818..ba40e14 100644
> --- a/drivers/i2c/busses/i2c-designware-core.c
> +++ b/drivers/i2c/busses/i2c-designware-core.c
> @@ -67,6 +67,7 @@
> #define DW_IC_STATUS 0x70
> #define DW_IC_TXFLR 0x74
> #define DW_IC_RXFLR 0x78
> +#define DW_IC_SDA_HOLD 0x7c
> #define DW_IC_TX_ABRT_SOURCE 0x80
> #define DW_IC_COMP_PARAM_1 0xf4
> #define DW_IC_COMP_TYPE 0xfc
> @@ -310,6 +311,10 @@ int i2c_dw_init(struct dw_i2c_dev *dev)
> dw_writel(dev, lcnt, DW_IC_FS_SCL_LCNT);
> dev_dbg(dev->dev, "Fast-mode HCNT:LCNT = %d:%d\n", hcnt, lcnt);
>
> + /* Configure SDA Hold Time if required */
> + if (dev->sda_hold_time)
> + dw_writel(dev, dev->sda_hold_time, DW_IC_SDA_HOLD);
> +
> /* Configure Tx/Rx FIFO threshold levels */
> dw_writel(dev, dev->tx_fifo_depth - 1, DW_IC_TX_TL);
> dw_writel(dev, 0, DW_IC_RX_TL);
> diff --git a/drivers/i2c/busses/i2c-designware-core.h
> b/drivers/i2c/busses/i2c-designware-core.h
> index 9c1840e..33dfec3 100644
> --- a/drivers/i2c/busses/i2c-designware-core.h
> +++ b/drivers/i2c/busses/i2c-designware-core.h
> @@ -88,6 +88,7 @@ struct dw_i2c_dev {
> u32 master_cfg;
> unsigned inttx_fifo_depth;
> unsigned intrx_fifo_depth;
> + u32 sda_hold_time;
> };
>
> #define ACCESS_SWAP 0x0001
> diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c
> b/drivers/i2c/busses/i2c-designware-platdrv.c
> index 0ceb6e1..0a6e29b 100644
> --- a/drivers/i2c/busses/i2c-designware-platdrv.c
> +++ b/drivers/i2c/busses/i2c-designware-platdrv.c
> @@ -34,6 +34,7 @@
> #include
> #include
> #include
> +#include
> #include
> #include
> #include
> @@ -136,6 +137,14 @@ static int dw_i2c_probe(struct platform_device *pdev)
> }
> clk_prepare_enable(dev->clk);
>
> + if (pdev->dev.of_node) {
> + u32 ht;
> + u32 ic_clk = dev->get_clk_rate_khz(dev);
> +
> + of_property_read_u32(pdev->dev.of_node, "sda-hold-time", &ht);
> + dev->sda_hold_time = ((u64)ic_clk * ht + 50) / 100;
> + }
> +
> dev->functionality =
> I2C_FUNC_I2C |
> I2C_FUNC_10BIT_ADDR |
> --
> 1.7.1
>
--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v7] i2c-designware: make SDA hold time configurable
Looks like this was eaten by the spam filter last time so i'm resending
it to the lists only:
This patch makes the SDA hold time configurable through device tree.
Signed-off-by: Christian Ruppert
Signed-off-by: Pierrick Hascoet
---
.../devicetree/bindings/i2c/i2c-designware.txt | 14 ++
drivers/i2c/busses/i2c-designware-core.c |5 +
drivers/i2c/busses/i2c-designware-core.h |1 +
drivers/i2c/busses/i2c-designware-platdrv.c|9 +
4 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/Documentation/devicetree/bindings/i2c/i2c-designware.txt
b/Documentation/devicetree/bindings/i2c/i2c-designware.txt
index e42a2ee..21fabe7 100644
--- a/Documentation/devicetree/bindings/i2c/i2c-designware.txt
+++ b/Documentation/devicetree/bindings/i2c/i2c-designware.txt
@@ -10,6 +10,9 @@ Recommended properties :
- clock-frequency : desired I2C bus clock frequency in Hz.
+Optional properties :
+ - sda-hold-time : should contain the SDA hold time in nanoseconds.
+
Example :
i2c@f {
@@ -20,3 +23,14 @@ Example :
interrupts = <11>;
clock-frequency = <40>;
};
+
+ i2c@112 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "snps,designware-i2c";
+ reg = <0x112 0x1000>;
+ interrupt-parent = <&ictl>;
+ interrupts = <12 1>;
+ clock-frequency = <40>;
+ sda-hold-time = <300>;
+ };
diff --git a/drivers/i2c/busses/i2c-designware-core.c
b/drivers/i2c/busses/i2c-designware-core.c
index 94fd818..ba40e14 100644
--- a/drivers/i2c/busses/i2c-designware-core.c
+++ b/drivers/i2c/busses/i2c-designware-core.c
@@ -67,6 +67,7 @@
#define DW_IC_STATUS 0x70
#define DW_IC_TXFLR0x74
#define DW_IC_RXFLR0x78
+#define DW_IC_SDA_HOLD 0x7c
#define DW_IC_TX_ABRT_SOURCE 0x80
#define DW_IC_COMP_PARAM_1 0xf4
#define DW_IC_COMP_TYPE0xfc
@@ -310,6 +311,10 @@ int i2c_dw_init(struct dw_i2c_dev *dev)
dw_writel(dev, lcnt, DW_IC_FS_SCL_LCNT);
dev_dbg(dev->dev, "Fast-mode HCNT:LCNT = %d:%d\n", hcnt, lcnt);
+ /* Configure SDA Hold Time if required */
+ if (dev->sda_hold_time)
+ dw_writel(dev, dev->sda_hold_time, DW_IC_SDA_HOLD);
+
/* Configure Tx/Rx FIFO threshold levels */
dw_writel(dev, dev->tx_fifo_depth - 1, DW_IC_TX_TL);
dw_writel(dev, 0, DW_IC_RX_TL);
diff --git a/drivers/i2c/busses/i2c-designware-core.h
b/drivers/i2c/busses/i2c-designware-core.h
index 9c1840e..33dfec3 100644
--- a/drivers/i2c/busses/i2c-designware-core.h
+++ b/drivers/i2c/busses/i2c-designware-core.h
@@ -88,6 +88,7 @@ struct dw_i2c_dev {
u32 master_cfg;
unsigned inttx_fifo_depth;
unsigned intrx_fifo_depth;
+ u32 sda_hold_time;
};
#define ACCESS_SWAP0x0001
diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c
b/drivers/i2c/busses/i2c-designware-platdrv.c
index 0ceb6e1..0a6e29b 100644
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -34,6 +34,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -136,6 +137,14 @@ static int dw_i2c_probe(struct platform_device *pdev)
}
clk_prepare_enable(dev->clk);
+ if (pdev->dev.of_node) {
+ u32 ht;
+ u32 ic_clk = dev->get_clk_rate_khz(dev);
+
+ of_property_read_u32(pdev->dev.of_node, "sda-hold-time", &ht);
+ dev->sda_hold_time = ((u64)ic_clk * ht + 50) / 100;
+ }
+
dev->functionality =
I2C_FUNC_I2C |
I2C_FUNC_10BIT_ADDR |
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
