On Thu, May 27, 2021 at 03:33:27PM -0500, Rob Herring wrote: > On Wed, May 26, 2021 at 07:28:06PM +0100, Sudeep Holla wrote: > > Convert/merge the existing text format SCPI binding additions for > > amlogic,scpi into the common arm,scpi json scheme. > > > > Couple of things to note: > > "amlogic,meson-gxbb-scpi" is always used with "arm,scpi-pre-1.0" > > hence no need for separate "arm,scpi-pre-1.0" standalone entry and > > "amlogic,meson-gxbb-scpi-sensors" is used always with "arm,scpi-sensors" > > > > Cc: Rob Herring <robh+dt@xxxxxxxxxx> > > Cc: Kevin Hilman <khilman@xxxxxxxxxxxx> > > Cc: Neil Armstrong <narmstrong@xxxxxxxxxxxx> > > Cc: Jerome Brunet <jbrunet@xxxxxxxxxxxx> > > Signed-off-by: Sudeep Holla <sudeep.holla@xxxxxxx> > > --- > > .../devicetree/bindings/arm/amlogic,scpi.txt | 15 --------------- > > .../devicetree/bindings/firmware/arm,scpi.yaml | 4 ++++ > > 2 files changed, 4 insertions(+), 15 deletions(-) > > delete mode 100644 Documentation/devicetree/bindings/arm/amlogic,scpi.txt > > > > diff --git a/Documentation/devicetree/bindings/arm/amlogic,scpi.txt b/Documentation/devicetree/bindings/arm/amlogic,scpi.txt > > deleted file mode 100644 > > index ebfe302fb747..000000000000 > > --- a/Documentation/devicetree/bindings/arm/amlogic,scpi.txt > > +++ /dev/null > > @@ -1,15 +0,0 @@ > > -System Control and Power Interface (SCPI) Message Protocol > > -(in addition to the standard binding in [0]) > > ----------------------------------------------------------- > > -Required properties > > - > > -- compatible : should be "amlogic,meson-gxbb-scpi" > > - > > -Sensor bindings for the sensors based on SCPI Message Protocol > > --------------------------------------------------------------- > > -SCPI provides an API to access the various sensors on the SoC. > > - > > -Required properties: > > -- compatible : should be "amlogic,meson-gxbb-scpi-sensors". > > - > > -[0] Documentation/devicetree/bindings/arm/arm,scpi.txt > > diff --git a/Documentation/devicetree/bindings/firmware/arm,scpi.yaml b/Documentation/devicetree/bindings/firmware/arm,scpi.yaml > > index 9c115e9c1536..d1179a4ea4e9 100644 > > --- a/Documentation/devicetree/bindings/firmware/arm,scpi.yaml > > +++ b/Documentation/devicetree/bindings/firmware/arm,scpi.yaml > > @@ -34,6 +34,7 @@ description: | > > to SCPI v1.0 > > items: > > - const: arm,scpi-pre-1.0 > > + - const: amlogic,meson-gxbb-scpi > > This says that compatible should be: "arm,scpi-pre-1.0", "amlogic,meson-gxbb-scpi" > > The order would be wrong and you lost supporting 'arm,scpi-pre-1.0' by > itself. You want an enum here if it is either one or another items list > if it is 2 entries. > Ah right, I checked about the order and then forgot to update. The idea when I wrote this was not to support arm,scpi-pre-1.0 by itself but recent found some other user of SCPI binding. I better keep the support though it is not in upstream DTS. -- Regards, Sudeep
