diff mbox series

arm64: dts: qcom: sm8250-elish-*: Fix panel compatibles

Message ID 20230412-topic-elish_compat-v1-1-4e03f95d5410@linaro.org
State New
Headers
Series arm64: dts: qcom: sm8250-elish-*: Fix panel compatibles |

Commit Message

Konrad Dybcio April 12, 2023, 7:47 p.m. UTC 
  The fallback compatible was missing, resulting in dtbs_check failing.
Fix it.

Fixes: 51c4c2bd6f31 ("arm64: dts: qcom: sm8250-xiaomi-elish-boe: Add mdss and dsi panel")
Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
---
foo b4 requires i put something here
---
 arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-boe.dts  | 2 +-
 arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-csot.dts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


---
base-commit: 7d8214bba44c1aa6a75921a09a691945d26a8d43
change-id: 20230412-topic-elish_compat-73c4511957a5

Best regards,

Comments

Marijn Suijten April 12, 2023, 8:20 p.m. UTC | #1 
On 2023-04-12 21:47:20, Konrad Dybcio wrote:
> The fallback compatible was missing, resulting in dtbs_check failing.
> Fix it.
> 
> Fixes: 51c4c2bd6f31 ("arm64: dts: qcom: sm8250-xiaomi-elish-boe: Add mdss and dsi panel")
> Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>

As usual: Krzysztof already sent these:

    https://lore.kernel.org/linux-arm-msm/20230408130809.52319-2-krzysztof.kozlowski@linaro.org/T/#u

> ---
> foo b4 requires i put something here

What?

> ---
>  arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-boe.dts  | 2 +-
>  arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-csot.dts | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-boe.dts b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-boe.dts
> index 8b2ae39950ff..de6101ddebe7 100644
> --- a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-boe.dts
> +++ b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-boe.dts
> @@ -13,6 +13,6 @@ / {
>  };
>  
>  &display_panel {
> -	compatible = "xiaomi,elish-boe-nt36523";
> +	compatible = "xiaomi,elish-boe-nt36523", "novatek,nt36523";
>  	status = "okay";
>  };
> diff --git a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-csot.dts b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-csot.dts
> index a4d5341495cf..4cffe9c703df 100644
> --- a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-csot.dts
> +++ b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-csot.dts
> @@ -13,6 +13,6 @@ / {
>  };
>  
>  &display_panel {
> -	compatible = "xiaomi,elish-csot-nt36523";
> +	compatible = "xiaomi,elish-csot-nt36523", "novatek,nt36523";
>  	status = "okay";
>  };
> 
> ---
> base-commit: 7d8214bba44c1aa6a75921a09a691945d26a8d43
> change-id: 20230412-topic-elish_compat-73c4511957a5
> 
> Best regards,
> -- 
> Konrad Dybcio <konrad.dybcio@linaro.org>
>
Konrad Dybcio April 12, 2023, 8:22 p.m. UTC | #2 
On 12.04.2023 22:20, Marijn Suijten wrote:
> On 2023-04-12 21:47:20, Konrad Dybcio wrote:
>> The fallback compatible was missing, resulting in dtbs_check failing.
>> Fix it.
>>
>> Fixes: 51c4c2bd6f31 ("arm64: dts: qcom: sm8250-xiaomi-elish-boe: Add mdss and dsi panel")
>> Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
> 
> As usual: Krzysztof already sent these:
> 
>     https://lore.kernel.org/linux-arm-msm/20230408130809.52319-2-krzysztof.kozlowski@linaro.org/T/#u
Right.

> 
>> ---
>> foo b4 requires i put something here
> 
> What?
git checkout linux-next/master
<craft a single patch>
b4 prep -e $(cat localversion-next| cut -c 2-)
b4 prep --edit-cover
/* you get a bunch of EDITMEs that b4 really insists you fill out */

Konrad
> 
>> ---
>>  arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-boe.dts  | 2 +-
>>  arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-csot.dts | 2 +-
>>  2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-boe.dts b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-boe.dts
>> index 8b2ae39950ff..de6101ddebe7 100644
>> --- a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-boe.dts
>> +++ b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-boe.dts
>> @@ -13,6 +13,6 @@ / {
>>  };
>>  
>>  &display_panel {
>> -	compatible = "xiaomi,elish-boe-nt36523";
>> +	compatible = "xiaomi,elish-boe-nt36523", "novatek,nt36523";
>>  	status = "okay";
>>  };
>> diff --git a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-csot.dts b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-csot.dts
>> index a4d5341495cf..4cffe9c703df 100644
>> --- a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-csot.dts
>> +++ b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-csot.dts
>> @@ -13,6 +13,6 @@ / {
>>  };
>>  
>>  &display_panel {
>> -	compatible = "xiaomi,elish-csot-nt36523";
>> +	compatible = "xiaomi,elish-csot-nt36523", "novatek,nt36523";
>>  	status = "okay";
>>  };
>>
>> ---
>> base-commit: 7d8214bba44c1aa6a75921a09a691945d26a8d43
>> change-id: 20230412-topic-elish_compat-73c4511957a5
>>
>> Best regards,
>> -- 
>> Konrad Dybcio <konrad.dybcio@linaro.org>
>>
Konrad Dybcio April 12, 2023, 8:23 p.m. UTC | #3 
On 12.04.2023 22:22, Konrad Dybcio wrote:
> 
> 
> On 12.04.2023 22:20, Marijn Suijten wrote:
>> On 2023-04-12 21:47:20, Konrad Dybcio wrote:
>>> The fallback compatible was missing, resulting in dtbs_check failing.
>>> Fix it.
>>>
>>> Fixes: 51c4c2bd6f31 ("arm64: dts: qcom: sm8250-xiaomi-elish-boe: Add mdss and dsi panel")
>>> Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
>>
>> As usual: Krzysztof already sent these:
>>
>>     https://lore.kernel.org/linux-arm-msm/20230408130809.52319-2-krzysztof.kozlowski@linaro.org/T/#u
> Right.
> 
>>
>>> ---
>>> foo b4 requires i put something here
>>
>> What?
> git checkout linux-next/master
> <craft a single patch>
git checkout -b branchname
> b4 prep -e $(cat localversion-next| cut -c 2-)
> b4 prep --edit-cover
> /* you get a bunch of EDITMEs that b4 really insists you fill out */
> 
Konrad

> Konrad
>>
>>> ---
>>>  arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-boe.dts  | 2 +-
>>>  arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-csot.dts | 2 +-
>>>  2 files changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-boe.dts b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-boe.dts
>>> index 8b2ae39950ff..de6101ddebe7 100644
>>> --- a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-boe.dts
>>> +++ b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-boe.dts
>>> @@ -13,6 +13,6 @@ / {
>>>  };
>>>  
>>>  &display_panel {
>>> -	compatible = "xiaomi,elish-boe-nt36523";
>>> +	compatible = "xiaomi,elish-boe-nt36523", "novatek,nt36523";
>>>  	status = "okay";
>>>  };
>>> diff --git a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-csot.dts b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-csot.dts
>>> index a4d5341495cf..4cffe9c703df 100644
>>> --- a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-csot.dts
>>> +++ b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-csot.dts
>>> @@ -13,6 +13,6 @@ / {
>>>  };
>>>  
>>>  &display_panel {
>>> -	compatible = "xiaomi,elish-csot-nt36523";
>>> +	compatible = "xiaomi,elish-csot-nt36523", "novatek,nt36523";
>>>  	status = "okay";
>>>  };
>>>
>>> ---
>>> base-commit: 7d8214bba44c1aa6a75921a09a691945d26a8d43
>>> change-id: 20230412-topic-elish_compat-73c4511957a5
>>>
>>> Best regards,
>>> -- 
>>> Konrad Dybcio <konrad.dybcio@linaro.org>
>>>
Marijn Suijten April 12, 2023, 8:28 p.m. UTC | #4 
On 2023-04-12 22:23:25, Konrad Dybcio wrote:
[..]
> >>> foo b4 requires i put something here
> >>
> >> What?
> > git checkout linux-next/master
> > <craft a single patch>
> git checkout -b branchname
> > b4 prep -e $(cat localversion-next| cut -c 2-)

I think that could just be:

    b4 prep -n branchname

(in favour of prep -e _and_ checkout -b)

Might also need to pass `-f $(cut -c 2- localversion-next)` to get the
forkpoint right though.

> > b4 prep --edit-cover
> > /* you get a bunch of EDITMEs that b4 really insists you fill out */

And what if you remove the line entirely?

- Marijn
Konrad Dybcio April 12, 2023, 8:29 p.m. UTC | #5 
On 12.04.2023 22:28, Marijn Suijten wrote:
> On 2023-04-12 22:23:25, Konrad Dybcio wrote:
> [..]
>>>>> foo b4 requires i put something here
>>>>
>>>> What?
>>> git checkout linux-next/master
>>> <craft a single patch>
>> git checkout -b branchname
>>> b4 prep -e $(cat localversion-next| cut -c 2-)
> 
> I think that could just be:
> 
>     b4 prep -n branchname
> 
> (in favour of prep -e _and_ checkout -b)
Maybe. I have reverse-i-search + muscle memory for the more bloated
approach though..

> 
> Might also need to pass `-f $(cut -c 2- localversion-next)` to get the
> forkpoint right though.
> 
>>> b4 prep --edit-cover
>>> /* you get a bunch of EDITMEs that b4 really insists you fill out */
> 
> And what if you remove the line entirely?
I just tried that after replying to you, on the Edo venus patch..
Apparently works as well..

Konrad
> 
> - Marijn
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-boe.dts b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-boe.dts
index 8b2ae39950ff..de6101ddebe7 100644
--- a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-boe.dts
+++ b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-boe.dts
@@ -13,6 +13,6 @@  / {
 };
 
 &display_panel {
-	compatible = "xiaomi,elish-boe-nt36523";
+	compatible = "xiaomi,elish-boe-nt36523", "novatek,nt36523";
 	status = "okay";
 };
diff --git a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-csot.dts b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-csot.dts
index a4d5341495cf..4cffe9c703df 100644
--- a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-csot.dts
+++ b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-csot.dts
@@ -13,6 +13,6 @@  / {
 };
 
 &display_panel {
-	compatible = "xiaomi,elish-csot-nt36523";
+	compatible = "xiaomi,elish-csot-nt36523", "novatek,nt36523";
 	status = "okay";
 };