[PATCH v2] dt-bindings: iio: rockchip: Fix 'oneOf' condition failed warning

[PATCH v2] dt-bindings: iio: rockchip: Fix 'oneOf' condition failed warning

[Shreeya Patel]

rk3588-saradc isn't compatible with the rk3399-saradc variant,
hence, fix the following dtbs_check warning for 'oneOf' condition
failure.

DTC_CHK arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtb
/home/shreeya/linux/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtb:
	saradc@fec10000: compatible: 'oneOf' conditional failed,
	one must be fixed:
	['rockchip,rk3588-saradc'] is too short
	'rockchip,saradc' was expected
	'rockchip,rk3066-tsadc' was expected
	'rockchip,rk3399-saradc' was expected

Fixes: 2daf2ae9793d ("dt-bindings: iio: adc: Add rockchip,rk3588-saradc string")
Signed-off-by: Shreeya Patel <shreeya.patel@collabora.com>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
---

Changes in v2
  - Improve commit message.
  - Add a Reviewed-by tag.

 Documentation/devicetree/bindings/iio/adc/rockchip-saradc.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/iio/adc/rockchip-saradc.yaml b/Documentation/devicetree/bindings/iio/adc/rockchip-saradc.yaml
index 11c27ea451c8..aa24b841393c 100644
--- a/Documentation/devicetree/bindings/iio/adc/rockchip-saradc.yaml
+++ b/Documentation/devicetree/bindings/iio/adc/rockchip-saradc.yaml
@@ -15,13 +15,13 @@ properties:
       - const: rockchip,saradc
       - const: rockchip,rk3066-tsadc
       - const: rockchip,rk3399-saradc
+      - const: rockchip,rk3588-saradc
       - items:
           - enum:
               - rockchip,px30-saradc
               - rockchip,rk3308-saradc
               - rockchip,rk3328-saradc
               - rockchip,rk3568-saradc
-              - rockchip,rk3588-saradc
               - rockchip,rv1108-saradc
               - rockchip,rv1126-saradc
           - const: rockchip,rk3399-saradc
-- 
2.30.2

Re: [PATCH v2] dt-bindings: iio: rockchip: Fix 'oneOf' condition failed warning

[Conor Dooley]

[-- Attachment #1: Type: text/plain, Size: 865 bytes --]

On Sat, Jun 10, 2023 at 08:06:01PM +0530, Shreeya Patel wrote:
> rk3588-saradc isn't compatible with the rk3399-saradc variant,
> hence, fix the following dtbs_check warning for 'oneOf' condition
> failure.
> 
> DTC_CHK arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtb
> /home/shreeya/linux/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtb:
> 	saradc@fec10000: compatible: 'oneOf' conditional failed,
> 	one must be fixed:
> 	['rockchip,rk3588-saradc'] is too short
> 	'rockchip,saradc' was expected
> 	'rockchip,rk3066-tsadc' was expected
> 	'rockchip,rk3399-saradc' was expected
> 
> Fixes: 2daf2ae9793d ("dt-bindings: iio: adc: Add rockchip,rk3588-saradc string")
> Signed-off-by: Shreeya Patel <shreeya.patel@collabora.com>
> Reviewed-by: Heiko Stuebner <heiko@sntech.de>

Acked-by: Conor Dooley <conor.dooley@microchip.com>

Cheers,
Conor.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: [PATCH v2] dt-bindings: iio: rockchip: Fix 'oneOf' condition failed warning

[Krzysztof Kozlowski]

On 10/06/2023 16:36, Shreeya Patel wrote:
> rk3588-saradc isn't compatible with the rk3399-saradc variant,
> hence, fix the following dtbs_check warning for 'oneOf' condition
> failure.
> 

Are you sure it isn't compatible? According to your driver it is and
this change is not enough.

Best regards,
Krzysztof

Re: [PATCH v2] dt-bindings: iio: rockchip: Fix 'oneOf' condition failed warning

[Sebastian Reichel]

[-- Attachment #1: Type: text/plain, Size: 684 bytes --]

Hi,

On Sat, Jun 10, 2023 at 06:30:57PM +0200, Krzysztof Kozlowski wrote:
> On 10/06/2023 16:36, Shreeya Patel wrote:
> > rk3588-saradc isn't compatible with the rk3399-saradc variant,
> > hence, fix the following dtbs_check warning for 'oneOf' condition
> > failure.
> 
> Are you sure it isn't compatible? According to your driver it is and
> this change is not enough.

The driver changes are still in the iio testing branch and not yet
in linux-next. RK3588 ADC is not compatible with previous
generations. It's trivial to see in Shreeya's driver patch:

https://lore.kernel.org/all/20230603185340.13838-3-shreeya.patel@collabora.com/

Greetings,

-- Sebastian

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH v2] dt-bindings: iio: rockchip: Fix 'oneOf' condition failed warning

[Krzysztof Kozlowski]

On 10/06/2023 19:11, Sebastian Reichel wrote:
> Hi,
> 
> On Sat, Jun 10, 2023 at 06:30:57PM +0200, Krzysztof Kozlowski wrote:
>> On 10/06/2023 16:36, Shreeya Patel wrote:
>>> rk3588-saradc isn't compatible with the rk3399-saradc variant,
>>> hence, fix the following dtbs_check warning for 'oneOf' condition
>>> failure.
>>
>> Are you sure it isn't compatible? According to your driver it is and
>> this change is not enough.
> 
> The driver changes are still in the iio testing branch and not yet
> in linux-next. RK3588 ADC is not compatible with previous
> generations. It's trivial to see in Shreeya's driver patch:
> 
> https://lore.kernel.org/all/20230603185340.13838-3-shreeya.patel@collabora.com/

I was checking the next. It's fine then.

Best regards,
Krzysztof

Re: [PATCH v2] dt-bindings: iio: rockchip: Fix 'oneOf' condition failed warning

[Jonathan Cameron]

On Sat, 10 Jun 2023 18:30:57 +0200
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote:

> On 10/06/2023 16:36, Shreeya Patel wrote:
> > rk3588-saradc isn't compatible with the rk3399-saradc variant,
> > hence, fix the following dtbs_check warning for 'oneOf' condition
> > failure.
> >   
> 
> Are you sure it isn't compatible? According to your driver it is and
> this change is not enough.

I'm not following.  the rk3588 has separate handling from the rk3399
Separate devices specific structure for instance
rk3588_saradc_data vs rk3399_saradc_data as provided as the match data for
the different compatibles..

Looks to be incompatible to me.

> 
> Best regards,
> Krzysztof
> 

Re: [PATCH v2] dt-bindings: iio: rockchip: Fix 'oneOf' condition failed warning

[Jonathan Cameron]

On Sat, 10 Jun 2023 19:34:23 +0200
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote:

> On 10/06/2023 19:11, Sebastian Reichel wrote:
> > Hi,
> > 
> > On Sat, Jun 10, 2023 at 06:30:57PM +0200, Krzysztof Kozlowski wrote:  
> >> On 10/06/2023 16:36, Shreeya Patel wrote:  
> >>> rk3588-saradc isn't compatible with the rk3399-saradc variant,
> >>> hence, fix the following dtbs_check warning for 'oneOf' condition
> >>> failure.  
> >>
> >> Are you sure it isn't compatible? According to your driver it is and
> >> this change is not enough.  
> > 
> > The driver changes are still in the iio testing branch and not yet
> > in linux-next. RK3588 ADC is not compatible with previous
> > generations. It's trivial to see in Shreeya's driver patch:
> > 
> > https://lore.kernel.org/all/20230603185340.13838-3-shreeya.patel@collabora.com/  
> 
> I was checking the next. It's fine then.
And I forgot I only pushed out for next to pick it up earlier today.
oops :)

Thanks and applied to the togreg branch of iio.git.

Thanks,

Jonathan

> 
> Best regards,
> Krzysztof
> 

Re: [PATCH v2] dt-bindings: iio: rockchip: Fix 'oneOf' condition failed warning

[AngeloGioacchino Del Regno]

Il 10/06/23 16:36, Shreeya Patel ha scritto:
> rk3588-saradc isn't compatible with the rk3399-saradc variant,
> hence, fix the following dtbs_check warning for 'oneOf' condition
> failure.
> 
> DTC_CHK arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtb
> /home/shreeya/linux/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtb:
> 	saradc@fec10000: compatible: 'oneOf' conditional failed,
> 	one must be fixed:
> 	['rockchip,rk3588-saradc'] is too short
> 	'rockchip,saradc' was expected
> 	'rockchip,rk3066-tsadc' was expected
> 	'rockchip,rk3399-saradc' was expected
> 
> Fixes: 2daf2ae9793d ("dt-bindings: iio: adc: Add rockchip,rk3588-saradc string")
> Signed-off-by: Shreeya Patel <shreeya.patel@collabora.com>
> Reviewed-by: Heiko Stuebner <heiko@sntech.de>

Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>