iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i2c: i2c-ocores: DT bindings and minor fixes.

Browse Source 
Cleanups to i2c-cores, no change in logic, changes are:
* Move i2c-ocores device tree documentation from source file to
  Documentation/devicetree/bindings/i2c/i2c-ocores.txt.
* Add \n to dev_warn and dev_err messages where missing
* Minor updates to the text and formatting fixes.

Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
This commit is contained in:
Jayachandran C 2012-07-13 19:14:22 +05:30 committed by Wolfram Sang
parent 097df40312
commit 9ae97a8996
2 changed files with 34 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Documentation/devicetree/bindings/i2c/i2c-ocores.txt Normal file
View File

@ -0,0 +1,27 @@
Device tree configuration for i2c-ocores
Required properties:
- compatible : "opencores,i2c-ocores"
- reg : bus address start and address range size of device
- interrupts : interrupt number
- regstep : size of device registers in bytes
- clock-frequency : frequency of bus clock in Hz
- #address-cells : should be <1>
- #size-cells : should be <0>
Example:
i2c0: ocores@a0000000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "opencores,i2c-ocores";
reg = <0xa0000000 0x8>;
interrupts = <10>;
regstep = <1>;
clock-frequency = <20000000>;
dummy@60 {
compatible = "dummy";
reg = <0x60>;
};
};

45
drivers/i2c/busses/i2c-ocores.c
View File

@ -10,40 +10,9 @@
*/ */
/* /*
* Device tree configuration: * This driver can be used from the device tree, see
* * Documentation/devicetree/bindings/i2c/ocore-i2c.txt
* Required properties:
* - compatible : "opencores,i2c-ocores"
* - reg : bus address start and address range size of device
* - interrupts : interrupt number
* - regstep : size of device registers in bytes
* - clock-frequency : frequency of bus clock in Hz
*
* Example:
*
* i2c0: ocores@a0000000 {
* compatible = "opencores,i2c-ocores";
* reg = <0xa0000000 0x8>;
* interrupts = <10>;
*
* regstep = <1>;
* clock-frequency = <20000000>;
*
* -- Devices connected on this I2C bus get
* -- defined here; address- and size-cells
* -- apply to these child devices
*
* #address-cells = <1>;
* #size-cells = <0>;
*
* dummy@60 {
* compatible = "dummy";
* reg = <60>;
* };
* };
*
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
@ -247,14 +216,14 @@ static struct i2c_adapter ocores_adapter = {
}; };
#ifdef CONFIG_OF #ifdef CONFIG_OF
static int ocores_i2c_of_probe(struct platform_device* pdev, static int ocores_i2c_of_probe(struct platform_device *pdev,
struct ocores_i2c* i2c) struct ocores_i2c *i2c)
{ {
const __be32* val; const __be32* val;
val = of_get_property(pdev->dev.of_node, "regstep", NULL); val = of_get_property(pdev->dev.of_node, "regstep", NULL);
if (!val) { if (!val) {
dev_err(&pdev->dev, "Missing required parameter 'regstep'"); dev_err(&pdev->dev, "Missing required parameter 'regstep'\n");
return -ENODEV; return -ENODEV;
} }
i2c->regstep = be32_to_cpup(val); i2c->regstep = be32_to_cpup(val);
@ -262,7 +231,7 @@ static int ocores_i2c_of_probe(struct platform_device* pdev,
val = of_get_property(pdev->dev.of_node, "clock-frequency", NULL); val = of_get_property(pdev->dev.of_node, "clock-frequency", NULL);
if (!val) { if (!val) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"Missing required parameter 'clock-frequency'"); "Missing required parameter 'clock-frequency'\n");
return -ENODEV; return -ENODEV;
} }
i2c->clock_khz = be32_to_cpup(val) / 1000; i2c->clock_khz = be32_to_cpup(val) / 1000;
@ -351,7 +320,7 @@ static int __devinit ocores_i2c_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit ocores_i2c_remove(struct platform_device* pdev) static int __devexit ocores_i2c_remove(struct platform_device *pdev)
{ {
struct ocores_i2c *i2c = platform_get_drvdata(pdev); struct ocores_i2c *i2c = platform_get_drvdata(pdev);