Convert the Samsung S3FWRN5 NCI NFC controller bindings to dtschema.
This is conversion only so it includes properties with invalid prefixes
(s3fwrn5,en-gpios) which should be addressed later.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
.../devicetree/bindings/net/nfc/s3fwrn5.txt | 25 --------
.../devicetree/bindings/net/nfc/s3fwrn5.yaml | 59 +++++++++++++++++++
MAINTAINERS | 1 +
3 files changed, 60 insertions(+), 25 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/net/nfc/s3fwrn5.txt
create mode 100644 Documentation/devicetree/bindings/net/nfc/s3fwrn5.yaml
diff --git a/Documentation/devicetree/bindings/net/nfc/s3fwrn5.txt b/Documentation/devicetree/bindings/net/nfc/s3fwrn5.txt
deleted file mode 100644
index f02f6fb7f81c..000000000000
--- a/Documentation/devicetree/bindings/net/nfc/s3fwrn5.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-* Samsung S3FWRN5 NCI NFC Controller
-
-Required properties:
-- compatible: Should be "samsung,s3fwrn5-i2c".
-- reg: address on the bus
-- interrupts: GPIO interrupt to which the chip is connected
-- s3fwrn5,en-gpios: Output GPIO pin used for enabling/disabling the chip
-- s3fwrn5,fw-gpios: Output GPIO pin used to enter firmware mode and
- sleep/wakeup control
-
-Example:
-
-&hsi2c_4 {
- s3fwrn5@27 {
- compatible = "samsung,s3fwrn5-i2c";
-
- reg = <0x27>;
-
- interrupt-parent = <&gpa1>;
- interrupts = <3 0 0>;
-
- s3fwrn5,en-gpios = <&gpf1 4 0>;
- s3fwrn5,fw-gpios = <&gpj0 2 0>;
- };
-};
diff --git a/Documentation/devicetree/bindings/net/nfc/s3fwrn5.yaml b/Documentation/devicetree/bindings/net/nfc/s3fwrn5.yaml
new file mode 100644
index 000000000000..c22451dea350
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/nfc/s3fwrn5.yaml
@@ -0,0 +1,59 @@
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/net/nfc/s3fwrn5.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Samsung S3FWRN5 NCI NFC Controller
+
+maintainers:
+ - Krzysztof Kozlowski <[email protected]>
+ - Krzysztof Opasiak <[email protected]>
+
+properties:
+ compatible:
+ const: samsung,s3fwrn5-i2c
+
+ interrupts:
+ maxItems: 1
+
+ reg:
+ maxItems: 1
+
+ s3fwrn5,en-gpios:
+ maxItems: 1
+ description:
+ Output GPIO pin used for enabling/disabling the chip
+
+ s3fwrn5,fw-gpios:
+ maxItems: 1
+ description:
+ Output GPIO pin used to enter firmware mode and sleep/wakeup control
+
+required:
+ - compatible
+ - interrupts
+ - reg
+ - s3fwrn5,en-gpios
+ - s3fwrn5,fw-gpios
+
+examples:
+ - |
+ #include <dt-bindings/gpio/gpio.h>
+ #include <dt-bindings/interrupt-controller/irq.h>
+
+ i2c4 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ s3fwrn5@27 {
+ compatible = "samsung,s3fwrn5-i2c";
+ reg = <0x27>;
+
+ interrupt-parent = <&gpa1>;
+ interrupts = <3 IRQ_TYPE_LEVEL_HIGH>;
+
+ s3fwrn5,en-gpios = <&gpf1 4 GPIO_ACTIVE_HIGH>;
+ s3fwrn5,fw-gpios = <&gpj0 2 GPIO_ACTIVE_HIGH>;
+ };
+ };
diff --git a/MAINTAINERS b/MAINTAINERS
index ac79fdbdf8d0..91b3d5c349d8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -15273,6 +15273,7 @@ M: Robert Baldyga <[email protected]>
M: Krzysztof Opasiak <[email protected]>
L: [email protected] (moderated for non-subscribers)
S: Supported
+F: Documentation/devicetree/bindings/net/nfc/s3fwrn5.yaml
F: drivers/nfc/s3fwrn5
SAMSUNG S5C73M3 CAMERA DRIVER
--
2.17.1
The device tree property prefix describes the vendor, which in case of
S3FWRN5 chip is Samsung. Therefore the "s3fwrn5" prefix for "en-gpios"
and "fw-gpios" is not correct and should be deprecated. Introduce
properly named properties for these GPIOs and rename the fw-gpios" to
"wake-gpios" to better describe its purpose.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
.../devicetree/bindings/net/nfc/s3fwrn5.yaml | 24 ++++++++++++++-----
1 file changed, 18 insertions(+), 6 deletions(-)
diff --git a/Documentation/devicetree/bindings/net/nfc/s3fwrn5.yaml b/Documentation/devicetree/bindings/net/nfc/s3fwrn5.yaml
index c22451dea350..1f13b4553db4 100644
--- a/Documentation/devicetree/bindings/net/nfc/s3fwrn5.yaml
+++ b/Documentation/devicetree/bindings/net/nfc/s3fwrn5.yaml
@@ -14,28 +14,40 @@ properties:
compatible:
const: samsung,s3fwrn5-i2c
+ en-gpios:
+ maxItems: 1
+ description:
+ Output GPIO pin used for enabling/disabling the chip
+
interrupts:
maxItems: 1
reg:
maxItems: 1
+ wake-gpios:
+ maxItems: 1
+ description:
+ Output GPIO pin used to enter firmware mode and sleep/wakeup control
+
s3fwrn5,en-gpios:
maxItems: 1
+ deprecated: true
description:
- Output GPIO pin used for enabling/disabling the chip
+ Use en-gpios
s3fwrn5,fw-gpios:
maxItems: 1
+ deprecated: true
description:
- Output GPIO pin used to enter firmware mode and sleep/wakeup control
+ Use wake-gpios
required:
- compatible
+ - en-gpios
- interrupts
- reg
- - s3fwrn5,en-gpios
- - s3fwrn5,fw-gpios
+ - wake-gpios
examples:
- |
@@ -53,7 +65,7 @@ examples:
interrupt-parent = <&gpa1>;
interrupts = <3 IRQ_TYPE_LEVEL_HIGH>;
- s3fwrn5,en-gpios = <&gpf1 4 GPIO_ACTIVE_HIGH>;
- s3fwrn5,fw-gpios = <&gpj0 2 GPIO_ACTIVE_HIGH>;
+ en-gpios = <&gpf1 4 GPIO_ACTIVE_HIGH>;
+ wake-gpios = <&gpj0 2 GPIO_ACTIVE_HIGH>;
};
};
--
2.17.1
The device tree property prefix describes the vendor, which in case of
S3FWRN5 chip is Samsung. Therefore the "s3fwrn5" prefix for "en-gpios"
and "fw-gpios" is not correct and should be deprecated. Introduce
properly named properties for these GPIOs but still support deprecated
ones.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
drivers/nfc/s3fwrn5/i2c.c | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/drivers/nfc/s3fwrn5/i2c.c b/drivers/nfc/s3fwrn5/i2c.c
index b4eb926d220a..557279492503 100644
--- a/drivers/nfc/s3fwrn5/i2c.c
+++ b/drivers/nfc/s3fwrn5/i2c.c
@@ -200,13 +200,21 @@ static int s3fwrn5_i2c_parse_dt(struct i2c_client *client)
if (!np)
return -ENODEV;
- phy->gpio_en = of_get_named_gpio(np, "s3fwrn5,en-gpios", 0);
- if (!gpio_is_valid(phy->gpio_en))
- return -ENODEV;
+ phy->gpio_en = of_get_named_gpio(np, "en-gpios", 0);
+ if (!gpio_is_valid(phy->gpio_en)) {
+ /* Support also deprecated property */
+ phy->gpio_en = of_get_named_gpio(np, "s3fwrn5,en-gpios", 0);
+ if (!gpio_is_valid(phy->gpio_en))
+ return -ENODEV;
+ }
- phy->gpio_fw_wake = of_get_named_gpio(np, "s3fwrn5,fw-gpios", 0);
- if (!gpio_is_valid(phy->gpio_fw_wake))
- return -ENODEV;
+ phy->gpio_fw_wake = of_get_named_gpio(np, "wake-gpios", 0);
+ if (!gpio_is_valid(phy->gpio_fw_wake)) {
+ /* Support also deprecated property */
+ phy->gpio_fw_wake = of_get_named_gpio(np, "s3fwrn5,fw-gpios", 0);
+ if (!gpio_is_valid(phy->gpio_fw_wake))
+ return -ENODEV;
+ }
return 0;
}
--
2.17.1
Since "s3fwrn5" is not a valid vendor prefix, use new GPIO properties
instead of the deprecated.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
index 250fc01de78d..24aab3ea3f52 100644
--- a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
@@ -795,8 +795,8 @@
reg = <0x27>;
interrupt-parent = <&gpa1>;
interrupts = <3 IRQ_TYPE_LEVEL_HIGH>;
- s3fwrn5,en-gpios = <&gpf1 4 GPIO_ACTIVE_HIGH>;
- s3fwrn5,fw-gpios = <&gpj0 2 GPIO_ACTIVE_HIGH>;
+ en-gpios = <&gpf1 4 GPIO_ACTIVE_HIGH>;
+ wake-gpios = <&gpj0 2 GPIO_ACTIVE_HIGH>;
};
};
--
2.17.1
On 29.08.2020 16:29, Krzysztof Kozlowski wrote:
> The device tree property prefix describes the vendor, which in case of
> S3FWRN5 chip is Samsung. Therefore the "s3fwrn5" prefix for "en-gpios"
> and "fw-gpios" is not correct and should be deprecated. Introduce
> properly named properties for these GPIOs but still support deprecated
> ones.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
Tested-by: Marek Szyprowski <[email protected]>
> ---
> drivers/nfc/s3fwrn5/i2c.c | 20 ++++++++++++++------
> 1 file changed, 14 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/nfc/s3fwrn5/i2c.c b/drivers/nfc/s3fwrn5/i2c.c
> index b4eb926d220a..557279492503 100644
> --- a/drivers/nfc/s3fwrn5/i2c.c
> +++ b/drivers/nfc/s3fwrn5/i2c.c
> @@ -200,13 +200,21 @@ static int s3fwrn5_i2c_parse_dt(struct i2c_client *client)
> if (!np)
> return -ENODEV;
>
> - phy->gpio_en = of_get_named_gpio(np, "s3fwrn5,en-gpios", 0);
> - if (!gpio_is_valid(phy->gpio_en))
> - return -ENODEV;
> + phy->gpio_en = of_get_named_gpio(np, "en-gpios", 0);
> + if (!gpio_is_valid(phy->gpio_en)) {
> + /* Support also deprecated property */
> + phy->gpio_en = of_get_named_gpio(np, "s3fwrn5,en-gpios", 0);
> + if (!gpio_is_valid(phy->gpio_en))
> + return -ENODEV;
> + }
>
> - phy->gpio_fw_wake = of_get_named_gpio(np, "s3fwrn5,fw-gpios", 0);
> - if (!gpio_is_valid(phy->gpio_fw_wake))
> - return -ENODEV;
> + phy->gpio_fw_wake = of_get_named_gpio(np, "wake-gpios", 0);
> + if (!gpio_is_valid(phy->gpio_fw_wake)) {
> + /* Support also deprecated property */
> + phy->gpio_fw_wake = of_get_named_gpio(np, "s3fwrn5,fw-gpios", 0);
> + if (!gpio_is_valid(phy->gpio_fw_wake))
> + return -ENODEV;
> + }
>
> return 0;
> }
Best regards
--
Marek Szyprowski, PhD
Samsung R&D Institute Poland
On 29.08.2020 16:29, Krzysztof Kozlowski wrote:
> Since "s3fwrn5" is not a valid vendor prefix, use new GPIO properties
> instead of the deprecated.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
Tested-by: Marek Szyprowski <[email protected]>
> ---
> arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
> index 250fc01de78d..24aab3ea3f52 100644
> --- a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
> +++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
> @@ -795,8 +795,8 @@
> reg = <0x27>;
> interrupt-parent = <&gpa1>;
> interrupts = <3 IRQ_TYPE_LEVEL_HIGH>;
> - s3fwrn5,en-gpios = <&gpf1 4 GPIO_ACTIVE_HIGH>;
> - s3fwrn5,fw-gpios = <&gpj0 2 GPIO_ACTIVE_HIGH>;
> + en-gpios = <&gpf1 4 GPIO_ACTIVE_HIGH>;
> + wake-gpios = <&gpj0 2 GPIO_ACTIVE_HIGH>;
> };
> };
>
Best regards
--
Marek Szyprowski, PhD
Samsung R&D Institute Poland
On Mon, 31 Aug 2020 at 15:16, Marek Szyprowski <[email protected]> wrote:
>
>
> On 29.08.2020 16:29, Krzysztof Kozlowski wrote:
> > Since "s3fwrn5" is not a valid vendor prefix, use new GPIO properties
> > instead of the deprecated.
> >
> > Signed-off-by: Krzysztof Kozlowski <[email protected]>
> Tested-by: Marek Szyprowski <[email protected]>
Thanks for testing this and others in the series. Much appreciated!
Best regards,
Krzysztof
On Sat, Aug 29, 2020 at 04:29:45PM +0200, Krzysztof Kozlowski wrote:
> Convert the Samsung S3FWRN5 NCI NFC controller bindings to dtschema.
> This is conversion only so it includes properties with invalid prefixes
> (s3fwrn5,en-gpios) which should be addressed later.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> .../devicetree/bindings/net/nfc/s3fwrn5.txt | 25 --------
> .../devicetree/bindings/net/nfc/s3fwrn5.yaml | 59 +++++++++++++++++++
Please rename to samsung,s3fwrn5-i2c.yaml.
> MAINTAINERS | 1 +
> 3 files changed, 60 insertions(+), 25 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/net/nfc/s3fwrn5.txt
> create mode 100644 Documentation/devicetree/bindings/net/nfc/s3fwrn5.yaml
>
> diff --git a/Documentation/devicetree/bindings/net/nfc/s3fwrn5.txt b/Documentation/devicetree/bindings/net/nfc/s3fwrn5.txt
> deleted file mode 100644
> index f02f6fb7f81c..000000000000
> --- a/Documentation/devicetree/bindings/net/nfc/s3fwrn5.txt
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -* Samsung S3FWRN5 NCI NFC Controller
> -
> -Required properties:
> -- compatible: Should be "samsung,s3fwrn5-i2c".
> -- reg: address on the bus
> -- interrupts: GPIO interrupt to which the chip is connected
> -- s3fwrn5,en-gpios: Output GPIO pin used for enabling/disabling the chip
> -- s3fwrn5,fw-gpios: Output GPIO pin used to enter firmware mode and
> - sleep/wakeup control
> -
> -Example:
> -
> -&hsi2c_4 {
> - s3fwrn5@27 {
> - compatible = "samsung,s3fwrn5-i2c";
> -
> - reg = <0x27>;
> -
> - interrupt-parent = <&gpa1>;
> - interrupts = <3 0 0>;
> -
> - s3fwrn5,en-gpios = <&gpf1 4 0>;
> - s3fwrn5,fw-gpios = <&gpj0 2 0>;
> - };
> -};
> diff --git a/Documentation/devicetree/bindings/net/nfc/s3fwrn5.yaml b/Documentation/devicetree/bindings/net/nfc/s3fwrn5.yaml
> new file mode 100644
> index 000000000000..c22451dea350
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/net/nfc/s3fwrn5.yaml
> @@ -0,0 +1,59 @@
> +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/net/nfc/s3fwrn5.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Samsung S3FWRN5 NCI NFC Controller
> +
> +maintainers:
> + - Krzysztof Kozlowski <[email protected]>
> + - Krzysztof Opasiak <[email protected]>
> +
> +properties:
> + compatible:
> + const: samsung,s3fwrn5-i2c
> +
> + interrupts:
> + maxItems: 1
> +
> + reg:
> + maxItems: 1
> +
> + s3fwrn5,en-gpios:
> + maxItems: 1
> + description:
> + Output GPIO pin used for enabling/disabling the chip
> +
> + s3fwrn5,fw-gpios:
> + maxItems: 1
> + description:
> + Output GPIO pin used to enter firmware mode and sleep/wakeup control
> +
> +required:
> + - compatible
> + - interrupts
> + - reg
> + - s3fwrn5,en-gpios
> + - s3fwrn5,fw-gpios
additionalProperties: false
> +
> +examples:
> + - |
> + #include <dt-bindings/gpio/gpio.h>
> + #include <dt-bindings/interrupt-controller/irq.h>
> +
> + i2c4 {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + s3fwrn5@27 {
> + compatible = "samsung,s3fwrn5-i2c";
> + reg = <0x27>;
> +
> + interrupt-parent = <&gpa1>;
> + interrupts = <3 IRQ_TYPE_LEVEL_HIGH>;
> +
> + s3fwrn5,en-gpios = <&gpf1 4 GPIO_ACTIVE_HIGH>;
> + s3fwrn5,fw-gpios = <&gpj0 2 GPIO_ACTIVE_HIGH>;
> + };
> + };
> diff --git a/MAINTAINERS b/MAINTAINERS
> index ac79fdbdf8d0..91b3d5c349d8 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -15273,6 +15273,7 @@ M: Robert Baldyga <[email protected]>
> M: Krzysztof Opasiak <[email protected]>
> L: [email protected] (moderated for non-subscribers)
> S: Supported
> +F: Documentation/devicetree/bindings/net/nfc/s3fwrn5.yaml
> F: drivers/nfc/s3fwrn5
>
> SAMSUNG S5C73M3 CAMERA DRIVER
> --
> 2.17.1
>
On Thu, 3 Sep 2020 at 18:33, Rob Herring <[email protected]> wrote:
>
> On Sat, Aug 29, 2020 at 04:29:45PM +0200, Krzysztof Kozlowski wrote:
> > Convert the Samsung S3FWRN5 NCI NFC controller bindings to dtschema.
> > This is conversion only so it includes properties with invalid prefixes
> > (s3fwrn5,en-gpios) which should be addressed later.
> >
> > Signed-off-by: Krzysztof Kozlowski <[email protected]>
> > ---
> > .../devicetree/bindings/net/nfc/s3fwrn5.txt | 25 --------
> > .../devicetree/bindings/net/nfc/s3fwrn5.yaml | 59 +++++++++++++++++++
>
> Please rename to samsung,s3fwrn5-i2c.yaml.
>
> > MAINTAINERS | 1 +
> > 3 files changed, 60 insertions(+), 25 deletions(-)
> > delete mode 100644 Documentation/devicetree/bindings/net/nfc/s3fwrn5.txt
> > create mode 100644 Documentation/devicetree/bindings/net/nfc/s3fwrn5.yaml
> >
> > diff --git a/Documentation/devicetree/bindings/net/nfc/s3fwrn5.txt b/Documentation/devicetree/bindings/net/nfc/s3fwrn5.txt
> > deleted file mode 100644
> > index f02f6fb7f81c..000000000000
> > --- a/Documentation/devicetree/bindings/net/nfc/s3fwrn5.txt
> > +++ /dev/null
> > @@ -1,25 +0,0 @@
> > -* Samsung S3FWRN5 NCI NFC Controller
> > -
> > -Required properties:
> > -- compatible: Should be "samsung,s3fwrn5-i2c".
> > -- reg: address on the bus
> > -- interrupts: GPIO interrupt to which the chip is connected
> > -- s3fwrn5,en-gpios: Output GPIO pin used for enabling/disabling the chip
> > -- s3fwrn5,fw-gpios: Output GPIO pin used to enter firmware mode and
> > - sleep/wakeup control
> > -
> > -Example:
> > -
> > -&hsi2c_4 {
> > - s3fwrn5@27 {
> > - compatible = "samsung,s3fwrn5-i2c";
> > -
> > - reg = <0x27>;
> > -
> > - interrupt-parent = <&gpa1>;
> > - interrupts = <3 0 0>;
> > -
> > - s3fwrn5,en-gpios = <&gpf1 4 0>;
> > - s3fwrn5,fw-gpios = <&gpj0 2 0>;
> > - };
> > -};
> > diff --git a/Documentation/devicetree/bindings/net/nfc/s3fwrn5.yaml b/Documentation/devicetree/bindings/net/nfc/s3fwrn5.yaml
> > new file mode 100644
> > index 000000000000..c22451dea350
> > --- /dev/null
> > +++ b/Documentation/devicetree/bindings/net/nfc/s3fwrn5.yaml
> > @@ -0,0 +1,59 @@
> > +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
> > +%YAML 1.2
> > +---
> > +$id: http://devicetree.org/schemas/net/nfc/s3fwrn5.yaml#
> > +$schema: http://devicetree.org/meta-schemas/core.yaml#
> > +
> > +title: Samsung S3FWRN5 NCI NFC Controller
> > +
> > +maintainers:
> > + - Krzysztof Kozlowski <[email protected]>
> > + - Krzysztof Opasiak <[email protected]>
> > +
> > +properties:
> > + compatible:
> > + const: samsung,s3fwrn5-i2c
> > +
> > + interrupts:
> > + maxItems: 1
> > +
> > + reg:
> > + maxItems: 1
> > +
> > + s3fwrn5,en-gpios:
> > + maxItems: 1
> > + description:
> > + Output GPIO pin used for enabling/disabling the chip
> > +
> > + s3fwrn5,fw-gpios:
> > + maxItems: 1
> > + description:
> > + Output GPIO pin used to enter firmware mode and sleep/wakeup control
> > +
> > +required:
> > + - compatible
> > + - interrupts
> > + - reg
> > + - s3fwrn5,en-gpios
> > + - s3fwrn5,fw-gpios
>
> additionalProperties: false
Sure, I'll fix both issues.
Best regards,
Krzysztof