| Message ID | 20230401220810.3563708-4-dmitry.baryshkov@linaro.org (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | arm64: dts: qcom: remove duplication in PMIC declarations | expand |
On 02/04/2023 00:07, Dmitry Baryshkov wrote: > Following the commit c0ee8e0ba5cc ("arm64: dts: qcom: pmk8350: Use the > correct PON compatible") and commit f46ef374e0dc ("arm64: dts: qcom: > pmk8350: Specify PBS register for PON") use "qcom,pmk8350-pon" compat > string and add RBS region to the PON device. > > Fixes: ccd3517faf18 ("arm64: dts: qcom: sc8280xp: Add reference device") There is no compatible qcom,pmk8350-pon documented at ccd3517faf18, so backporting it there is incorrect. qcom,pmk8350-pon is neither in v5.19 nor in v6.0. Best regards, Krzysztof
On Sun, 2 Apr 2023 at 12:42, Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote: > > On 02/04/2023 00:07, Dmitry Baryshkov wrote: > > Following the commit c0ee8e0ba5cc ("arm64: dts: qcom: pmk8350: Use the > > correct PON compatible") and commit f46ef374e0dc ("arm64: dts: qcom: > > pmk8350: Specify PBS register for PON") use "qcom,pmk8350-pon" compat > > string and add RBS region to the PON device. > > > > Fixes: ccd3517faf18 ("arm64: dts: qcom: sc8280xp: Add reference device") > > There is no compatible qcom,pmk8350-pon documented at ccd3517faf18, so > backporting it there is incorrect. qcom,pmk8350-pon is neither in v5.19 > nor in v6.0. Well, according to Documentation/process/submitting-patches.rst, Fixes tag is about noting that there was an issue fixed in the commit. The mentioned commit has an issue, as the device should have a second region. I did not intend to have this patch backported (no Cc stable). If I were, I could have also added a Cc stable # 5.19.x 03fccdc76dce.
On 02/04/2023 12:25, Dmitry Baryshkov wrote: > On Sun, 2 Apr 2023 at 12:42, Krzysztof Kozlowski > <krzysztof.kozlowski@linaro.org> wrote: >> >> On 02/04/2023 00:07, Dmitry Baryshkov wrote: >>> Following the commit c0ee8e0ba5cc ("arm64: dts: qcom: pmk8350: Use the >>> correct PON compatible") and commit f46ef374e0dc ("arm64: dts: qcom: >>> pmk8350: Specify PBS register for PON") use "qcom,pmk8350-pon" compat >>> string and add RBS region to the PON device. >>> >>> Fixes: ccd3517faf18 ("arm64: dts: qcom: sc8280xp: Add reference device") >> >> There is no compatible qcom,pmk8350-pon documented at ccd3517faf18, so >> backporting it there is incorrect. qcom,pmk8350-pon is neither in v5.19 >> nor in v6.0. > > Well, according to Documentation/process/submitting-patches.rst, Fixes > tag is about noting that there was an issue fixed in the commit. The > mentioned commit has an issue, as the device should have a second Depends. If device was working in some limited way with old compatible and one region, there is nothing to fix maybe. It was just incomplete. If second region is needed for the work, then only that commit should be marked as fix. Changing compatible is not a fix of that submission because at the time, the compatible was correct. That time in Git history, the "qcom,pmk8350-pon" was not correct. > region. I did not intend to have this patch backported (no Cc stable). > If I were, I could have also added a Cc stable # 5.19.x 03fccdc76dce. AUTOSEL will backport it anyway, if you do not mention otherwise. Best regards, Krzysztof
On 02/04/2023 13:32, Krzysztof Kozlowski wrote: > On 02/04/2023 12:25, Dmitry Baryshkov wrote: >> On Sun, 2 Apr 2023 at 12:42, Krzysztof Kozlowski >> <krzysztof.kozlowski@linaro.org> wrote: >>> >>> On 02/04/2023 00:07, Dmitry Baryshkov wrote: >>>> Following the commit c0ee8e0ba5cc ("arm64: dts: qcom: pmk8350: Use the >>>> correct PON compatible") and commit f46ef374e0dc ("arm64: dts: qcom: >>>> pmk8350: Specify PBS register for PON") use "qcom,pmk8350-pon" compat >>>> string and add RBS region to the PON device. >>>> >>>> Fixes: ccd3517faf18 ("arm64: dts: qcom: sc8280xp: Add reference device") >>> >>> There is no compatible qcom,pmk8350-pon documented at ccd3517faf18, so >>> backporting it there is incorrect. qcom,pmk8350-pon is neither in v5.19 >>> nor in v6.0. >> >> Well, according to Documentation/process/submitting-patches.rst, Fixes >> tag is about noting that there was an issue fixed in the commit. The >> mentioned commit has an issue, as the device should have a second > > Depends. If device was working in some limited way with old compatible > and one region, there is nothing to fix maybe. It was just incomplete. > > If second region is needed for the work, then only that commit should be > marked as fix. Changing compatible is not a fix of that submission > because at the time, the compatible was correct. That time in Git > history, the "qcom,pmk8350-pon" was not correct. Ack, so we have to backport the schema too. > >> region. I did not intend to have this patch backported (no Cc stable). >> If I were, I could have also added a Cc stable # 5.19.x 03fccdc76dce. > > AUTOSEL will backport it anyway, if you do not mention otherwise. Is there a way to influence AUTOSEL to make it also pick up another commit? > > Best regards, > Krzysztof >
On 02/04/2023 13:03, Dmitry Baryshkov wrote: > >> >>> region. I did not intend to have this patch backported (no Cc stable). >>> If I were, I could have also added a Cc stable # 5.19.x 03fccdc76dce. >> >> AUTOSEL will backport it anyway, if you do not mention otherwise. > > Is there a way to influence AUTOSEL to make it also pick up another commit? Only via usual stable kernel patch rules/syntax. Best regards, Krzysztof
On Sun, Apr 02, 2023 at 01:07:51AM +0300, Dmitry Baryshkov wrote: > Following the commit c0ee8e0ba5cc ("arm64: dts: qcom: pmk8350: Use the > correct PON compatible") and commit f46ef374e0dc ("arm64: dts: qcom: > pmk8350: Specify PBS register for PON") use "qcom,pmk8350-pon" compat > string and add RBS region to the PON device. > > Fixes: ccd3517faf18 ("arm64: dts: qcom: sc8280xp: Add reference device") > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> I already sent a fix for this last Monday: https://lore.kernel.org/all/20230327122948.4323-1-johan+linaro@kernel.org/ > --- > arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi > index c35e7f6bd657..a3c7369f9594 100644 > --- a/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi > +++ b/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi > @@ -59,8 +59,8 @@ pmk8280: pmic@0 { > #size-cells = <0>; > > pmk8280_pon: pon@1300 { > - compatible = "qcom,pm8998-pon"; > - reg = <0x1300>; > + compatible = "qcom,pmk8350-pon"; > + reg = <0x1300>, <0x800>; This is missing 'reg-names'. > > pmk8280_pon_pwrkey: pwrkey { > compatible = "qcom,pmk8350-pwrkey"; Johan
On 2.04.2023 13:12, Krzysztof Kozlowski wrote: > On 02/04/2023 13:03, Dmitry Baryshkov wrote: >> >>> >>>> region. I did not intend to have this patch backported (no Cc stable). >>>> If I were, I could have also added a Cc stable # 5.19.x 03fccdc76dce. >>> >>> AUTOSEL will backport it anyway, if you do not mention otherwise. >> >> Is there a way to influence AUTOSEL to make it also pick up another commit? > > Only via usual stable kernel patch rules/syntax. Additionally, some patches submitted via Option 1 may have additional patch prerequisites which can be cherry-picked. This can be specified in the following format in the sign-off area: Cc: <stable@vger.kernel.org> # 3.3.x: a1f84a3: sched: Check for idle Cc: <stable@vger.kernel.org> # 3.3.x: 1b9508f: sched: Rate-limit newidle Cc: <stable@vger.kernel.org> # 3.3.x: fd21073: sched: Fix affinity logic Cc: <stable@vger.kernel.org> # 3.3.x Signed-off-by: Ingo Molnar <mingo@elte.hu> https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html Konrad > > Best regards, > Krzysztof >
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi index c35e7f6bd657..a3c7369f9594 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi +++ b/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi @@ -59,8 +59,8 @@ pmk8280: pmic@0 { #size-cells = <0>; pmk8280_pon: pon@1300 { - compatible = "qcom,pm8998-pon"; - reg = <0x1300>; + compatible = "qcom,pmk8350-pon"; + reg = <0x1300>, <0x800>; pmk8280_pon_pwrkey: pwrkey { compatible = "qcom,pmk8350-pwrkey";
Following the commit c0ee8e0ba5cc ("arm64: dts: qcom: pmk8350: Use the correct PON compatible") and commit f46ef374e0dc ("arm64: dts: qcom: pmk8350: Specify PBS register for PON") use "qcom,pmk8350-pon" compat string and add RBS region to the PON device. Fixes: ccd3517faf18 ("arm64: dts: qcom: sc8280xp: Add reference device") Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)