Commit 9ae97a8996a6d6f66e2fbc221906e2406d6c261f
Committed by
Wolfram Sang
Wolfram Sang
1 parent
097df40312
Exists in
smarc-l5.0.0_1.0.0-ga
and in
5 other branches
i2c: i2c-ocores: DT bindings and minor fixes.
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>
Showing 2 changed files with 34 additions and 38 deletions Side-by-side Diff
Documentation/devicetree/bindings/i2c/i2c-ocores.txt
| 1 | +Device tree configuration for i2c-ocores | |
| 2 | + | |
| 3 | +Required properties: | |
| 4 | +- compatible : "opencores,i2c-ocores" | |
| 5 | +- reg : bus address start and address range size of device | |
| 6 | +- interrupts : interrupt number | |
| 7 | +- regstep : size of device registers in bytes | |
| 8 | +- clock-frequency : frequency of bus clock in Hz | |
| 9 | +- #address-cells : should be <1> | |
| 10 | +- #size-cells : should be <0> | |
| 11 | + | |
| 12 | +Example: | |
| 13 | + | |
| 14 | + i2c0: ocores@a0000000 { | |
| 15 | + #address-cells = <1>; | |
| 16 | + #size-cells = <0>; | |
| 17 | + compatible = "opencores,i2c-ocores"; | |
| 18 | + reg = <0xa0000000 0x8>; | |
| 19 | + interrupts = <10>; | |
| 20 | + regstep = <1>; | |
| 21 | + clock-frequency = <20000000>; | |
| 22 | + | |
| 23 | + dummy@60 { | |
| 24 | + compatible = "dummy"; | |
| 25 | + reg = <0x60>; | |
| 26 | + }; | |
| 27 | + }; |
drivers/i2c/busses/i2c-ocores.c
| ... | ... | @@ -10,40 +10,9 @@ |
| 10 | 10 | */ |
| 11 | 11 | |
| 12 | 12 | /* |
| 13 | - * Device tree configuration: | |
| 14 | - * | |
| 15 | - * Required properties: | |
| 16 | - * - compatible : "opencores,i2c-ocores" | |
| 17 | - * - reg : bus address start and address range size of device | |
| 18 | - * - interrupts : interrupt number | |
| 19 | - * - regstep : size of device registers in bytes | |
| 20 | - * - clock-frequency : frequency of bus clock in Hz | |
| 21 | - * | |
| 22 | - * Example: | |
| 23 | - * | |
| 24 | - * i2c0: ocores@a0000000 { | |
| 25 | - * compatible = "opencores,i2c-ocores"; | |
| 26 | - * reg = <0xa0000000 0x8>; | |
| 27 | - * interrupts = <10>; | |
| 28 | - * | |
| 29 | - * regstep = <1>; | |
| 30 | - * clock-frequency = <20000000>; | |
| 31 | - * | |
| 32 | - * -- Devices connected on this I2C bus get | |
| 33 | - * -- defined here; address- and size-cells | |
| 34 | - * -- apply to these child devices | |
| 35 | - * | |
| 36 | - * #address-cells = <1>; | |
| 37 | - * #size-cells = <0>; | |
| 38 | - * | |
| 39 | - * dummy@60 { | |
| 40 | - * compatible = "dummy"; | |
| 41 | - * reg = <60>; | |
| 42 | - * }; | |
| 43 | - * }; | |
| 44 | - * | |
| 13 | + * This driver can be used from the device tree, see | |
| 14 | + * Documentation/devicetree/bindings/i2c/ocore-i2c.txt | |
| 45 | 15 | */ |
| 46 | - | |
| 47 | 16 | #include <linux/kernel.h> |
| 48 | 17 | #include <linux/module.h> |
| 49 | 18 | #include <linux/init.h> |
| 50 | 19 | |
| ... | ... | @@ -247,14 +216,14 @@ |
| 247 | 216 | }; |
| 248 | 217 | |
| 249 | 218 | #ifdef CONFIG_OF |
| 250 | -static int ocores_i2c_of_probe(struct platform_device* pdev, | |
| 251 | - struct ocores_i2c* i2c) | |
| 219 | +static int ocores_i2c_of_probe(struct platform_device *pdev, | |
| 220 | + struct ocores_i2c *i2c) | |
| 252 | 221 | { |
| 253 | 222 | const __be32* val; |
| 254 | 223 | |
| 255 | 224 | val = of_get_property(pdev->dev.of_node, "regstep", NULL); |
| 256 | 225 | if (!val) { |
| 257 | - dev_err(&pdev->dev, "Missing required parameter 'regstep'"); | |
| 226 | + dev_err(&pdev->dev, "Missing required parameter 'regstep'\n"); | |
| 258 | 227 | return -ENODEV; |
| 259 | 228 | } |
| 260 | 229 | i2c->regstep = be32_to_cpup(val); |
| ... | ... | @@ -262,7 +231,7 @@ |
| 262 | 231 | val = of_get_property(pdev->dev.of_node, "clock-frequency", NULL); |
| 263 | 232 | if (!val) { |
| 264 | 233 | dev_err(&pdev->dev, |
| 265 | - "Missing required parameter 'clock-frequency'"); | |
| 234 | + "Missing required parameter 'clock-frequency'\n"); | |
| 266 | 235 | return -ENODEV; |
| 267 | 236 | } |
| 268 | 237 | i2c->clock_khz = be32_to_cpup(val) / 1000; |
| ... | ... | @@ -351,7 +320,7 @@ |
| 351 | 320 | return 0; |
| 352 | 321 | } |
| 353 | 322 | |
| 354 | -static int __devexit ocores_i2c_remove(struct platform_device* pdev) | |
| 323 | +static int __devexit ocores_i2c_remove(struct platform_device *pdev) | |
| 355 | 324 | { |
| 356 | 325 | struct ocores_i2c *i2c = platform_get_drvdata(pdev); |
| 357 | 326 |