.../devicetree/bindings/mfd/sprd,sc2731.yaml | 12 ++------ .../bindings/nvmem/sprd,sc2731-efuse.yaml | 29 ------------------- 2 files changed, 2 insertions(+), 39 deletions(-)
Directly reference the sc2731-efuse bindings to simplify the schema.
Remove the duplicate example from the efuse bindings.
While at it, add the "pmic_adc" label that was missed during the
initial YAML conversion.
Signed-off-by: Stanislav Jakubek <stano.jakubek@gmail.com>
---
Changes in V4:
- rebase on next-20241216
- drop patch 1 (already applied)
- add the pmic_adc label that was initially missed
Changes in V3:
- new patch due to a missing dependency in the MFD tree
Link to V3: https://lore.kernel.org/lkml/cd8cc95b59c31418b174bba521dd2599a7929fda.1730709384.git.stano.jakubek@gmail.com/
Link to V2: https://lore.kernel.org/lkml/ZyExK01iprBHhGm6@standask-GA-A55M-S2HP/
Link to V1: https://lore.kernel.org/lkml/Zr3X1RoQs7ElTnlJ@standask-GA-A55M-S2HP/
.../devicetree/bindings/mfd/sprd,sc2731.yaml | 12 ++------
.../bindings/nvmem/sprd,sc2731-efuse.yaml | 29 -------------------
2 files changed, 2 insertions(+), 39 deletions(-)
diff --git a/Documentation/devicetree/bindings/mfd/sprd,sc2731.yaml b/Documentation/devicetree/bindings/mfd/sprd,sc2731.yaml
index 8beec7e8e4c6..b023e1ef8d3c 100644
--- a/Documentation/devicetree/bindings/mfd/sprd,sc2731.yaml
+++ b/Documentation/devicetree/bindings/mfd/sprd,sc2731.yaml
@@ -67,15 +67,7 @@ patternProperties:
"^efuse@[0-9a-f]+$":
type: object
- additionalProperties: true
- properties:
- compatible:
- enum:
- - sprd,sc2720-efuse
- - sprd,sc2721-efuse
- - sprd,sc2723-efuse
- - sprd,sc2730-efuse
- - sprd,sc2731-efuse
+ $ref: /schemas/nvmem/sprd,sc2731-efuse.yaml#
"^fuel-gauge@[0-9a-f]+$":
type: object
@@ -199,7 +191,7 @@ examples:
};
};
- adc@480 {
+ pmic_adc: adc@480 {
compatible = "sprd,sc2731-adc";
reg = <0x480>;
interrupt-parent = <&sc2731_pmic>;
diff --git a/Documentation/devicetree/bindings/nvmem/sprd,sc2731-efuse.yaml b/Documentation/devicetree/bindings/nvmem/sprd,sc2731-efuse.yaml
index dc25fe3d1841..8672bde24a9b 100644
--- a/Documentation/devicetree/bindings/nvmem/sprd,sc2731-efuse.yaml
+++ b/Documentation/devicetree/bindings/nvmem/sprd,sc2731-efuse.yaml
@@ -36,33 +36,4 @@ allOf:
- $ref: nvmem-deprecated-cells.yaml#
unevaluatedProperties: false
-
-examples:
- - |
- pmic {
- #address-cells = <1>;
- #size-cells = <0>;
-
- efuse@380 {
- compatible = "sprd,sc2731-efuse";
- reg = <0x380>;
- hwlocks = <&hwlock 12>;
- #address-cells = <1>;
- #size-cells = <1>;
-
- /* Data cells */
- fgu_calib: calib@6 {
- reg = <0x6 0x2>;
- bits = <0 9>;
- };
-
- adc_big_scale: calib@24 {
- reg = <0x24 0x2>;
- };
-
- adc_small_scale: calib@26 {
- reg = <0x26 0x2>;
- };
- };
- };
...
--
2.43.0
On Mon, 16 Dec 2024 11:13:24 +0100, Stanislav Jakubek wrote:
> Directly reference the sc2731-efuse bindings to simplify the schema.
> Remove the duplicate example from the efuse bindings.
> While at it, add the "pmic_adc" label that was missed during the
> initial YAML conversion.
>
>
Applied, thanks!
[1/1] dt-bindings: mfd: sprd,sc2731: reference sprd,sc2731-efuse bindings
commit: 81b82147e7114ed78c819d1157db45b5b848a7d6
--
Lee Jones [李琼斯]
On 2024/12/16 18:13, Stanislav Jakubek wrote: > Directly reference the sc2731-efuse bindings to simplify the schema. > Remove the duplicate example from the efuse bindings. > While at it, add the "pmic_adc" label that was missed during the > initial YAML conversion. > > Signed-off-by: Stanislav Jakubek <stano.jakubek@gmail.com> Thanks. LGTM. Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com>
On Mon, Dec 16, 2024 at 11:13:24AM +0100, Stanislav Jakubek wrote:
> Directly reference the sc2731-efuse bindings to simplify the schema.
> Remove the duplicate example from the efuse bindings.
> While at it, add the "pmic_adc" label that was missed during the
> initial YAML conversion.
>
> Signed-off-by: Stanislav Jakubek <stano.jakubek@gmail.com>
> ---
> Changes in V4:
> - rebase on next-20241216
> - drop patch 1 (already applied)
> - add the pmic_adc label that was initially missed
>
> Changes in V3:
> - new patch due to a missing dependency in the MFD tree
>
> Link to V3: https://lore.kernel.org/lkml/cd8cc95b59c31418b174bba521dd2599a7929fda.1730709384.git.stano.jakubek@gmail.com/
> Link to V2: https://lore.kernel.org/lkml/ZyExK01iprBHhGm6@standask-GA-A55M-S2HP/
> Link to V1: https://lore.kernel.org/lkml/Zr3X1RoQs7ElTnlJ@standask-GA-A55M-S2HP/
>
> .../devicetree/bindings/mfd/sprd,sc2731.yaml | 12 ++------
> .../bindings/nvmem/sprd,sc2731-efuse.yaml | 29 -------------------
> 2 files changed, 2 insertions(+), 39 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/mfd/sprd,sc2731.yaml b/Documentation/devicetree/bindings/mfd/sprd,sc2731.yaml
> index 8beec7e8e4c6..b023e1ef8d3c 100644
> --- a/Documentation/devicetree/bindings/mfd/sprd,sc2731.yaml
> +++ b/Documentation/devicetree/bindings/mfd/sprd,sc2731.yaml
> @@ -67,15 +67,7 @@ patternProperties:
>
> "^efuse@[0-9a-f]+$":
> type: object
> - additionalProperties: true
> - properties:
> - compatible:
> - enum:
> - - sprd,sc2720-efuse
> - - sprd,sc2721-efuse
> - - sprd,sc2723-efuse
> - - sprd,sc2730-efuse
> - - sprd,sc2731-efuse
> + $ref: /schemas/nvmem/sprd,sc2731-efuse.yaml#
>
> "^fuel-gauge@[0-9a-f]+$":
> type: object
> @@ -199,7 +191,7 @@ examples:
> };
> };
>
> - adc@480 {
> + pmic_adc: adc@480 {
I don't understand the point of this hunk, nothing ever references it.
Examples aren't supposed to contain unused labels.
On Mon, Dec 16, 2024 at 06:39:09PM +0000, Conor Dooley wrote:
> On Mon, Dec 16, 2024 at 11:13:24AM +0100, Stanislav Jakubek wrote:
> > Directly reference the sc2731-efuse bindings to simplify the schema.
> > Remove the duplicate example from the efuse bindings.
> > While at it, add the "pmic_adc" label that was missed during the
> > initial YAML conversion.
> >
> > Signed-off-by: Stanislav Jakubek <stano.jakubek@gmail.com>
> > ---
> > Changes in V4:
> > - rebase on next-20241216
> > - drop patch 1 (already applied)
> > - add the pmic_adc label that was initially missed
> >
> > Changes in V3:
> > - new patch due to a missing dependency in the MFD tree
> >
> > Link to V3: https://lore.kernel.org/lkml/cd8cc95b59c31418b174bba521dd2599a7929fda.1730709384.git.stano.jakubek@gmail.com/
> > Link to V2: https://lore.kernel.org/lkml/ZyExK01iprBHhGm6@standask-GA-A55M-S2HP/
> > Link to V1: https://lore.kernel.org/lkml/Zr3X1RoQs7ElTnlJ@standask-GA-A55M-S2HP/
> >
> > .../devicetree/bindings/mfd/sprd,sc2731.yaml | 12 ++------
> > .../bindings/nvmem/sprd,sc2731-efuse.yaml | 29 -------------------
> > 2 files changed, 2 insertions(+), 39 deletions(-)
> >
> > diff --git a/Documentation/devicetree/bindings/mfd/sprd,sc2731.yaml b/Documentation/devicetree/bindings/mfd/sprd,sc2731.yaml
> > index 8beec7e8e4c6..b023e1ef8d3c 100644
> > --- a/Documentation/devicetree/bindings/mfd/sprd,sc2731.yaml
> > +++ b/Documentation/devicetree/bindings/mfd/sprd,sc2731.yaml
> > @@ -67,15 +67,7 @@ patternProperties:
> >
> > "^efuse@[0-9a-f]+$":
> > type: object
> > - additionalProperties: true
> > - properties:
> > - compatible:
> > - enum:
> > - - sprd,sc2720-efuse
> > - - sprd,sc2721-efuse
> > - - sprd,sc2723-efuse
> > - - sprd,sc2730-efuse
> > - - sprd,sc2731-efuse
> > + $ref: /schemas/nvmem/sprd,sc2731-efuse.yaml#
> >
> > "^fuel-gauge@[0-9a-f]+$":
> > type: object
> > @@ -199,7 +191,7 @@ examples:
> > };
> > };
> >
> > - adc@480 {
> > + pmic_adc: adc@480 {
>
> I don't understand the point of this hunk, nothing ever references it.
> Examples aren't supposed to contain unused labels.
Hi Conor,
this label is used by the fuel-gauge io-channels in the example:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/devicetree/bindings/mfd/sprd,sc2731.yaml?h=v6.13-rc3#n219
Regards,
Stanislav
On Tue, Dec 17, 2024 at 08:43:30AM +0100, Stanislav Jakubek wrote:
> On Mon, Dec 16, 2024 at 06:39:09PM +0000, Conor Dooley wrote:
> > On Mon, Dec 16, 2024 at 11:13:24AM +0100, Stanislav Jakubek wrote:
> > > Directly reference the sc2731-efuse bindings to simplify the schema.
> > > Remove the duplicate example from the efuse bindings.
> > > While at it, add the "pmic_adc" label that was missed during the
> > > initial YAML conversion.
> > >
> > > Signed-off-by: Stanislav Jakubek <stano.jakubek@gmail.com>
> > > ---
> > > Changes in V4:
> > > - rebase on next-20241216
> > > - drop patch 1 (already applied)
> > > - add the pmic_adc label that was initially missed
> > >
> > > Changes in V3:
> > > - new patch due to a missing dependency in the MFD tree
> > >
> > > Link to V3: https://lore.kernel.org/lkml/cd8cc95b59c31418b174bba521dd2599a7929fda.1730709384.git.stano.jakubek@gmail.com/
> > > Link to V2: https://lore.kernel.org/lkml/ZyExK01iprBHhGm6@standask-GA-A55M-S2HP/
> > > Link to V1: https://lore.kernel.org/lkml/Zr3X1RoQs7ElTnlJ@standask-GA-A55M-S2HP/
> > >
> > > .../devicetree/bindings/mfd/sprd,sc2731.yaml | 12 ++------
> > > .../bindings/nvmem/sprd,sc2731-efuse.yaml | 29 -------------------
> > > 2 files changed, 2 insertions(+), 39 deletions(-)
> > >
> > > diff --git a/Documentation/devicetree/bindings/mfd/sprd,sc2731.yaml b/Documentation/devicetree/bindings/mfd/sprd,sc2731.yaml
> > > index 8beec7e8e4c6..b023e1ef8d3c 100644
> > > --- a/Documentation/devicetree/bindings/mfd/sprd,sc2731.yaml
> > > +++ b/Documentation/devicetree/bindings/mfd/sprd,sc2731.yaml
> > > @@ -67,15 +67,7 @@ patternProperties:
> > >
> > > "^efuse@[0-9a-f]+$":
> > > type: object
> > > - additionalProperties: true
> > > - properties:
> > > - compatible:
> > > - enum:
> > > - - sprd,sc2720-efuse
> > > - - sprd,sc2721-efuse
> > > - - sprd,sc2723-efuse
> > > - - sprd,sc2730-efuse
> > > - - sprd,sc2731-efuse
> > > + $ref: /schemas/nvmem/sprd,sc2731-efuse.yaml#
> > >
> > > "^fuel-gauge@[0-9a-f]+$":
> > > type: object
> > > @@ -199,7 +191,7 @@ examples:
> > > };
> > > };
> > >
> > > - adc@480 {
> > > + pmic_adc: adc@480 {
> >
> > I don't understand the point of this hunk, nothing ever references it.
> > Examples aren't supposed to contain unused labels.
>
> Hi Conor,
>
> this label is used by the fuel-gauge io-channels in the example:
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/devicetree/bindings/mfd/sprd,sc2731.yaml?h=v6.13-rc3#n219
Ah shit, my bad. I didn't realise all that was one example.
Acked-by: Conor Dooley <conor.dooley@microchip.com>
© 2016 - 2025 Red Hat, Inc.