Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

dt-bindings: i2c: convert ocores binding to yaml

Convert the open cores i2c controller binding from text to yaml.

Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
Signed-off-by: Wolfram Sang <wsa@kernel.org>

authored by

Conor Dooley and committed by
Wolfram Sang
8ad69f49 74557cb4

+114 -79
-78
Documentation/devicetree/bindings/i2c/i2c-ocores.txt
··· 1 - Device tree configuration for i2c-ocores 2 - 3 - Required properties: 4 - - compatible : "opencores,i2c-ocores" 5 - "aeroflexgaisler,i2cmst" 6 - "sifive,fu540-c000-i2c", "sifive,i2c0" 7 - For Opencore based I2C IP block reimplemented in 8 - FU540-C000 SoC. 9 - "sifive,fu740-c000-i2c", "sifive,i2c0" 10 - For Opencore based I2C IP block reimplemented in 11 - FU740-C000 SoC. 12 - Please refer to sifive-blocks-ip-versioning.txt for 13 - additional details. 14 - - reg : bus address start and address range size of device 15 - - clocks : handle to the controller clock; see the note below. 16 - Mutually exclusive with opencores,ip-clock-frequency 17 - - opencores,ip-clock-frequency: frequency of the controller clock in Hz; 18 - see the note below. Mutually exclusive with clocks 19 - - #address-cells : should be <1> 20 - - #size-cells : should be <0> 21 - 22 - Optional properties: 23 - - interrupts : interrupt number. 24 - - clock-frequency : frequency of bus clock in Hz; see the note below. 25 - Defaults to 100 KHz when the property is not specified 26 - - reg-shift : device register offsets are shifted by this value 27 - - reg-io-width : io register width in bytes (1, 2 or 4) 28 - - regstep : deprecated, use reg-shift above 29 - 30 - Note 31 - clock-frequency property is meant to control the bus frequency for i2c bus 32 - drivers, but it was incorrectly used to specify i2c controller input clock 33 - frequency. So the following rules are set to fix this situation: 34 - - if clock-frequency is present and neither opencores,ip-clock-frequency nor 35 - clocks are, then clock-frequency specifies i2c controller clock frequency. 36 - This is to keep backwards compatibility with setups using old DTB. i2c bus 37 - frequency is fixed at 100 KHz. 38 - - if clocks is present it specifies i2c controller clock. clock-frequency 39 - property specifies i2c bus frequency. 40 - - if opencores,ip-clock-frequency is present it specifies i2c controller 41 - clock frequency. clock-frequency property specifies i2c bus frequency. 42 - 43 - Examples: 44 - 45 - i2c0: ocores@a0000000 { 46 - #address-cells = <1>; 47 - #size-cells = <0>; 48 - compatible = "opencores,i2c-ocores"; 49 - reg = <0xa0000000 0x8>; 50 - interrupts = <10>; 51 - opencores,ip-clock-frequency = <20000000>; 52 - 53 - reg-shift = <0>; /* 8 bit registers */ 54 - reg-io-width = <1>; /* 8 bit read/write */ 55 - 56 - dummy@60 { 57 - compatible = "dummy"; 58 - reg = <0x60>; 59 - }; 60 - }; 61 - or 62 - i2c0: ocores@a0000000 { 63 - #address-cells = <1>; 64 - #size-cells = <0>; 65 - compatible = "opencores,i2c-ocores"; 66 - reg = <0xa0000000 0x8>; 67 - interrupts = <10>; 68 - clocks = <&osc>; 69 - clock-frequency = <400000>; /* i2c bus frequency 400 KHz */ 70 - 71 - reg-shift = <0>; /* 8 bit registers */ 72 - reg-io-width = <1>; /* 8 bit read/write */ 73 - 74 - dummy@60 { 75 - compatible = "dummy"; 76 - reg = <0x60>; 77 - }; 78 - };
+113
Documentation/devicetree/bindings/i2c/opencores,i2c-ocores.yaml
··· 1 + # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) 2 + %YAML 1.2 3 + --- 4 + $id: http://devicetree.org/schemas/i2c/opencores,i2c-ocores.yaml# 5 + $schema: http://devicetree.org/meta-schemas/core.yaml# 6 + 7 + title: OpenCores I2C controller 8 + 9 + maintainers: 10 + - Peter Korsgaard <peter@korsgaard.com> 11 + - Andrew Lunn <andrew@lunn.ch> 12 + 13 + allOf: 14 + - $ref: /schemas/i2c/i2c-controller.yaml# 15 + 16 + properties: 17 + compatible: 18 + oneOf: 19 + - items: 20 + - enum: 21 + - sifive,fu740-c000-i2c # Opencore based IP block FU740-C000 SoC 22 + - sifive,fu540-c000-i2c # Opencore based IP block FU540-C000 SoC 23 + - const: sifive,i2c0 24 + - enum: 25 + - opencores,i2c-ocores 26 + - aeroflexgaisler,i2cmst 27 + 28 + reg: 29 + maxItems: 1 30 + 31 + interrupts: 32 + maxItems: 1 33 + 34 + clocks: 35 + maxItems: 1 36 + 37 + clock-frequency: 38 + description: | 39 + clock-frequency property is meant to control the bus frequency for i2c bus 40 + drivers, but it was incorrectly used to specify i2c controller input clock 41 + frequency. So the following rules are set to fix this situation: 42 + - if clock-frequency is present and neither opencores,ip-clock-frequency nor 43 + clocks are, then clock-frequency specifies i2c controller clock frequency. 44 + This is to keep backwards compatibility with setups using old DTB. i2c bus 45 + frequency is fixed at 100 KHz. 46 + - if clocks is present it specifies i2c controller clock. clock-frequency 47 + property specifies i2c bus frequency. 48 + - if opencores,ip-clock-frequency is present it specifies i2c controller 49 + clock frequency. clock-frequency property specifies i2c bus frequency. 50 + default: 100000 51 + 52 + reg-io-width: 53 + description: | 54 + io register width in bytes 55 + enum: [1, 2, 4] 56 + 57 + reg-shift: 58 + description: | 59 + device register offsets are shifted by this value 60 + default: 0 61 + 62 + regstep: 63 + description: | 64 + deprecated, use reg-shift above 65 + deprecated: true 66 + 67 + opencores,ip-clock-frequency: 68 + $ref: /schemas/types.yaml#/definitions/uint32 69 + description: | 70 + Frequency of the controller clock in Hz. Mutually exclusive with clocks. 71 + See the note above. 72 + 73 + required: 74 + - compatible 75 + - reg 76 + - "#address-cells" 77 + - "#size-cells" 78 + 79 + oneOf: 80 + - required: 81 + - opencores,ip-clock-frequency 82 + - required: 83 + - clocks 84 + 85 + unevaluatedProperties: false 86 + 87 + examples: 88 + - | 89 + i2c@a0000000 { 90 + compatible = "opencores,i2c-ocores"; 91 + reg = <0xa0000000 0x8>; 92 + #address-cells = <1>; 93 + #size-cells = <0>; 94 + interrupts = <10>; 95 + opencores,ip-clock-frequency = <20000000>; 96 + 97 + reg-shift = <0>; /* 8 bit registers */ 98 + reg-io-width = <1>; /* 8 bit read/write */ 99 + }; 100 + 101 + i2c@b0000000 { 102 + compatible = "opencores,i2c-ocores"; 103 + reg = <0xa0000000 0x8>; 104 + #address-cells = <1>; 105 + #size-cells = <0>; 106 + interrupts = <10>; 107 + clocks = <&osc>; 108 + clock-frequency = <400000>; /* i2c bus frequency 400 KHz */ 109 + 110 + reg-shift = <0>; /* 8 bit registers */ 111 + reg-io-width = <1>; /* 8 bit read/write */ 112 + }; 113 + ...
+1 -1
MAINTAINERS
··· 14869 14869 M: Andrew Lunn <andrew@lunn.ch> 14870 14870 L: linux-i2c@vger.kernel.org 14871 14871 S: Maintained 14872 - F: Documentation/devicetree/bindings/i2c/i2c-ocores.txt 14872 + F: Documentation/devicetree/bindings/i2c/i2c-ocores.yaml 14873 14873 F: Documentation/i2c/busses/i2c-ocores.rst 14874 14874 F: drivers/i2c/busses/i2c-ocores.c 14875 14875 F: include/linux/platform_data/i2c-ocores.h