lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 605/757] arm64: dts: qcom: msm8916: Remove one more thermal trip point unit name
    Date
    From: Stephan Gerhold <stephan@gerhold.net>

    [ Upstream commit e6859ae8603c5946b8f3ecbd9b4f02b72955b9d0 ]

    Commit fe2aff0c574d2 ("arm64: dts: qcom: msm8916: remove unit name for thermal trip points")
    removed the unit names for most of the thermal trip points defined
    in msm8916.dtsi, but missed to update the one for cpu0_1-thermal.

    So why wasn't this spotted by "make dtbs_check"? Apparently, the name
    of the thermal zone is already invalid: thermal-zones.yaml specifies
    a regex of ^[a-zA-Z][a-zA-Z0-9\\-]{1,12}-thermal$, so it is not allowed
    to contain underscores. Therefore the thermal zone was never verified
    using the DTB schema.

    After replacing the underscore in the thermal zone name, the warning
    shows up:

    apq8016-sbc.dt.yaml: thermal-zones: cpu0-1-thermal:trips: 'trip-point@0'
    does not match any of the regexes: '^[a-zA-Z][a-zA-Z0-9\\-_]{0,63}$', 'pinctrl-[0-9]+'

    Fix up the thermal zone names and remove the unit name for the trip point.

    Cc: Amit Kucheria <amit.kucheria@linaro.org>
    Fixes: fe2aff0c574d2 ("arm64: dts: qcom: msm8916: remove unit name for thermal trip points")
    Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
    Link: https://lore.kernel.org/r/20200915071221.72895-3-stephan@gerhold.net
    Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm64/boot/dts/qcom/msm8916.dtsi | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
    index 67cae5f9e47e6..c2fb9f7291c5e 100644
    --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
    +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
    @@ -229,14 +229,14 @@ pmu {
    };

    thermal-zones {
    - cpu0_1-thermal {
    + cpu0-1-thermal {
    polling-delay-passive = <250>;
    polling-delay = <1000>;

    thermal-sensors = <&tsens 5>;

    trips {
    - cpu0_1_alert0: trip-point@0 {
    + cpu0_1_alert0: trip-point0 {
    temperature = <75000>;
    hysteresis = <2000>;
    type = "passive";
    @@ -259,7 +259,7 @@ map0 {
    };
    };

    - cpu2_3-thermal {
    + cpu2-3-thermal {
    polling-delay-passive = <250>;
    polling-delay = <1000>;

    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 17:40    [W:4.071 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site