There are two sensors, sensor0 for CPU, sensor1 for GPU.
Signed-off-by: Yangtao Li <[email protected]>
Tested-by: Corentin Labbe <[email protected]>
Tested-on: sun8i-r40-bananapi-m2-ultra
---
arch/arm/boot/dts/sun8i-r40.dtsi | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/arch/arm/boot/dts/sun8i-r40.dtsi b/arch/arm/boot/dts/sun8i-r40.dtsi
index 421dfbbfd7ee..8ccda5cb873f 100644
--- a/arch/arm/boot/dts/sun8i-r40.dtsi
+++ b/arch/arm/boot/dts/sun8i-r40.dtsi
@@ -46,6 +46,7 @@
#include <dt-bindings/clock/sun8i-r40-ccu.h>
#include <dt-bindings/reset/sun8i-r40-ccu.h>
#include <dt-bindings/reset/sun8i-de2.h>
+#include <dt-bindings/thermal/thermal.h>
/ {
#address-cells = <1>;
@@ -109,6 +110,22 @@
status = "disabled";
};
+ thermal-zones {
+ cpu_thermal: cpu0-thermal {
+ /* milliseconds */
+ polling-delay-passive = <0>;
+ polling-delay = <0>;
+ thermal-sensors = <&ths 0>;
+ };
+
+ gpu_thermal: gpu-thermal {
+ /* milliseconds */
+ polling-delay-passive = <0>;
+ polling-delay = <0>;
+ thermal-sensors = <&ths 1>;
+ };
+ };
+
soc {
compatible = "simple-bus";
#address-cells = <1>;
@@ -421,6 +438,17 @@
clocks = <&osc24M>;
};
+ ths: thermal-sensor@1c24c00 {
+ compatible = "allwinner,sun8i-r40-ths";
+ reg = <0x01c24c00 0x100>;
+ clocks = <&ccu CLK_BUS_THS>, <&ccu CLK_THS>;
+ clock-names = "bus", "mod";
+ interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
+ resets = <&ccu RST_BUS_THS>;
+ /* TODO: add nvmem-cells for calibration */
+ #thermal-sensor-cells = <1>;
+ };
+
uart0: serial@1c28000 {
compatible = "snps,dw-apb-uart";
reg = <0x01c28000 0x400>;
--
2.17.1
On Mon, Jan 06, 2020 at 05:46:39PM +0000, Yangtao Li wrote:
> There are two sensors, sensor0 for CPU, sensor1 for GPU.
>
> Signed-off-by: Yangtao Li <[email protected]>
> Tested-by: Corentin Labbe <[email protected]>
> Tested-on: sun8i-r40-bananapi-m2-ultra
As far as I know, tested-on is not documented anywhere (and isn't
really used either). I've removed it and applied, thanks!
Maxime
On Tue, Jan 7, 2020 at 3:58 PM Maxime Ripard <[email protected]> wrote:
>
> On Mon, Jan 06, 2020 at 05:46:39PM +0000, Yangtao Li wrote:
> > There are two sensors, sensor0 for CPU, sensor1 for GPU.
> >
> > Signed-off-by: Yangtao Li <[email protected]>
> > Tested-by: Corentin Labbe <[email protected]>
> > Tested-on: sun8i-r40-bananapi-m2-ultra
>
> As far as I know, tested-on is not documented anywhere (and isn't
> really used either). I've removed it and applied, thanks!
I normally add it as a comment following the Tested-by. Makes it
easier to track who tested what when patches touch multiple
boards.
ChenYu
On 07/01/2020 08:58, Maxime Ripard wrote:
> On Mon, Jan 06, 2020 at 05:46:39PM +0000, Yangtao Li wrote:
>> There are two sensors, sensor0 for CPU, sensor1 for GPU.
>>
>> Signed-off-by: Yangtao Li <[email protected]>
>> Tested-by: Corentin Labbe <[email protected]>
>> Tested-on: sun8i-r40-bananapi-m2-ultra
>
> As far as I know, tested-on is not documented anywhere (and isn't
> really used either). I've removed it and applied, thanks!
I think this patch should go through my tree as it refers to a commit in
my branch.
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
Hi Daniel,
On Thu, Jan 09, 2020 at 12:51:27PM +0100, Daniel Lezcano wrote:
> On 07/01/2020 08:58, Maxime Ripard wrote:
> > On Mon, Jan 06, 2020 at 05:46:39PM +0000, Yangtao Li wrote:
> >> There are two sensors, sensor0 for CPU, sensor1 for GPU.
> >>
> >> Signed-off-by: Yangtao Li <[email protected]>
> >> Tested-by: Corentin Labbe <[email protected]>
> >> Tested-on: sun8i-r40-bananapi-m2-ultra
> >
> > As far as I know, tested-on is not documented anywhere (and isn't
> > really used either). I've removed it and applied, thanks!
>
> I think this patch should go through my tree as it refers to a commit in
> my branch.
I'm not quite sure to get why. Even though that patch depends on the
one affecting the driver to be functional, it doesn't break anything
when merged through arm-soc, and similarly yours doesn't affect any
other tree if it's merged through your tree, so there's no dependency?
Maxime
On 09/01/2020 14:13, Maxime Ripard wrote:
> Hi Daniel,
>
> On Thu, Jan 09, 2020 at 12:51:27PM +0100, Daniel Lezcano wrote:
>> On 07/01/2020 08:58, Maxime Ripard wrote:
>>> On Mon, Jan 06, 2020 at 05:46:39PM +0000, Yangtao Li wrote:
>>>> There are two sensors, sensor0 for CPU, sensor1 for GPU.
>>>>
>>>> Signed-off-by: Yangtao Li <[email protected]>
>>>> Tested-by: Corentin Labbe <[email protected]>
>>>> Tested-on: sun8i-r40-bananapi-m2-ultra
>>>
>>> As far as I know, tested-on is not documented anywhere (and isn't
>>> really used either). I've removed it and applied, thanks!
>>
>> I think this patch should go through my tree as it refers to a commit in
>> my branch.
>
> I'm not quite sure to get why. Even though that patch depends on the
> one affecting the driver to be functional, it doesn't break anything
> when merged through arm-soc, and similarly yours doesn't affect any
> other tree if it's merged through your tree, so there's no dependency?
Sorry, I puzzled myself, I thought you meant you applied patch 1/2
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
HI Chen-Yu and Maxime,
Can you pick this up again?
Yangtao
On Fri, Jan 10, 2020 at 4:08 AM Daniel Lezcano
<[email protected]> wrote:
>
> On 09/01/2020 14:13, Maxime Ripard wrote:
> > Hi Daniel,
> >
> > On Thu, Jan 09, 2020 at 12:51:27PM +0100, Daniel Lezcano wrote:
> >> On 07/01/2020 08:58, Maxime Ripard wrote:
> >>> On Mon, Jan 06, 2020 at 05:46:39PM +0000, Yangtao Li wrote:
> >>>> There are two sensors, sensor0 for CPU, sensor1 for GPU.
> >>>>
> >>>> Signed-off-by: Yangtao Li <[email protected]>
> >>>> Tested-by: Corentin Labbe <[email protected]>
> >>>> Tested-on: sun8i-r40-bananapi-m2-ultra
> >>>
> >>> As far as I know, tested-on is not documented anywhere (and isn't
> >>> really used either). I've removed it and applied, thanks!
> >>
> >> I think this patch should go through my tree as it refers to a commit in
> >> my branch.
> >
> > I'm not quite sure to get why. Even though that patch depends on the
> > one affecting the driver to be functional, it doesn't break anything
> > when merged through arm-soc, and similarly yours doesn't affect any
> > other tree if it's merged through your tree, so there's no dependency?
>
> Sorry, I puzzled myself, I thought you meant you applied patch 1/2
>
>
> --
> <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
>
> Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
> <http://twitter.com/#!/linaroorg> Twitter |
> <http://www.linaro.org/linaro-blog/> Blog
>
Hi,
On Sun, Jan 26, 2020 at 09:01:01PM +0800, Frank Lee wrote:
> HI Chen-Yu and Maxime,
>
> Can you pick this up again?
Sorry, I'm not quite sure what happened to this patch... I've picked
it up for 5.7 (for real this time, hopefully).
Maxime