2022-06-06 21:46:01

by Conor Dooley

[permalink] [raw]
Subject: [PATCH v3 0/4] clear riscv dtbs_check errors

From: Conor Dooley <[email protected]>

Hey,
Couple conversions from txt to yaml here with the intent of fixing the
the dtbs_check warnings for riscv when building with "defconfig".
Atul Khare already sent patches for the gpio-line-names & cache-sets
(which went awol) and will clear the remaining two errors.

Apologies for sending v3 so quick on the heels of v2, but I realised
I screwed up copy paste in the i2c clock-frequency description & wanted
to rectify that.

Thanks,
Conor.

Changes from v2:
- ocores: remove part of clock-frequency description that was added by accident
while copy pasting as a template...
- ocores: remove the enum (added in v2) for clock-frequency since that
limitation was incorrectly copy pasted
- ocores: drop #{size,address}-cells
- mmc-spi-slot: use an array rather than a matrix for voltage-ranges

Changes from v1:
- squashed the maintainers changes
- dlg: added da9063 changes that landed in 5.19 (dlg,use-sw-pm)
- dlg: use absolute paths to schemas & unevaluatedProperties: false
- dlg: added vendor prefix to filename
- ocores: dropped "dummy" devices
- ocores: added vendor name to filename
- ocores: use enum for compatibles
- ocores: add enum for clock-frequency
- ocores: add reg-shift default
- ocores: reorder properties in examples
- mmc-spi-slot: use common gpio defines
- mmc-spi-slot: add ref to peripherl schema
- mmc-spi-slot: removed unneeded quotes, fixed a line length & s/spi/SPI

Conor Dooley (4):
dt-bindings: mmc: convert mmc-spi-slot to yaml
dt-bindings: i2c: convert ocores binding to yaml
dt-bindings: mfd: convert da9063 to yaml
riscv: dts: sifive: "fix" pmic watchdog node name

.../devicetree/bindings/i2c/i2c-ocores.txt | 78 -----------
.../bindings/i2c/opencores,i2c-ocores.yaml | 113 +++++++++++++++
.../devicetree/bindings/mfd/da9063.txt | 114 ---------------
.../devicetree/bindings/mfd/dlg,da9063.yaml | 132 ++++++++++++++++++
.../devicetree/bindings/mmc/mmc-spi-slot.txt | 29 ----
.../devicetree/bindings/mmc/mmc-spi-slot.yaml | 77 ++++++++++
.../devicetree/bindings/trivial-devices.yaml | 2 -
MAINTAINERS | 3 +-
.../boot/dts/sifive/hifive-unmatched-a00.dts | 2 +-
9 files changed, 325 insertions(+), 225 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-ocores.txt
create mode 100644 Documentation/devicetree/bindings/i2c/opencores,i2c-ocores.yaml
delete mode 100644 Documentation/devicetree/bindings/mfd/da9063.txt
create mode 100644 Documentation/devicetree/bindings/mfd/dlg,da9063.yaml
delete mode 100644 Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt
create mode 100644 Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml


base-commit: f2906aa863381afb0015a9eb7fefad885d4e5a56
--
2.36.1


2022-06-06 23:12:44

by Conor Dooley

[permalink] [raw]
Subject: [PATCH v3 2/4] dt-bindings: i2c: convert ocores binding to yaml

From: Conor Dooley <[email protected]>

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

Reviewed-by: Rob Herring <[email protected]>
Signed-off-by: Conor Dooley <[email protected]>
---
.../devicetree/bindings/i2c/i2c-ocores.txt | 78 ------------
.../bindings/i2c/opencores,i2c-ocores.yaml | 113 ++++++++++++++++++
MAINTAINERS | 2 +-
3 files changed, 114 insertions(+), 79 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-ocores.txt
create mode 100644 Documentation/devicetree/bindings/i2c/opencores,i2c-ocores.yaml

diff --git a/Documentation/devicetree/bindings/i2c/i2c-ocores.txt b/Documentation/devicetree/bindings/i2c/i2c-ocores.txt
deleted file mode 100644
index a37c9455b244..000000000000
--- a/Documentation/devicetree/bindings/i2c/i2c-ocores.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-Device tree configuration for i2c-ocores
-
-Required properties:
-- compatible : "opencores,i2c-ocores"
- "aeroflexgaisler,i2cmst"
- "sifive,fu540-c000-i2c", "sifive,i2c0"
- For Opencore based I2C IP block reimplemented in
- FU540-C000 SoC.
- "sifive,fu740-c000-i2c", "sifive,i2c0"
- For Opencore based I2C IP block reimplemented in
- FU740-C000 SoC.
- Please refer to sifive-blocks-ip-versioning.txt for
- additional details.
-- reg : bus address start and address range size of device
-- clocks : handle to the controller clock; see the note below.
- Mutually exclusive with opencores,ip-clock-frequency
-- opencores,ip-clock-frequency: frequency of the controller clock in Hz;
- see the note below. Mutually exclusive with clocks
-- #address-cells : should be <1>
-- #size-cells : should be <0>
-
-Optional properties:
-- interrupts : interrupt number.
-- clock-frequency : frequency of bus clock in Hz; see the note below.
- Defaults to 100 KHz when the property is not specified
-- reg-shift : device register offsets are shifted by this value
-- reg-io-width : io register width in bytes (1, 2 or 4)
-- regstep : deprecated, use reg-shift above
-
-Note
-clock-frequency property is meant to control the bus frequency for i2c bus
-drivers, but it was incorrectly used to specify i2c controller input clock
-frequency. So the following rules are set to fix this situation:
-- if clock-frequency is present and neither opencores,ip-clock-frequency nor
- clocks are, then clock-frequency specifies i2c controller clock frequency.
- This is to keep backwards compatibility with setups using old DTB. i2c bus
- frequency is fixed at 100 KHz.
-- if clocks is present it specifies i2c controller clock. clock-frequency
- property specifies i2c bus frequency.
-- if opencores,ip-clock-frequency is present it specifies i2c controller
- clock frequency. clock-frequency property specifies i2c bus frequency.
-
-Examples:
-
- i2c0: ocores@a0000000 {
- #address-cells = <1>;
- #size-cells = <0>;
- compatible = "opencores,i2c-ocores";
- reg = <0xa0000000 0x8>;
- interrupts = <10>;
- opencores,ip-clock-frequency = <20000000>;
-
- reg-shift = <0>; /* 8 bit registers */
- reg-io-width = <1>; /* 8 bit read/write */
-
- dummy@60 {
- compatible = "dummy";
- reg = <0x60>;
- };
- };
-or
- i2c0: ocores@a0000000 {
- #address-cells = <1>;
- #size-cells = <0>;
- compatible = "opencores,i2c-ocores";
- reg = <0xa0000000 0x8>;
- interrupts = <10>;
- clocks = <&osc>;
- clock-frequency = <400000>; /* i2c bus frequency 400 KHz */
-
- reg-shift = <0>; /* 8 bit registers */
- reg-io-width = <1>; /* 8 bit read/write */
-
- dummy@60 {
- compatible = "dummy";
- reg = <0x60>;
- };
- };
diff --git a/Documentation/devicetree/bindings/i2c/opencores,i2c-ocores.yaml b/Documentation/devicetree/bindings/i2c/opencores,i2c-ocores.yaml
new file mode 100644
index 000000000000..85d9efb743ee
--- /dev/null
+++ b/Documentation/devicetree/bindings/i2c/opencores,i2c-ocores.yaml
@@ -0,0 +1,113 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/i2c/opencores,i2c-ocores.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: OpenCores I2C controller
+
+maintainers:
+ - Peter Korsgaard <[email protected]>
+ - Andrew Lunn <[email protected]>
+
+allOf:
+ - $ref: /schemas/i2c/i2c-controller.yaml#
+
+properties:
+ compatible:
+ oneOf:
+ - items:
+ - enum:
+ - sifive,fu740-c000-i2c # Opencore based IP block FU740-C000 SoC
+ - sifive,fu540-c000-i2c # Opencore based IP block FU540-C000 SoC
+ - const: sifive,i2c0
+ - enum:
+ - opencores,i2c-ocores
+ - aeroflexgaisler,i2cmst
+
+ reg:
+ maxItems: 1
+
+ interrupts:
+ maxItems: 1
+
+ clocks:
+ maxItems: 1
+
+ clock-frequency:
+ description: |
+ clock-frequency property is meant to control the bus frequency for i2c bus
+ drivers, but it was incorrectly used to specify i2c controller input clock
+ frequency. So the following rules are set to fix this situation:
+ - if clock-frequency is present and neither opencores,ip-clock-frequency nor
+ clocks are, then clock-frequency specifies i2c controller clock frequency.
+ This is to keep backwards compatibility with setups using old DTB. i2c bus
+ frequency is fixed at 100 KHz.
+ - if clocks is present it specifies i2c controller clock. clock-frequency
+ property specifies i2c bus frequency.
+ - if opencores,ip-clock-frequency is present it specifies i2c controller
+ clock frequency. clock-frequency property specifies i2c bus frequency.
+ default: 100000
+
+ reg-io-width:
+ description: |
+ io register width in bytes
+ enum: [1, 2, 4]
+
+ reg-shift:
+ description: |
+ device register offsets are shifted by this value
+ default: 0
+
+ regstep:
+ description: |
+ deprecated, use reg-shift above
+ deprecated: true
+
+ opencores,ip-clock-frequency:
+ $ref: /schemas/types.yaml#/definitions/uint32
+ description: |
+ Frequency of the controller clock in Hz. Mutually exclusive with clocks.
+ See the note above.
+
+required:
+ - compatible
+ - reg
+ - "#address-cells"
+ - "#size-cells"
+
+oneOf:
+ - required:
+ - opencores,ip-clock-frequency
+ - required:
+ - clocks
+
+unevaluatedProperties: false
+
+examples:
+ - |
+ i2c@a0000000 {
+ compatible = "opencores,i2c-ocores";
+ reg = <0xa0000000 0x8>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ interrupts = <10>;
+ opencores,ip-clock-frequency = <20000000>;
+
+ reg-shift = <0>; /* 8 bit registers */
+ reg-io-width = <1>; /* 8 bit read/write */
+ };
+
+ i2c@b0000000 {
+ compatible = "opencores,i2c-ocores";
+ reg = <0xa0000000 0x8>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ interrupts = <10>;
+ clocks = <&osc>;
+ clock-frequency = <400000>; /* i2c bus frequency 400 KHz */
+
+ reg-shift = <0>; /* 8 bit registers */
+ reg-io-width = <1>; /* 8 bit read/write */
+ };
+...
diff --git a/MAINTAINERS b/MAINTAINERS
index a6d3bd9d2a8d..cfaf02fc9191 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -14869,7 +14869,7 @@ M: Peter Korsgaard <[email protected]>
M: Andrew Lunn <[email protected]>
L: [email protected]
S: Maintained
-F: Documentation/devicetree/bindings/i2c/i2c-ocores.txt
+F: Documentation/devicetree/bindings/i2c/i2c-ocores.yaml
F: Documentation/i2c/busses/i2c-ocores.rst
F: drivers/i2c/busses/i2c-ocores.c
F: include/linux/platform_data/i2c-ocores.h
--
2.36.1

2022-06-07 02:06:36

by Conor Dooley

[permalink] [raw]
Subject: [PATCH v3 1/4] dt-bindings: mmc: convert mmc-spi-slot to yaml

From: Conor Dooley <[email protected]>

Convert the mmc-spi-slot text based binding doc to yaml,
with the side effect of cleaning up some of the riscv
dtbs_check warnings.

Reviewed-by: Rob Herring <[email protected]>
Signed-off-by: Conor Dooley <[email protected]>
---
.../devicetree/bindings/mmc/mmc-spi-slot.txt | 29 -------
.../devicetree/bindings/mmc/mmc-spi-slot.yaml | 77 +++++++++++++++++++
2 files changed, 77 insertions(+), 29 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt
create mode 100644 Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml

diff --git a/Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt b/Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt
deleted file mode 100644
index 5e74db69f581..000000000000
--- a/Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-MMC/SD/SDIO slot directly connected to a SPI bus
-
-This file documents differences between the core properties described
-by mmc.txt and the properties used by the mmc_spi driver.
-
-Required properties:
-- spi-max-frequency : maximum frequency for this device (Hz).
-
-Optional properties:
-- voltage-ranges : two cells are required, first cell specifies minimum
- slot voltage (mV), second cell specifies maximum slot voltage (mV).
- Several ranges could be specified. If not provided, 3.2v..3.4v is assumed.
-- gpios : may specify GPIOs in this order: Card-Detect GPIO,
- Write-Protect GPIO. Note that this does not follow the
- binding from mmc.txt, for historical reasons.
-
-Example:
-
- mmc-slot@0 {
- compatible = "fsl,mpc8323rdb-mmc-slot",
- "mmc-spi-slot";
- reg = <0>;
- gpios = <&qe_pio_d 14 1
- &qe_pio_d 15 0>;
- voltage-ranges = <3300 3300>;
- spi-max-frequency = <50000000>;
- interrupts = <42>;
- interrupt-parent = <&PIC>;
- };
diff --git a/Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml b/Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml
new file mode 100644
index 000000000000..c45b91099325
--- /dev/null
+++ b/Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml
@@ -0,0 +1,77 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/mmc/mmc-spi-slot.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: MMC/SD/SDIO slot directly connected to a SPI bus
+
+maintainers:
+ - Ulf Hansson <[email protected]>
+
+allOf:
+ - $ref: "mmc-controller.yaml"
+ - $ref: /schemas/spi/spi-peripheral-props.yaml
+
+description: |
+ The extra properties used by an mmc connected via SPI.
+
+properties:
+ compatible:
+ const: mmc-spi-slot
+
+ reg:
+ maxItems: 1
+
+ spi-max-frequency: true
+
+ interrupts:
+ maxItems: 1
+
+ voltage-ranges:
+ $ref: /schemas/types.yaml#/definitions/uint32-array
+ description: |
+ Two cells are required, first cell specifies minimum slot voltage (mV),
+ second cell specifies maximum slot voltage (mV).
+ items:
+ - description: |
+ value for minimum slot voltage in mV
+ default: 3200
+ - description: |
+ value for maximum slot voltage in mV
+ default: 3400
+
+ gpios:
+ description: |
+ For historical reasons, this does not follow the generic mmc-controller
+ binding.
+ minItems: 1
+ items:
+ - description: Card-Detect GPIO
+ - description: Write-Protect GPIO
+
+required:
+ - compatible
+ - reg
+ - spi-max-frequency
+
+unevaluatedProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/gpio/gpio.h>
+ spi {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ mmc@0 {
+ compatible = "mmc-spi-slot";
+ reg = <0>;
+ gpios = <&gpio 14 GPIO_ACTIVE_LOW>, <&gpio 15 GPIO_ACTIVE_HIGH>;
+ voltage-ranges = <3300 3300>;
+ spi-max-frequency = <50000000>;
+ interrupts = <42>;
+ interrupt-parent = <&PIC>;
+ };
+ };
+
+...
--
2.36.1

2022-06-07 10:39:04

by Conor Dooley

[permalink] [raw]
Subject: [PATCH v3 4/4] riscv: dts: sifive: "fix" pmic watchdog node name

From: Conor Dooley <[email protected]>

After converting the pmic watchdog binding to yaml, dtbs_check complains
that the node name doesn't match the binding. "Fix" it.

Reviewed-by: Krzysztof Kozlowski <[email protected]>
Signed-off-by: Conor Dooley <[email protected]>
---
arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts b/arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts
index c4ed9efdff03..1f386b07a832 100644
--- a/arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts
+++ b/arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts
@@ -90,7 +90,7 @@ rtc {
compatible = "dlg,da9063-rtc";
};

- wdt {
+ watchdog {
compatible = "dlg,da9063-watchdog";
};

--
2.36.1

2022-06-07 11:42:02

by Ulf Hansson

[permalink] [raw]
Subject: Re: [PATCH v3 1/4] dt-bindings: mmc: convert mmc-spi-slot to yaml

On Mon, 6 Jun 2022 at 22:14, Conor Dooley <[email protected]> wrote:
>
> From: Conor Dooley <[email protected]>
>
> Convert the mmc-spi-slot text based binding doc to yaml,
> with the side effect of cleaning up some of the riscv
> dtbs_check warnings.
>
> Reviewed-by: Rob Herring <[email protected]>
> Signed-off-by: Conor Dooley <[email protected]>

Applied for next, thanks!

Kind regards
Uffe


> ---
> .../devicetree/bindings/mmc/mmc-spi-slot.txt | 29 -------
> .../devicetree/bindings/mmc/mmc-spi-slot.yaml | 77 +++++++++++++++++++
> 2 files changed, 77 insertions(+), 29 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt
> create mode 100644 Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml
>
> diff --git a/Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt b/Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt
> deleted file mode 100644
> index 5e74db69f581..000000000000
> --- a/Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -MMC/SD/SDIO slot directly connected to a SPI bus
> -
> -This file documents differences between the core properties described
> -by mmc.txt and the properties used by the mmc_spi driver.
> -
> -Required properties:
> -- spi-max-frequency : maximum frequency for this device (Hz).
> -
> -Optional properties:
> -- voltage-ranges : two cells are required, first cell specifies minimum
> - slot voltage (mV), second cell specifies maximum slot voltage (mV).
> - Several ranges could be specified. If not provided, 3.2v..3.4v is assumed.
> -- gpios : may specify GPIOs in this order: Card-Detect GPIO,
> - Write-Protect GPIO. Note that this does not follow the
> - binding from mmc.txt, for historical reasons.
> -
> -Example:
> -
> - mmc-slot@0 {
> - compatible = "fsl,mpc8323rdb-mmc-slot",
> - "mmc-spi-slot";
> - reg = <0>;
> - gpios = <&qe_pio_d 14 1
> - &qe_pio_d 15 0>;
> - voltage-ranges = <3300 3300>;
> - spi-max-frequency = <50000000>;
> - interrupts = <42>;
> - interrupt-parent = <&PIC>;
> - };
> diff --git a/Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml b/Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml
> new file mode 100644
> index 000000000000..c45b91099325
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml
> @@ -0,0 +1,77 @@
> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/mmc/mmc-spi-slot.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: MMC/SD/SDIO slot directly connected to a SPI bus
> +
> +maintainers:
> + - Ulf Hansson <[email protected]>
> +
> +allOf:
> + - $ref: "mmc-controller.yaml"
> + - $ref: /schemas/spi/spi-peripheral-props.yaml
> +
> +description: |
> + The extra properties used by an mmc connected via SPI.
> +
> +properties:
> + compatible:
> + const: mmc-spi-slot
> +
> + reg:
> + maxItems: 1
> +
> + spi-max-frequency: true
> +
> + interrupts:
> + maxItems: 1
> +
> + voltage-ranges:
> + $ref: /schemas/types.yaml#/definitions/uint32-array
> + description: |
> + Two cells are required, first cell specifies minimum slot voltage (mV),
> + second cell specifies maximum slot voltage (mV).
> + items:
> + - description: |
> + value for minimum slot voltage in mV
> + default: 3200
> + - description: |
> + value for maximum slot voltage in mV
> + default: 3400
> +
> + gpios:
> + description: |
> + For historical reasons, this does not follow the generic mmc-controller
> + binding.
> + minItems: 1
> + items:
> + - description: Card-Detect GPIO
> + - description: Write-Protect GPIO
> +
> +required:
> + - compatible
> + - reg
> + - spi-max-frequency
> +
> +unevaluatedProperties: false
> +
> +examples:
> + - |
> + #include <dt-bindings/gpio/gpio.h>
> + spi {
> + #address-cells = <1>;
> + #size-cells = <0>;
> + mmc@0 {
> + compatible = "mmc-spi-slot";
> + reg = <0>;
> + gpios = <&gpio 14 GPIO_ACTIVE_LOW>, <&gpio 15 GPIO_ACTIVE_HIGH>;
> + voltage-ranges = <3300 3300>;
> + spi-max-frequency = <50000000>;
> + interrupts = <42>;
> + interrupt-parent = <&PIC>;
> + };
> + };
> +
> +...
> --
> 2.36.1
>

2022-06-08 20:06:41

by Wolfram Sang

[permalink] [raw]
Subject: Re: [PATCH v3 2/4] dt-bindings: i2c: convert ocores binding to yaml

On Mon, Jun 06, 2022 at 09:13:42PM +0100, Conor Dooley wrote:
> From: Conor Dooley <[email protected]>
>
> Convert the open cores i2c controller binding from text to yaml.
>
> Reviewed-by: Rob Herring <[email protected]>
> Signed-off-by: Conor Dooley <[email protected]>

Applied to for-next, thanks!


Attachments:
(No filename) (330.00 B)
signature.asc (849.00 B)
Download all attachments

2022-06-13 17:22:13

by Heiko Stübner

[permalink] [raw]
Subject: Re: [PATCH v3 4/4] riscv: dts: sifive: "fix" pmic watchdog node name

Am Montag, 13. Juni 2022, 15:33:49 CEST schrieb [email protected]:
>
> On 06/06/2022 21:13, Conor Dooley wrote:
> > From: Conor Dooley <[email protected]>
> >
> > After converting the pmic watchdog binding to yaml, dtbs_check complains
> > that the node name doesn't match the binding. "Fix" it.
>
> Hey Palmer,
> The three dt-binding changes were accepted - do I need to poke SiFive to
> ack the dts change or are you fine just taking it?

I don't think a node-name has relevance to vendor decisions ;-) .

Looking at bindings/watchdog/watchdog.yaml we clearly see that
the node name is always watchdog or watchdog@foo, so this change
is clearly correct.

Reviewed-by: Heiko Stuebner <[email protected]>


> Thanks,
> Conor.
>
> >
> > Reviewed-by: Krzysztof Kozlowski <[email protected]>
> > Signed-off-by: Conor Dooley <[email protected]>
> > ---
> > arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts b/arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts
> > index c4ed9efdff03..1f386b07a832 100644
> > --- a/arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts
> > +++ b/arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts
> > @@ -90,7 +90,7 @@ rtc {
> > compatible = "dlg,da9063-rtc";
> > };
> >
> > - wdt {
> > + watchdog {
> > compatible = "dlg,da9063-watchdog";
> > };
> >
> _______________________________________________
> linux-riscv mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/linux-riscv
>




2022-06-13 17:55:31

by Conor Dooley

[permalink] [raw]
Subject: Re: [PATCH v3 4/4] riscv: dts: sifive: "fix" pmic watchdog node name


On 06/06/2022 21:13, Conor Dooley wrote:
> From: Conor Dooley <[email protected]>
>
> After converting the pmic watchdog binding to yaml, dtbs_check complains
> that the node name doesn't match the binding. "Fix" it.

Hey Palmer,
The three dt-binding changes were accepted - do I need to poke SiFive to
ack the dts change or are you fine just taking it?
Thanks,
Conor.

>
> Reviewed-by: Krzysztof Kozlowski <[email protected]>
> Signed-off-by: Conor Dooley <[email protected]>
> ---
> arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts b/arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts
> index c4ed9efdff03..1f386b07a832 100644
> --- a/arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts
> +++ b/arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts
> @@ -90,7 +90,7 @@ rtc {
> compatible = "dlg,da9063-rtc";
> };
>
> - wdt {
> + watchdog {
> compatible = "dlg,da9063-watchdog";
> };
>

2022-06-27 16:00:30

by Conor Dooley

[permalink] [raw]
Subject: Re: [PATCH v3 4/4] riscv: dts: sifive: "fix" pmic watchdog node name

A ping and an offer:

Palmer, do you want me to take the random dt cleanups through
my tree & save you the hassle of following along with them?

Thanks,
Conor.

On 13/06/2022 15:05, Heiko Stübner wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>
> Am Montag, 13. Juni 2022, 15:33:49 CEST schrieb [email protected]:
>>
>> On 06/06/2022 21:13, Conor Dooley wrote:
>>> From: Conor Dooley <[email protected]>
>>>
>>> After converting the pmic watchdog binding to yaml, dtbs_check complains
>>> that the node name doesn't match the binding. "Fix" it.
>>
>> Hey Palmer,
>> The three dt-binding changes were accepted - do I need to poke SiFive to
>> ack the dts change or are you fine just taking it?
>
> I don't think a node-name has relevance to vendor decisions ;-) .
>
> Looking at bindings/watchdog/watchdog.yaml we clearly see that
> the node name is always watchdog or watchdog@foo, so this change
> is clearly correct.
>
> Reviewed-by: Heiko Stuebner <[email protected]>
>
>
>> Thanks,
>> Conor.
>>
>>>
>>> Reviewed-by: Krzysztof Kozlowski <[email protected]>
>>> Signed-off-by: Conor Dooley <[email protected]>
>>> ---
>>> arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts b/arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts
>>> index c4ed9efdff03..1f386b07a832 100644
>>> --- a/arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts
>>> +++ b/arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts
>>> @@ -90,7 +90,7 @@ rtc {
>>> compatible = "dlg,da9063-rtc";
>>> };
>>>
>>> - wdt {
>>> + watchdog {
>>> compatible = "dlg,da9063-watchdog";
>>> };
>>>
>> _______________________________________________
>> linux-riscv mailing list
>> [email protected]
>> http://lists.infradead.org/mailman/listinfo/linux-riscv
>>
>
>
>
>

2022-07-04 16:17:37

by Conor Dooley

[permalink] [raw]
Subject: Re: [PATCH v3 4/4] riscv: dts: sifive: "fix" pmic watchdog node name

On 27/06/2022 16:58, [email protected] wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>
> A ping and an offer:
>
> Palmer, do you want me to take the random dt cleanups through
> my tree & save you the hassle of following along with them?

Since you declined that offer & nothing's been heard from the
SiFive side since - I think this should also be good to take
for 5.20. The bindings etc have already been applied.
Thanks,
Conor.

>
> Thanks,
> Conor.
>
> On 13/06/2022 15:05, Heiko Stübner wrote:
>> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>>
>> Am Montag, 13. Juni 2022, 15:33:49 CEST schrieb [email protected]:
>>>
>>> On 06/06/2022 21:13, Conor Dooley wrote:
>>>> From: Conor Dooley <[email protected]>
>>>>
>>>> After converting the pmic watchdog binding to yaml, dtbs_check complains
>>>> that the node name doesn't match the binding. "Fix" it.
>>>
>>> Hey Palmer,
>>> The three dt-binding changes were accepted - do I need to poke SiFive to
>>> ack the dts change or are you fine just taking it?
>>
>> I don't think a node-name has relevance to vendor decisions ;-) .
>>
>> Looking at bindings/watchdog/watchdog.yaml we clearly see that
>> the node name is always watchdog or watchdog@foo, so this change
>> is clearly correct.
>>
>> Reviewed-by: Heiko Stuebner <[email protected]>
>>
>>
>>> Thanks,
>>> Conor.
>>>
>>>>
>>>> Reviewed-by: Krzysztof Kozlowski <[email protected]>
>>>> Signed-off-by: Conor Dooley <[email protected]>
>>>> ---
>>>> arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts | 2 +-
>>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts b/arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts
>>>> index c4ed9efdff03..1f386b07a832 100644
>>>> --- a/arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts
>>>> +++ b/arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts
>>>> @@ -90,7 +90,7 @@ rtc {
>>>> compatible = "dlg,da9063-rtc";
>>>> };
>>>>
>>>> - wdt {
>>>> + watchdog {
>>>> compatible = "dlg,da9063-watchdog";
>>>> };
>>>>
>>> _______________________________________________
>>> linux-riscv mailing list
>>> [email protected]
>>> http://lists.infradead.org/mailman/listinfo/linux-riscv
>>>
>>
>>
>>
>>
>
> _______________________________________________
> linux-riscv mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/linux-riscv

2022-07-14 22:13:13

by Palmer Dabbelt

[permalink] [raw]
Subject: Re: [PATCH v3 4/4] riscv: dts: sifive: "fix" pmic watchdog node name

On Mon, 06 Jun 2022 13:13:44 PDT (-0700), [email protected] wrote:
> From: Conor Dooley <[email protected]>
>
> After converting the pmic watchdog binding to yaml, dtbs_check complains
> that the node name doesn't match the binding. "Fix" it.
>
> Reviewed-by: Krzysztof Kozlowski <[email protected]>
> Signed-off-by: Conor Dooley <[email protected]>
> ---
> arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts b/arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts
> index c4ed9efdff03..1f386b07a832 100644
> --- a/arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts
> +++ b/arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts
> @@ -90,7 +90,7 @@ rtc {
> compatible = "dlg,da9063-rtc";
> };
>
> - wdt {
> + watchdog {
> compatible = "dlg,da9063-watchdog";
> };

Thanks, this is on for-next.