On 3/17/24 11:10, Conor Dooley wrote:
> On Fri, Mar 15, 2024 at 08:20:25PM -0400, Sean Anderson wrote:
>> These bindings document the same hardware (just different minor
>> revisions). Remove the newer fsl,t1023-sfp.
>>
>> Fixes: aa1ed6047107 ("dt-bindings: nvmem: Add t1023-sfp efuse support")
>> Signed-off-by: Sean Anderson <sean.anderson@xxxxxxxxx>
>> ---
>>
>> .../bindings/nvmem/fsl,layerscape-sfp.yaml | 21 ++++++++++-
>> .../bindings/nvmem/fsl,t1023-sfp.yaml | 37 -------------------
>> 2 files changed, 19 insertions(+), 39 deletions(-)
>> delete mode 100644 Documentation/devicetree/bindings/nvmem/fsl,t1023-sfp.yaml
>>
>> diff --git a/Documentation/devicetree/bindings/nvmem/fsl,layerscape-sfp.yaml b/Documentation/devicetree/bindings/nvmem/fsl,layerscape-sfp.yaml
>> index 70fb2ad25103..8a54dd1328ea 100644
>> --- a/Documentation/devicetree/bindings/nvmem/fsl,layerscape-sfp.yaml
>> +++ b/Documentation/devicetree/bindings/nvmem/fsl,layerscape-sfp.yaml
>> @@ -19,6 +19,13 @@ allOf:
>> properties:
>> compatible:
>> oneOf:
>> + - description: Trust architecture 2.0 SFP
>> + items:
>> + enum:
>> + - fsl,t1023-sfp
>
>> + - fsl,t1040-sfp
>> + - fsl,t2080-sfp
>> + - fsl,t4240-sfp
>
> You should at least mention where these three compatibles came from,
> given they were not documented in t1023-sfp.yaml
They come from the existing DTSs for these processors. Will add this to
the commit message.
> Additionally, should
> they fall back to t1023-sfp? I see that there's already some dts files
> with these compatibles in them but seemingly no driver support as there
> is for the t1023-sfp.
I checked the reference manuals for these processors, and all of them use TA 2.0.
--Sean
>> - description: Trust architecture 2.1 SFP
>> items:
>> - const: fsl,ls1021a-sfp
>> @@ -45,8 +52,18 @@ properties:
>> required:
>> - compatible
>> - reg
>> - - clock-names
>> - - clocks
>> +
>> +if:
>> + properties:
>> + compatible:
>> + contains:
>> + enum:
>> + - fsl,ls1021a-sfp
>> + - fsl,ls1028a-sfp
>> +then:
>> + required:
>> + - clocks
>> + - clock-names
>>
>> unevaluatedProperties: false
>>
>> diff --git a/Documentation/devicetree/bindings/nvmem/fsl,t1023-sfp.yaml b/Documentation/devicetree/bindings/nvmem/fsl,t1023-sfp.yaml
>> deleted file mode 100644
>> index df826b40d8ca..000000000000
>> --- a/Documentation/devicetree/bindings/nvmem/fsl,t1023-sfp.yaml
>> +++ /dev/null
>> @@ -1,37 +0,0 @@
>> -# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
>> -%YAML 1.2
>> ----
>> -$id: http://devicetree.org/schemas/nvmem/fsl,t1023-sfp.yaml#
>> -$schema: http://devicetree.org/meta-schemas/core.yaml#
>> -
>> -title: NXP QorIQ eFuse support
>> -
>> -maintainers:
>> - - Richard Alpe <richard@xxxxxxxx>
>> -
>> -description:
>> - Read support for the eFuses (SFP) on NXP QorIQ series SoC's.
>> -
>> -allOf:
>> - - $ref: nvmem.yaml#
>> -
>> -properties:
>> - compatible:
>> - const: fsl,t1023-sfp
>> -
>> - reg:
>> - maxItems: 1
>> -
>> -required:
>> - - compatible
>> - - reg
>> -
>> -unevaluatedProperties: false
>> -
>> -examples:
>> - - |
>> - efuse@e8000 {
>> - compatible = "fsl,t1023-sfp";
>> - reg = <0xe8000 0x1000>;
>> - };
>> -...
>> --
>> 2.35.1.1320.gc452695387.dirty
>>
