On Tue, May 23, 2023 at 05:44:02PM +0100, Conor Dooley wrote: > On Tue, May 23, 2023 at 03:49:04PM +0530, Varadarajan Narayanan wrote: > > On Thu, May 18, 2023 at 01:06:49PM +0200, Krzysztof Kozlowski wrote: > > > On 18/05/2023 11:05, Varadarajan Narayanan wrote: > > > > On Thu, May 18, 2023 at 09:09:12AM +0200, Krzysztof Kozlowski wrote: > > > >> On 18/05/2023 07:40, Varadarajan Narayanan wrote: > > > >>> On Wed, May 17, 2023 at 09:00:49AM +0200, Krzysztof Kozlowski wrote: > > > >>>> On 17/05/2023 07:57, Varadarajan Narayanan wrote: > > > > It's not true. The error you see is result because you removed something > > > you should not. I did not ask you to remove anything. So repeating - > > > "add new item". Adding is not "removal and adding". Adding is just "adding". > > > > See below for the changes that were tried and the corresponding errors. > > > > (1) No lines removed > > > > @@ -66,6 +66,7 @@ > > - description: v2 of TSENS with combined interrupt > > enum: > > - qcom,ipq8074-tsens > > + - qcom,ipq9574-tsens > > > > reg: > > items: > > > > dt_binding_check: No errors > > > > dtbs_check : > > arch/arm64/boot/dts/qcom/ipq9574-rdp433.dtb: thermal-sensor@4a9000: compatible: 'oneOf' conditional failed, one must be fixed: > > ['qcom,ipq9574-tsens', 'qcom,ipq8074-tsens'] is too long > > Which I figure you understand makes sense. > > > (2) No lines removed > > > > @@ -66,6 +66,8 @@ > > - description: v2 of TSENS with combined interrupt > > enum: > > - qcom,ipq8074-tsens > > + - qcom,ipq9574-tsens > > + - const: qcom,ipq8074-tsens > > > > reg: > > items: > > > > dt_binding_check: No errors > > > > dtbs_check : Gives errors for all the DTS files that have tsens-v0_1, tsens-v2, tsens-v1. Copy pasted a sample for each one of them > > arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dtb: /soc@0/thermal-sensor@4a9000: failed to match any schema with compatible: ['qcom,msm8916-tsens', 'qcom,tsens-v0_1'] > > arch/arm64/boot/dts/qcom/msm8953-xiaomi-tissot.dtb: /soc@0/thermal-sensor@4a9000: failed to match any schema with compatible: ['qcom,msm8953-tsens', 'qcom,tsens-v2'] > > arch/arm64/boot/dts/qcom/msm8956-sony-xperia-loire-suzu.dtb: /soc@0/thermal-sensor@4a9000: failed to match any schema with compatible: ['qcom,msm8956-tsens', 'qcom,tsens-v1'] > > I think you've missed an earlier error that points out the entire > binding is invalid. > > > (3) No lines removed > > @@ -19,6 +19,7 @@ > > properties: > > compatible: > > oneOf: > > + - const: qcom,ipq8074-tsens > > - description: msm8960 TSENS based > > items: > > - enum: > > @@ -66,6 +67,8 @@ > > - description: v2 of TSENS with combined interrupt > > enum: > > - qcom,ipq8074-tsens > > + - qcom,ipq9574-tsens > > + - const: qcom,ipq8074-tsens > > > > reg: > > items: > > > > dt_binding_check: Same as above > > > > dtbs_check : Same as above > > Ditto here. > > > (4) Change 8074 from enum to const > > @@ -19,6 +19,7 @@ > > properties: > > compatible: > > oneOf: > > + - const: qcom,ipq8074-tsens > > - description: msm8960 TSENS based > > items: > > - enum: > > @@ -64,8 +65,10 @@ > > - const: qcom,tsens-v2 > > > > - description: v2 of TSENS with combined interrupt > > - enum: > > - - qcom,ipq8074-tsens > > + items: > > + - enum: > > + - qcom,ipq9574-tsens > > + - const: qcom,ipq8074-tsens > > > > reg: > > items: > > > > dt_binding_check: No errors > > > > dtbs_check : No errors > > > > But (4) doesn't seem acceptable. Any other alternative to resolve this? > > It now has a "random" entry up at the top w/ no description, not > matching the existing style. Can you just fix that up & send a v(N+1) > so that the discussion can restart in a less confusing way? I am trying > to fill in for Krzysztof but I am struggling to follow the thread. Sure. Will post the next version. Thanks Varada
