| Message ID | 20190828135218.7307-1-linus.walleij@linaro.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | aef41a4d88ef11a04b29d9f2ffdfd46eb317d7d8 |
| Headers | show |
| Series | [1/2] ARM: dts: ux500: Fix up the thermal nodes | expand |
On 28/08/2019 15:52, Linus Walleij wrote: > The thermal driver for the DB8500 was never properly converted > to device tree, the node should definitely be activated for > all board variants so move this down into the main SoC > DTSI, and default on. > > Cc: Daniel Lezcano <daniel.lezcano@linaro.org> > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> > --- > arch/arm/boot/dts/ste-dbx5x0.dtsi | 22 +++++++++++++++++++++- > arch/arm/boot/dts/ste-snowball.dts | 29 ----------------------------- > 2 files changed, 21 insertions(+), 30 deletions(-) > > diff --git a/arch/arm/boot/dts/ste-dbx5x0.dtsi b/arch/arm/boot/dts/ste-dbx5x0.dtsi > index b1a31134f860..7953eea7c486 100644 > --- a/arch/arm/boot/dts/ste-dbx5x0.dtsi > +++ b/arch/arm/boot/dts/ste-dbx5x0.dtsi > @@ -505,10 +505,30 @@ > thermal@801573c0 { > compatible = "stericsson,db8500-thermal"; > reg = <0x801573c0 0x40>; > + interrupt-parent = <&prcmu>; > interrupts = <21 IRQ_TYPE_LEVEL_HIGH>, > <22 IRQ_TYPE_LEVEL_HIGH>; > interrupt-names = "IRQ_HOTMON_LOW", "IRQ_HOTMON_HIGH"; > - status = "disabled"; > + num-trips = <4>; > + > + trip0-temp = <70000>; > + trip0-type = "active"; > + trip0-cdev-num = <1>; > + trip0-cdev-name0 = "thermal-cpufreq-0"; > + > + trip1-temp = <75000>; > + trip1-type = "active"; > + trip1-cdev-num = <1>; > + trip1-cdev-name0 = "thermal-cpufreq-0"; > + > + trip2-temp = <80000>; > + trip2-type = "active"; > + trip2-cdev-num = <1>; > + trip2-cdev-name0 = "thermal-cpufreq-0"; > + > + trip3-temp = <85000>; > + trip3-type = "critical"; > + trip3-cdev-num = <0>; I think you can fold both patches, that would be clearer than moving and then removing. > }; > > db8500-prcmu-regulators { > diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts > index 3428290644ba..064e8abec954 100644 > --- a/arch/arm/boot/dts/ste-snowball.dts > +++ b/arch/arm/boot/dts/ste-snowball.dts > @@ -376,40 +376,11 @@ > pinctrl-0 = <&ssp0_snowball_mode>; > }; > > - cpufreq-cooling { > - status = "okay"; > - }; > - > prcmu@80157000 { > cpufreq { > status = "okay"; > }; > > - thermal@801573c0 { > - num-trips = <4>; > - > - trip0-temp = <70000>; > - trip0-type = "active"; > - trip0-cdev-num = <1>; > - trip0-cdev-name0 = "thermal-cpufreq-0"; > - > - trip1-temp = <75000>; > - trip1-type = "active"; > - trip1-cdev-num = <1>; > - trip1-cdev-name0 = "thermal-cpufreq-0"; > - > - trip2-temp = <80000>; > - trip2-type = "active"; > - trip2-cdev-num = <1>; > - trip2-cdev-name0 = "thermal-cpufreq-0"; > - > - trip3-temp = <85000>; > - trip3-type = "critical"; > - trip3-cdev-num = <0>; > - > - status = "okay"; > - }; > - > ab8500 { > ab8500-gpio { > /* >
diff --git a/arch/arm/boot/dts/ste-dbx5x0.dtsi b/arch/arm/boot/dts/ste-dbx5x0.dtsi index b1a31134f860..7953eea7c486 100644 --- a/arch/arm/boot/dts/ste-dbx5x0.dtsi +++ b/arch/arm/boot/dts/ste-dbx5x0.dtsi @@ -505,10 +505,30 @@ thermal@801573c0 { compatible = "stericsson,db8500-thermal"; reg = <0x801573c0 0x40>; + interrupt-parent = <&prcmu>; interrupts = <21 IRQ_TYPE_LEVEL_HIGH>, <22 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "IRQ_HOTMON_LOW", "IRQ_HOTMON_HIGH"; - status = "disabled"; + num-trips = <4>; + + trip0-temp = <70000>; + trip0-type = "active"; + trip0-cdev-num = <1>; + trip0-cdev-name0 = "thermal-cpufreq-0"; + + trip1-temp = <75000>; + trip1-type = "active"; + trip1-cdev-num = <1>; + trip1-cdev-name0 = "thermal-cpufreq-0"; + + trip2-temp = <80000>; + trip2-type = "active"; + trip2-cdev-num = <1>; + trip2-cdev-name0 = "thermal-cpufreq-0"; + + trip3-temp = <85000>; + trip3-type = "critical"; + trip3-cdev-num = <0>; }; db8500-prcmu-regulators { diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts index 3428290644ba..064e8abec954 100644 --- a/arch/arm/boot/dts/ste-snowball.dts +++ b/arch/arm/boot/dts/ste-snowball.dts @@ -376,40 +376,11 @@ pinctrl-0 = <&ssp0_snowball_mode>; }; - cpufreq-cooling { - status = "okay"; - }; - prcmu@80157000 { cpufreq { status = "okay"; }; - thermal@801573c0 { - num-trips = <4>; - - trip0-temp = <70000>; - trip0-type = "active"; - trip0-cdev-num = <1>; - trip0-cdev-name0 = "thermal-cpufreq-0"; - - trip1-temp = <75000>; - trip1-type = "active"; - trip1-cdev-num = <1>; - trip1-cdev-name0 = "thermal-cpufreq-0"; - - trip2-temp = <80000>; - trip2-type = "active"; - trip2-cdev-num = <1>; - trip2-cdev-name0 = "thermal-cpufreq-0"; - - trip3-temp = <85000>; - trip3-type = "critical"; - trip3-cdev-num = <0>; - - status = "okay"; - }; - ab8500 { ab8500-gpio { /*
The thermal driver for the DB8500 was never properly converted to device tree, the node should definitely be activated for all board variants so move this down into the main SoC DTSI, and default on. Cc: Daniel Lezcano <daniel.lezcano@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- arch/arm/boot/dts/ste-dbx5x0.dtsi | 22 +++++++++++++++++++++- arch/arm/boot/dts/ste-snowball.dts | 29 ----------------------------- 2 files changed, 21 insertions(+), 30 deletions(-)