Skip to contentSkip to conversation

dt-bindings: i2c: convert rockchip i2c bindings to yaml

PATCH In review Johan Jonker 2 participants 10 messages Mar 5, 2020 – Mar 12, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/5 dt-bindings: i2c: convert rockchip i2c bindings to yaml

Current dts files with 'i2c' nodes are manually verified. In order to automate this process i2c-rk3x.txt has to be converted to yaml. In the new setup i2c-rk3x.yaml will inherit properties from i2c-controller.yaml.

Also change document name in MAINTAINERS.

---
 Documentation/devicetree/bindings/i2c/i2c-rk3x.txt |  68 -----------
 .../devicetree/bindings/i2c/i2c-rk3x.yaml          | 129 +++++++++++++++++++++
 MAINTAINERS                                        |   2 +-
 3 files changed, 130 insertions(+), 69 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-rk3x.txt
 create mode 100644 Documentation/devicetree/bindings/i2c/i2c-rk3x.yaml
Documentation/devicetree/bindings/i2c/i2c-rk3x.txt deleted +0 -68
deleted file mode 100644
index 22f2eeb2c..000000000
@@ -1,68 +0,0 @@
-* Rockchip RK3xxx I2C controller
-
-This driver interfaces with the native I2C controller present in Rockchip
-RK3xxx SoCs.
-
-Required properties :
-
- - reg : Offset and length of the register set for the device
- - compatible: should be one of the following:
-   - "rockchip,rv1108-i2c": for rv1108
-   - "rockchip,rk3066-i2c": for rk3066
-   - "rockchip,rk3188-i2c": for rk3188
-   - "rockchip,rk3228-i2c": for rk3228
-   - "rockchip,rk3288-i2c": for rk3288
-   - "rockchip,rk3328-i2c", "rockchip,rk3399-i2c": for rk3328
-   - "rockchip,rk3399-i2c": for rk3399
- - interrupts : interrupt number
- - clocks: See ../clock/clock-bindings.txt
-   - For older hardware (rk3066, rk3188, rk3228, rk3288):
-     - There is one clock that's used both to derive the functional clock
-       for the device and as the bus clock.
-   - For newer hardware (rk3399): specified by name
-     - "i2c": This is used to derive the functional clock.
-     - "pclk": This is the bus clock.
-
-Required on RK3066, RK3188 :
-
- - rockchip,grf : the phandle of the syscon node for the general register
-		  file (GRF)
- - on those SoCs an alias with the correct I2C bus ID (bit offset in the GRF)
-   is also required.
-
-Optional properties :
-
- - clock-frequency : SCL frequency to use (in Hz). If omitted, 100kHz is used.
- - i2c-scl-rising-time-ns : Number of nanoseconds the SCL signal takes to rise
-	(t(r) in I2C specification). If not specified this is assumed to be
-	the maximum the specification allows(1000 ns for Standard-mode,
-	300 ns for Fast-mode) which might cause slightly slower communication.
- - i2c-scl-falling-time-ns : Number of nanoseconds the SCL signal takes to fall
-	(t(f) in the I2C specification). If not specified this is assumed to
-	be the maximum the specification allows (300 ns) which might cause
-	slightly slower communication.
- - i2c-sda-falling-time-ns : Number of nanoseconds the SDA signal takes to fall
-	(t(f) in the I2C specification). If not specified we'll use the SCL
-	value since they are the same in nearly all cases.
-
-Example:
-
-aliases {
-	i2c0 = &i2c0;
-}
-
-i2c0: i2c@2002d000 {
-	compatible = "rockchip,rk3188-i2c";
-	reg = <0x2002d000 0x1000>;
-	interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	rockchip,grf = <&grf>;
-
-	clock-names = "i2c";
-	clocks = <&cru PCLK_I2C0>;
-
-	i2c-scl-rising-time-ns = <800>;
-	i2c-scl-falling-time-ns = <100>;
-};
Documentation/devicetree/bindings/i2c/i2c-rk3x.yaml new file +129 -0

129 lines not on this page · raw message

MAINTAINERS +1 -1
index 42c21184d..a480cec62 100644
@@ -2279,7 +2279,7 @@ L:	linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org (moderated for non-subscribers)
 L:	[email protected]
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git
 S:	Maintained
-F:	Documentation/devicetree/bindings/i2c/i2c-rk3x.txt
+F:	Documentation/devicetree/bindings/i2c/i2c-rk3x.yaml
 F:	Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yaml
 F:	Documentation/devicetree/bindings/spi/spi-rockchip.yaml
 F:	arch/arm/boot/dts/rk3*
Signature · 1 line
2.11.0
#1 lore raw

PATCH 2/5 dt-bindings: i2c: i2c-rk3x: add description for rk3036

The description below is already in use for rk3036.dtsi, but was somehow never added to a document, so add "rockchip,rk3036-i2c", "rockchip,rk3288-i2c" for i2c nodes on a rk3036 platform to i2c-rk3x.yaml.

---
 Documentation/devicetree/bindings/i2c/i2c-rk3x.yaml | 4 ++++
 1 file changed, 4 insertions(+)
Documentation/devicetree/bindings/i2c/i2c-rk3x.yaml +4 -0
index 962aefb7d..0bba39998 100644
@@ -28,6 +28,10 @@ properties:
       - const: rockchip,rk3399-i2c
       - items:
           - enum:
+            - rockchip,rk3036-i2c
+          - const: rockchip,rk3288-i2c
+      - items:
+          - enum:
             - rockchip,rk3328-i2c
           - const: rockchip,rk3399-i2c
 
Signature · 1 line
2.11.0
maintainer Reviewed-by on v1 2/5
#2 lore raw

Re: [PATCH v1 2/5] dt-bindings: i2c: i2c-rk3x: add description for rk3036

Quoted 10 lines · Johan Jonker

The description below is already in use for rk3036.dtsi, but was somehow never added to a document, so add "rockchip,rk3036-i2c", "rockchip,rk3288-i2c" for i2c nodes on a rk3036 platform to i2c-rk3x.yaml.

---
 Documentation/devicetree/bindings/i2c/i2c-rk3x.yaml | 4 ++++
 1 file changed, 4 insertions(+)
#3 lore raw

PATCH 3/5 dt-bindings: i2c: i2c-rk3x: add description for rk3368

In reply to Johan Jonker

The description below is already in use for rk3368.dtsi, but was somehow never added to a document, so add "rockchip,rk3368-i2c", "rockchip,rk3288-i2c" for i2c nodes on a rk3368 platform to i2c-rk3x.yaml.

---
 Documentation/devicetree/bindings/i2c/i2c-rk3x.yaml | 1 +
 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/i2c/i2c-rk3x.yaml +1 -0
index 0bba39998..67cdce8fb 100644
@@ -29,6 +29,7 @@ properties:
       - items:
           - enum:
             - rockchip,rk3036-i2c
+            - rockchip,rk3368-i2c
           - const: rockchip,rk3288-i2c
       - items:
           - enum:
Signature · 1 line
2.11.0
maintainer Acked-by on v1 3/5
#4 lore raw

Re: [PATCH v1 3/5] dt-bindings: i2c: i2c-rk3x: add description for rk3368

Quoted 10 lines · Johan Jonker

The description below is already in use for rk3368.dtsi, but was somehow never added to a document, so add "rockchip,rk3368-i2c", "rockchip,rk3288-i2c" for i2c nodes on a rk3368 platform to i2c-rk3x.yaml.

---
 Documentation/devicetree/bindings/i2c/i2c-rk3x.yaml | 1 +
 1 file changed, 1 insertion(+)
#5 lore raw

PATCH 4/5 dt-bindings: i2c: i2c-rk3x: add description for rk3308

In reply to Johan Jonker

The description below is already in use for rk3308.dtsi, but was somehow never added to a document, so add "rockchip,rk3308-i2c", "rockchip,rk3399-i2c" for i2c nodes on a rk3308 platform to i2c-rk3x.yaml.

---
 Documentation/devicetree/bindings/i2c/i2c-rk3x.yaml | 1 +
 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/i2c/i2c-rk3x.yaml +1 -0
index 67cdce8fb..edee8f699 100644
@@ -33,6 +33,7 @@ properties:
           - const: rockchip,rk3288-i2c
       - items:
           - enum:
+            - rockchip,rk3308-i2c
             - rockchip,rk3328-i2c
           - const: rockchip,rk3399-i2c
 
Signature · 1 line
2.11.0
maintainer Acked-by on v1 4/5
#6 lore raw

Re: [PATCH v1 4/5] dt-bindings: i2c: i2c-rk3x: add description for rk3308

Quoted 10 lines · Johan Jonker

The description below is already in use for rk3308.dtsi, but was somehow never added to a document, so add "rockchip,rk3308-i2c", "rockchip,rk3399-i2c" for i2c nodes on a rk3308 platform to i2c-rk3x.yaml.

---
 Documentation/devicetree/bindings/i2c/i2c-rk3x.yaml | 1 +
 1 file changed, 1 insertion(+)
#7 lore raw

PATCH 5/5 dt-bindings: i2c: i2c-rk3x: add description for px30

In reply to Johan Jonker

The description below is already in use for px30.dtsi, but was somehow never added to a document, so add "rockchip,px30-i2c", "rockchip,rk3399-i2c" for i2c nodes on a px30 platform to i2c-rk3x.yaml.

---
 Documentation/devicetree/bindings/i2c/i2c-rk3x.yaml | 1 +
 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/i2c/i2c-rk3x.yaml +1 -0
index edee8f699..61eac76c8 100644
@@ -33,6 +33,7 @@ properties:
           - const: rockchip,rk3288-i2c
       - items:
           - enum:
+            - rockchip,px30-i2c
             - rockchip,rk3308-i2c
             - rockchip,rk3328-i2c
           - const: rockchip,rk3399-i2c
Signature · 1 line
2.11.0
maintainer Reviewed-by on v1 1/5
#8 lore raw
In reply to Johan Jonker
Quoted 8 lines · Johan Jonker

Current dts files with 'i2c' nodes are manually verified. In order to automate this process i2c-rk3x.txt has to be converted to yaml. In the new setup i2c-rk3x.yaml will inherit properties from i2c-controller.yaml.

Also change document name in MAINTAINERS.

Quoted 9 lines
---
 Documentation/devicetree/bindings/i2c/i2c-rk3x.txt |  68 -----------
 .../devicetree/bindings/i2c/i2c-rk3x.yaml          | 129 +++++++++++++++++++++
 MAINTAINERS                                        |   2 +-
 3 files changed, 130 insertions(+), 69 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-rk3x.txt
 create mode 100644 Documentation/devicetree/bindings/i2c/i2c-rk3x.yaml
maintainer
#9 lore raw
Quoted 19 lines · Rob Herring
Quoted 8 lines · Johan Jonker

Current dts files with 'i2c' nodes are manually verified. In order to automate this process i2c-rk3x.txt has to be converted to yaml. In the new setup i2c-rk3x.yaml will inherit properties from i2c-controller.yaml.

Also change document name in MAINTAINERS.

Quoted 9 lines
---
 Documentation/devicetree/bindings/i2c/i2c-rk3x.txt |  68 -----------
 .../devicetree/bindings/i2c/i2c-rk3x.yaml          | 129 +++++++++++++++++++++
 MAINTAINERS                                        |   2 +-
 3 files changed, 130 insertions(+), 69 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-rk3x.txt
 create mode 100644 Documentation/devicetree/bindings/i2c/i2c-rk3x.yaml
Quoted 1 line

As this series is all binding changes, I'll take it via the DT tree.

Rob