support hisilicon i2c

PATCH Superseded Zhangfei Gao 3 participants 8 messages Jun 11, 2013 – Jun 19, 2013

Subsystems (4)

Device tree bindings I2C subsystem host drivers Intel LPSS (Low Power SubSystem) drivers Synopsys DesignWare I2C driver

lore

Share & tools

lore

Zhangfei Gao

author

2013-06-11 02:37 UTC #0 lore raw

v3 cover support hisilicon i2c

v3:
patch 02, use size instead of threshold

v2:
Suggested by Baruch
Support hisilicon i2c in i2c-designware-platdrv.c, and adding two optional properties

Zhangfei Gao (2):
i2c: designware: use module_platform_driver
i2c: designware: add two optional property tx/rx-fifo-size

 .../devicetree/bindings/i2c/i2c-designware.txt     |    7 +++++++
 drivers/i2c/busses/i2c-designware-platdrv.c        |   17 +++++------------
 2 files changed, 12 insertions(+), 12 deletions(-)

Signature · 1 line

1.7.9.5

Zhangfei Gao

author

2013-06-11 02:37 UTC #1 lore raw

PATCH v3 1/2 i2c: designware: use module_platform_driver

Instead of use platform_driver_probe, use module_platform_driver To support deferred probing
Also subsys_initcall may too early to auto set pinctl

Signed-off-by Zhangfei Gao <[email protected]>

CC Baruch Siach <[email protected]>

---
 drivers/i2c/busses/i2c-designware-platdrv.c |   14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

drivers/i2c/busses/i2c-designware-platdrv.c +2 ~~-12~~

index 35b70a1..41659c0 100644
@@ -231,6 +231,7 @@ static SIMPLE_DEV_PM_OPS(dw_i2c_dev_pm_ops, dw_i2c_suspend, dw_i2c_resume);
 MODULE_ALIAS("platform:i2c_designware");
 
 static struct platform_driver dw_i2c_driver = {
+	.probe		= dw_i2c_probe,
 	.remove		= dw_i2c_remove,
 	.driver		= {
 		.name	= "i2c_designware",

@@ -240,18 +241,7 @@ static struct platform_driver dw_i2c_driver = {
 		.pm	= &dw_i2c_dev_pm_ops,
 	},
 };
-
-static int __init dw_i2c_init_driver(void)
-{
-	return platform_driver_probe(&dw_i2c_driver, dw_i2c_probe);
-}
-subsys_initcall(dw_i2c_init_driver);
-
-static void __exit dw_i2c_exit_driver(void)
-{
-	platform_driver_unregister(&dw_i2c_driver);
-}
-module_exit(dw_i2c_exit_driver);
+module_platform_driver(dw_i2c_driver);
 
 MODULE_AUTHOR("Baruch Siach <[email protected]>");
 MODULE_DESCRIPTION("Synopsys DesignWare I2C bus adapter");

Signature · 1 line

1.7.9.5

Wolfram Sang

2013-06-18 16:27 UTC #2 lore raw

PATCH v3 1/2 i2c: designware: use module_platform_driver

Quoted 6 lines · Zhangfei Gao

Instead of use platform_driver_probe, use module_platform_driver To support deferred probing
Also subsys_initcall may too early to auto set pinctl
Signed-off-by Zhangfei Gao <[email protected]>
CC Baruch Siach <[email protected]>

Basically OK, but please resend for 3.12, so we get enough testing before entering mainline. I am a bit anxious of side effects and 3.11 is too near.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130618/df3973ee/attachment.sig>

zhangfei

author

2013-06-19 01:00 UTC #3 lore raw

PATCH v3 1/2 i2c: designware: use module_platform_driver

Quoted 5 lines · Wolfram Sang

Quoted 4 lines · Zhangfei Gao
Instead of use platform_driver_probe, use module_platform_driver To support deferred probing
Also subsys_initcall may too early to auto set pinctl

Quoted 7 lines

Quoted 2 lines
Signed-off-by Zhangfei Gao <[email protected]>
CC Baruch Siach <[email protected]>
Basically OK, but please resend for 3.12, so we get enough testing before entering mainline. I am a bit anxious of side effects and 3.11 is too near.

Dear Wolfram,

Sorry for the silly question: How to be prepared for 3.12?

Do you mean there is specific git & branch, which I should rebase on? linux-next.git is what I use now.

Thanks

Zhangfei Gao

author

2013-06-11 02:37 UTC #4 lore raw

PATCH v3 2/2 i2c: designware: add two optional property tx/rx-fifo-size

In reply to Zhangfei Gao

rx-fifo-size and tx-fifo-size will be updated if provided from dts

Signed-off-by Zhangfei Gao <[email protected]>

CC Baruch Siach <[email protected]>

---
 .../devicetree/bindings/i2c/i2c-designware.txt     |    7 +++++++
 drivers/i2c/busses/i2c-designware-platdrv.c        |    3 +++
 2 files changed, 10 insertions(+)

Documentation/devicetree/bindings/i2c/i2c-designware.txt +7 -0

index e42a2ee..84717fe 100644
@@ -6,6 +6,11 @@ Required properties :
  - reg : Offset and length of the register set for the device
  - interrupts : <IRQ> where IRQ is the interrupt number.
 
+Optional properties:
+
+ - rx-fifo-size : 1 cell, Rx fifo size
+ - tx-fifo-size : 1 cell, Tx fifo size
+
 Recommended properties :
 
  - clock-frequency : desired I2C bus clock frequency in Hz.

@@ -18,5 +23,7 @@ Example :
 		compatible = "snps,designware-i2c";
 		reg = <0xf0000 0x1000>;
 		interrupts = <11>;
+		rx-fifo-size = <16>;
+		tx-fifo-size = <16>;
 		clock-frequency = <400000>;
 	};

drivers/i2c/busses/i2c-designware-platdrv.c +3 -0

index 41659c0..6760cea 100644
@@ -85,6 +85,7 @@ static int dw_i2c_probe(struct platform_device *pdev)
 	struct dw_i2c_dev *dev;
 	struct i2c_adapter *adap;
 	struct resource *mem;
+	struct device_node *np = pdev->dev.of_node;
 	int irq, r;
 
 	/* NOTE: driver uses the static register mapping */

@@ -140,6 +141,8 @@ static int dw_i2c_probe(struct platform_device *pdev)
 		dev->rx_fifo_depth = ((param1 >> 8)  & 0xff) + 1;
 		dev->adapter.nr = pdev->id;
 	}
+	of_property_read_u32(np, "rx-fifo-size", &dev->rx_fifo_depth);
+	of_property_read_u32(np, "tx-fifo-size", &dev->tx_fifo_depth);
 	r = i2c_dw_init(dev);
 	if (r)
 		return r;

Signature · 1 line

1.7.9.5

Baruch Siach

2013-06-14 03:37 UTC #5 lore raw

PATCH v3 2/2 i2c: designware: add two optional property tx/rx-fifo-size

Hi Zhangfei,

Quoted 4 lines · Zhangfei Gao

rx-fifo-size and tx-fifo-size will be updated if provided from dts
Signed-off-by Zhangfei Gao <[email protected]>
CC Baruch Siach <[email protected]>

Acked-by Baruch Siach <[email protected]>

Quoted 50 lines

---
 .../devicetree/bindings/i2c/i2c-designware.txt     |    7 +++++++
 drivers/i2c/busses/i2c-designware-platdrv.c        |    3 +++
 2 files changed, 10 insertions(+)

Documentation/devicetree/bindings/i2c/i2c-designware.txt +7 -0

index e42a2ee..84717fe 100644
@@ -6,6 +6,11 @@ Required properties :
  - reg : Offset and length of the register set for the device
  - interrupts : <IRQ> where IRQ is the interrupt number.
 
+Optional properties:
+
+ - rx-fifo-size : 1 cell, Rx fifo size
+ - tx-fifo-size : 1 cell, Tx fifo size
+
 Recommended properties :
 
  - clock-frequency : desired I2C bus clock frequency in Hz.

@@ -18,5 +23,7 @@ Example :
 		compatible = "snps,designware-i2c";
 		reg = <0xf0000 0x1000>;
 		interrupts = <11>;
+		rx-fifo-size = <16>;
+		tx-fifo-size = <16>;
 		clock-frequency = <400000>;
 	};

drivers/i2c/busses/i2c-designware-platdrv.c +3 -0

index 41659c0..6760cea 100644
@@ -85,6 +85,7 @@ static int dw_i2c_probe(struct platform_device *pdev)
 	struct dw_i2c_dev *dev;
 	struct i2c_adapter *adap;
 	struct resource *mem;
+	struct device_node *np = pdev->dev.of_node;
 	int irq, r;
 
 	/* NOTE: driver uses the static register mapping */

@@ -140,6 +141,8 @@ static int dw_i2c_probe(struct platform_device *pdev)
 		dev->rx_fifo_depth = ((param1 >> 8)  & 0xff) + 1;
 		dev->adapter.nr = pdev->id;
 	}
+	of_property_read_u32(np, "rx-fifo-size", &dev->rx_fifo_depth);
+	of_property_read_u32(np, "tx-fifo-size", &dev->tx_fifo_depth);
 	r = i2c_dw_init(dev);
 	if (r)
 		return r;

Signature · 3 lines

     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

Wolfram Sang

2013-06-18 16:22 UTC #6 lore raw

PATCH v3 2/2 i2c: designware: add two optional property tx/rx-fifo-size

In reply to Zhangfei Gao

Quoted 14 lines · Zhangfei Gao

rx-fifo-size and tx-fifo-size will be updated if provided from dts
Signed-off-by Zhangfei Gao <[email protected]>
CC Baruch Siach <[email protected]>
---
 .../devicetree/bindings/i2c/i2c-designware.txt     |    7 +++++++
 drivers/i2c/busses/i2c-designware-platdrv.c        |    3 +++
 2 files changed, 10 insertions(+)
Documentation/devicetree/bindings/i2c/i2c-designware.txt +0 -0
index e42a2ee..84717fe 100644

Documentation/devicetree/bindings/i2c/i2c-designware.txt Required properties : · line 13

Quoted 8 lines

Documentation/devicetree/bindings/i2c/i2c-designware.txt +5 -0

@@ -6,6 +6,11 @@ Required properties :
  - reg : Offset and length of the register set for the device
  - interrupts : <IRQ> where IRQ is the interrupt number.
 
+Optional properties:
+
+ - rx-fifo-size : 1 cell, Rx fifo size
+ - tx-fifo-size : 1 cell, Tx fifo size
+

I'd think the bindings are okay, yet I wonder they are not more used in practice. So, an ack from a dt-expert would be appreciated.

Quoted 24 lines

Documentation/devicetree/bindings/i2c/i2c-designware.txt +2 -0

 Recommended properties :
 
  - clock-frequency : desired I2C bus clock frequency in Hz.

@@ -18,5 +23,7 @@ Example :
 		compatible = "snps,designware-i2c";
 		reg = <0xf0000 0x1000>;
 		interrupts = <11>;
+		rx-fifo-size = <16>;
+		tx-fifo-size = <16>;
 		clock-frequency = <400000>;
 	};

drivers/i2c/busses/i2c-designware-platdrv.c +1 -0

index 41659c0..6760cea 100644
@@ -85,6 +85,7 @@ static int dw_i2c_probe(struct platform_device *pdev)
 	struct dw_i2c_dev *dev;
 	struct i2c_adapter *adap;
 	struct resource *mem;
+	struct device_node *np = pdev->dev.of_node;
 	int irq, r;
 
 	/* NOTE: driver uses the static register mapping */

drivers/i2c/busses/i2c-designware-platdrv.c static int dw_i2c_probe(struct platform_device *pdev) · line 145

Quoted 5 lines

drivers/i2c/busses/i2c-designware-platdrv.c +2 -0

@@ -140,6 +141,8 @@ static int dw_i2c_probe(struct platform_device *pdev)
 		dev->rx_fifo_depth = ((param1 >> 8)  & 0xff) + 1;
 		dev->adapter.nr = pdev->id;
 	}
+	of_property_read_u32(np, "rx-fifo-size", &dev->rx_fifo_depth);
+	of_property_read_u32(np, "tx-fifo-size", &dev->tx_fifo_depth);

Those can fail.

Quoted 6 lines

drivers/i2c/busses/i2c-designware-platdrv.c +0 -0
 	r = i2c_dw_init(dev);
 	if (r)
 		return r;
Signature · 1 line
1.7.9.5

zhangfei

author

2013-06-19 00:37 UTC #7 lore raw

PATCH v3 2/2 i2c: designware: add two optional property tx/rx-fifo-size

Quoted 18 lines · Wolfram Sang

Quoted 17 lines · Zhangfei Gao
rx-fifo-size and tx-fifo-size will be updated if provided from dts
Signed-off-by Zhangfei Gao <[email protected]>
CC Baruch Siach <[email protected]>
---
  .../devicetree/bindings/i2c/i2c-designware.txt     |    7 +++++++
  drivers/i2c/busses/i2c-designware-platdrv.c        |    3 +++
  2 files changed, 10 insertions(+)
Documentation/devicetree/bindings/i2c/i2c-designware.txt +0 -0
index e42a2ee..84717fe 100644
@@ -6,6 +6,11 @@ Required properties :
   - reg : Offset and length of the register set for the device
   - interrupts : <IRQ> where IRQ is the interrupt number.
 

Quoted 8 lines

Documentation/devicetree/bindings/i2c/i2c-designware.txt Required properties : · line 13
Quoted 5 lines
Documentation/devicetree/bindings/i2c/i2c-designware.txt +5 -0
+Optional properties:
+
+ - rx-fifo-size : 1 cell, Rx fifo size
+ - tx-fifo-size : 1 cell, Tx fifo size
+
I'd think the bindings are okay, yet I wonder they are not more used in practice. So, an ack from a dt-expert would be appreciated.

Thanks Wolfram,
The patches also acked by Baruch, the original writer.

Some platform can not provide fifo info from register DW_IC_COMP_PARAM_1, hisilicon read such register is 0.

Quoted 4 lines

Documentation/devicetree/bindings/i2c/i2c-designware.txt Required properties : · line 15
Quoted 2 lines
Documentation/devicetree/bindings/i2c/i2c-designware.txt +2 -0
+	of_property_read_u32(np, "rx-fifo-size", &dev->rx_fifo_depth);
+	of_property_read_u32(np, "tx-fifo-size", &dev->tx_fifo_depth);
Those can fail.

"rx-fifo-size and tx-fifo-size will be updated if provided from dts" The thought is if dts have the optional properties, then update. otherwise just use original value, read from register.

So I thought the read fail is fine?