|
@@ -10,40 +10,9 @@
|
|
|
*/
|
|
|
|
|
|
/*
|
|
|
- * Device tree configuration:
|
|
|
- *
|
|
|
- * 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>;
|
|
|
- * };
|
|
|
- * };
|
|
|
- *
|
|
|
+ * This driver can be used from the device tree, see
|
|
|
+ * Documentation/devicetree/bindings/i2c/ocore-i2c.txt
|
|
|
*/
|
|
|
-
|
|
|
#include <linux/kernel.h>
|
|
|
#include <linux/module.h>
|
|
|
#include <linux/init.h>
|
|
@@ -247,14 +216,14 @@ static struct i2c_adapter ocores_adapter = {
|
|
|
};
|
|
|
|
|
|
#ifdef CONFIG_OF
|
|
|
-static int ocores_i2c_of_probe(struct platform_device* pdev,
|
|
|
- struct ocores_i2c* i2c)
|
|
|
+static int ocores_i2c_of_probe(struct platform_device *pdev,
|
|
|
+ struct ocores_i2c *i2c)
|
|
|
{
|
|
|
const __be32* val;
|
|
|
|
|
|
val = of_get_property(pdev->dev.of_node, "regstep", NULL);
|
|
|
if (!val) {
|
|
|
- dev_err(&pdev->dev, "Missing required parameter 'regstep'");
|
|
|
+ dev_err(&pdev->dev, "Missing required parameter 'regstep'\n");
|
|
|
return -ENODEV;
|
|
|
}
|
|
|
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);
|
|
|
if (!val) {
|
|
|
dev_err(&pdev->dev,
|
|
|
- "Missing required parameter 'clock-frequency'");
|
|
|
+ "Missing required parameter 'clock-frequency'\n");
|
|
|
return -ENODEV;
|
|
|
}
|
|
|
i2c->clock_khz = be32_to_cpup(val) / 1000;
|
|
@@ -351,7 +320,7 @@ static int __devinit ocores_i2c_probe(struct platform_device *pdev)
|
|
|
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);
|
|
|
|