| Message ID | 1481167706-44234-1-git-send-email-hongtao.jia@nxp.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Dec 08, 2016 at 11:28:25AM +0800, Jia Hongtao wrote: > Also add nodes and properties for thermal management support. > > Signed-off-by: Jia Hongtao <hongtao.jia@nxp.com> "arm64: dts: ls1046a: ..." for subject prefix please. Also, since we have ls1046a in prefix, the 'for LS1046A' is not needed. > --- > arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 79 ++++++++++++++++++++++++++ > 1 file changed, 79 insertions(+) > > diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi > index 38806ca..40604e9 100644 > --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi > +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi > @@ -45,6 +45,8 @@ > */ > > #include <dt-bindings/interrupt-controller/arm-gic.h> > +#include <dt-bindings/thermal/thermal.h> > + Unneeded newline. > > / { > compatible = "fsl,ls1046a"; > @@ -67,6 +69,7 @@ > clocks = <&clockgen 1 0>; > next-level-cache = <&l2>; > cpu-idle-states = <&CPU_PH20>; > + #cooling-cells = <2>; > }; > > cpu1: cpu@1 { > @@ -279,6 +282,82 @@ > clocks = <&sysclk>; > }; > > + tmu: tmu@1f00000 { > + compatible = "fsl,qoriq-tmu"; > + reg = <0x0 0x1f00000 0x0 0x10000>; > + interrupts = <0 33 0x4>; > + fsl,tmu-range = <0xb0000 0x9002a 0x6004c 0x30062>; > + fsl,tmu-calibration = <0x00000000 0x00000026 > + 0x00000001 0x0000002d > + 0x00000002 0x00000032 > + 0x00000003 0x00000039 > + 0x00000004 0x0000003f > + 0x00000005 0x00000046 > + 0x00000006 0x0000004d > + 0x00000007 0x00000054 > + 0x00000008 0x0000005a > + 0x00000009 0x00000061 > + 0x0000000a 0x0000006a > + 0x0000000b 0x00000071 > + Instead of a newline, can we have a single line comment here to tell how these calibration data is grouped? > + 0x00010000 0x00000025 > + 0x00010001 0x0000002c > + 0x00010002 0x00000035 > + 0x00010003 0x0000003d > + 0x00010004 0x00000045 > + 0x00010005 0x0000004e > + 0x00010006 0x00000057 > + 0x00010007 0x00000061 > + 0x00010008 0x0000006b > + 0x00010009 0x00000076 > + > + 0x00020000 0x00000029 > + 0x00020001 0x00000033 > + 0x00020002 0x0000003d > + 0x00020003 0x00000049 > + 0x00020004 0x00000056 > + 0x00020005 0x00000061 > + 0x00020006 0x0000006d > + > + 0x00030000 0x00000021 > + 0x00030001 0x0000002a > + 0x00030002 0x0000003c > + 0x00030003 0x0000004e>; > + big-endian; > + #thermal-sensor-cells = <1>; > + }; > + > + thermal-zones { > + cpu_thermal: cpu-thermal { > + polling-delay-passive = <1000>; > + polling-delay = <5000>; > + We usually do not have newline between properties but nodes, or between property list and child node. > + thermal-sensors = <&tmu 3>; > + > + trips { > + cpu_alert: cpu-alert { > + temperature = <85000>; > + hysteresis = <2000>; > + type = "passive"; > + }; Have a newline here. Shawn > + cpu_crit: cpu-crit { > + temperature = <95000>; > + hysteresis = <2000>; > + type = "critical"; > + }; > + }; > + > + cooling-maps { > + map0 { > + trip = <&cpu_alert>; > + cooling-device = > + <&cpu0 THERMAL_NO_LIMIT > + THERMAL_NO_LIMIT>; > + }; > + }; > + }; > + }; > + > dspi: dspi@2100000 { > compatible = "fsl,ls1021a-v1.0-dspi"; > #address-cells = <1>; > -- > 2.1.0.27.g96db324 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Add Yuantian who is the owner of this patch set since next week. > -----Original Message----- > From: Shawn Guo [mailto:shawnguo@kernel.org] > Sent: Monday, January 02, 2017 2:25 PM > To: Troy Jia <hongtao.jia@nxp.com> > Cc: rui.zhang@intel.com; edubezval@gmail.com; robh+dt@kernel.org; Scott Wood > <scott.wood@nxp.com>; devicetree@vger.kernel.org; linux- > kernel@vger.kernel.org; linux-arm-kernel@lists.infradead.org > Subject: Re: [PATCH 1/2] arm64:dt:ls1046a: Add TMU device tree support for > LS1046A > > On Thu, Dec 08, 2016 at 11:28:25AM +0800, Jia Hongtao wrote: > > Also add nodes and properties for thermal management support. > > > > Signed-off-by: Jia Hongtao <hongtao.jia@nxp.com> > > "arm64: dts: ls1046a: ..." for subject prefix please. Also, since we have ls1046a in > prefix, the 'for LS1046A' is not needed. Thanks. I will fix it. > > > --- > > arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 79 > > ++++++++++++++++++++++++++ > > 1 file changed, 79 insertions(+) > > > > diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi > > b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi > > index 38806ca..40604e9 100644 > > --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi > > +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi > > @@ -45,6 +45,8 @@ > > */ > > > > #include <dt-bindings/interrupt-controller/arm-gic.h> > > +#include <dt-bindings/thermal/thermal.h> > > + > > Unneeded newline. Got it. > > > > > / { > > compatible = "fsl,ls1046a"; > > @@ -67,6 +69,7 @@ > > clocks = <&clockgen 1 0>; > > next-level-cache = <&l2>; > > cpu-idle-states = <&CPU_PH20>; > > + #cooling-cells = <2>; > > }; > > > > cpu1: cpu@1 { > > @@ -279,6 +282,82 @@ > > clocks = <&sysclk>; > > }; > > > > + tmu: tmu@1f00000 { > > + compatible = "fsl,qoriq-tmu"; > > + reg = <0x0 0x1f00000 0x0 0x10000>; > > + interrupts = <0 33 0x4>; > > + fsl,tmu-range = <0xb0000 0x9002a 0x6004c 0x30062>; > > + fsl,tmu-calibration = <0x00000000 0x00000026 > > + 0x00000001 0x0000002d > > + 0x00000002 0x00000032 > > + 0x00000003 0x00000039 > > + 0x00000004 0x0000003f > > + 0x00000005 0x00000046 > > + 0x00000006 0x0000004d > > + 0x00000007 0x00000054 > > + 0x00000008 0x0000005a > > + 0x00000009 0x00000061 > > + 0x0000000a 0x0000006a > > + 0x0000000b 0x00000071 > > + > > Instead of a newline, can we have a single line comment here to tell how these > calibration data is grouped? Each group represent one temperature range. It's a good idea to add comment here. Could I just add one comment like below to clarify all four groups? /* Each calibration data group represent one temperature range. There are four ranges in total */ > > > + 0x00010000 0x00000025 > > + 0x00010001 0x0000002c > > + 0x00010002 0x00000035 > > + 0x00010003 0x0000003d > > + 0x00010004 0x00000045 > > + 0x00010005 0x0000004e > > + 0x00010006 0x00000057 > > + 0x00010007 0x00000061 > > + 0x00010008 0x0000006b > > + 0x00010009 0x00000076 > > + > > + 0x00020000 0x00000029 > > + 0x00020001 0x00000033 > > + 0x00020002 0x0000003d > > + 0x00020003 0x00000049 > > + 0x00020004 0x00000056 > > + 0x00020005 0x00000061 > > + 0x00020006 0x0000006d > > + > > + 0x00030000 0x00000021 > > + 0x00030001 0x0000002a > > + 0x00030002 0x0000003c > > + 0x00030003 0x0000004e>; > > + big-endian; > > + #thermal-sensor-cells = <1>; > > + }; > > + > > + thermal-zones { > > + cpu_thermal: cpu-thermal { > > + polling-delay-passive = <1000>; > > + polling-delay = <5000>; > > + > > We usually do not have newline between properties but nodes, or between > property list and child node. I just follow the style of thermal binding of Documentation/devicetree/bindings/thermal/thermal.txt. > > > + thermal-sensors = <&tmu 3>; > > + > > + trips { > > + cpu_alert: cpu-alert { > > + temperature = <85000>; > > + hysteresis = <2000>; > > + type = "passive"; > > + }; > > Have a newline here. Also follow the thermal binding. -Hongtao. > > > + cpu_crit: cpu-crit { > > + temperature = <95000>; > > + hysteresis = <2000>; > > + type = "critical"; > > + }; > > + }; > > + > > + cooling-maps { > > + map0 { > > + trip = <&cpu_alert>; > > + cooling-device = > > + <&cpu0 > THERMAL_NO_LIMIT > > + THERMAL_NO_LIMIT>; > > + }; > > + }; > > + }; > > + }; > > + > > dspi: dspi@2100000 { > > compatible = "fsl,ls1021a-v1.0-dspi"; > > #address-cells = <1>; > > -- > > 2.1.0.27.g96db324 > > > > > > _______________________________________________ > > linux-arm-kernel mailing list > > linux-arm-kernel@lists.infradead.org > > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
On Tue, Jan 03, 2017 at 03:49:33AM +0000, Troy Jia wrote: > > > @@ -279,6 +282,82 @@ > > > clocks = <&sysclk>; > > > }; > > > > > > + tmu: tmu@1f00000 { > > > + compatible = "fsl,qoriq-tmu"; > > > + reg = <0x0 0x1f00000 0x0 0x10000>; > > > + interrupts = <0 33 0x4>; > > > + fsl,tmu-range = <0xb0000 0x9002a 0x6004c 0x30062>; > > > + fsl,tmu-calibration = <0x00000000 0x00000026 > > > + 0x00000001 0x0000002d > > > + 0x00000002 0x00000032 > > > + 0x00000003 0x00000039 > > > + 0x00000004 0x0000003f > > > + 0x00000005 0x00000046 > > > + 0x00000006 0x0000004d > > > + 0x00000007 0x00000054 > > > + 0x00000008 0x0000005a > > > + 0x00000009 0x00000061 > > > + 0x0000000a 0x0000006a > > > + 0x0000000b 0x00000071 > > > + > > > > Instead of a newline, can we have a single line comment here to tell how these > > calibration data is grouped? > > Each group represent one temperature range. It's a good idea to add comment here. > Could I just add one comment like below to clarify all four groups? > /* Each calibration data group represent one temperature range. There are four ranges in total */ Probably the following form? /* Calibration data group 1 */ ... /* Calibration data group 2 */ ... /* Calibration data group 3 */ ... /* Calibration data group 4 */ ... > > > > > > + 0x00010000 0x00000025 > > > + 0x00010001 0x0000002c > > > + 0x00010002 0x00000035 > > > + 0x00010003 0x0000003d > > > + 0x00010004 0x00000045 > > > + 0x00010005 0x0000004e > > > + 0x00010006 0x00000057 > > > + 0x00010007 0x00000061 > > > + 0x00010008 0x0000006b > > > + 0x00010009 0x00000076 > > > + > > > + 0x00020000 0x00000029 > > > + 0x00020001 0x00000033 > > > + 0x00020002 0x0000003d > > > + 0x00020003 0x00000049 > > > + 0x00020004 0x00000056 > > > + 0x00020005 0x00000061 > > > + 0x00020006 0x0000006d > > > + > > > + 0x00030000 0x00000021 > > > + 0x00030001 0x0000002a > > > + 0x00030002 0x0000003c > > > + 0x00030003 0x0000004e>; > > > + big-endian; > > > + #thermal-sensor-cells = <1>; > > > + }; > > > + > > > + thermal-zones { > > > + cpu_thermal: cpu-thermal { > > > + polling-delay-passive = <1000>; > > > + polling-delay = <5000>; > > > + > > > > We usually do not have newline between properties but nodes, or between > > property list and child node. > > I just follow the style of thermal binding of > Documentation/devicetree/bindings/thermal/thermal.txt. Different subsystem or binding examples use different style, but when we put things together in the platform dts, we would like to have them in a unified style. Shawn
> > On Tue, Jan 03, 2017 at 03:49:33AM +0000, Troy Jia wrote: > > > > @@ -279,6 +282,82 @@ > > > > clocks = <&sysclk>; > > > > }; > > > > > > > > + tmu: tmu@1f00000 { > > > > + compatible = "fsl,qoriq-tmu"; > > > > + reg = <0x0 0x1f00000 0x0 0x10000>; > > > > + interrupts = <0 33 0x4>; > > > > + fsl,tmu-range = <0xb0000 0x9002a 0x6004c 0x30062>; > > > > + fsl,tmu-calibration = <0x00000000 0x00000026 > > > > + 0x00000001 0x0000002d > > > > + 0x00000002 0x00000032 > > > > + 0x00000003 0x00000039 > > > > + 0x00000004 0x0000003f > > > > + 0x00000005 0x00000046 > > > > + 0x00000006 0x0000004d > > > > + 0x00000007 0x00000054 > > > > + 0x00000008 0x0000005a > > > > + 0x00000009 0x00000061 > > > > + 0x0000000a 0x0000006a > > > > + 0x0000000b 0x00000071 > > > > + > > > > > > Instead of a newline, can we have a single line comment here to tell > > > how these calibration data is grouped? > > > > Each group represent one temperature range. It's a good idea to add comment > here. > > Could I just add one comment like below to clarify all four groups? > > /* Each calibration data group represent one temperature range. There > > are four ranges in total */ > > Probably the following form? > > /* Calibration data group 1 */ > ... > /* Calibration data group 2 */ > ... > /* Calibration data group 3 */ > ... > /* Calibration data group 4 */ > ... > It's good for me. > > > > > > > > > > + 0x00010000 0x00000025 > > > > + 0x00010001 0x0000002c > > > > + 0x00010002 0x00000035 > > > > + 0x00010003 0x0000003d > > > > + 0x00010004 0x00000045 > > > > + 0x00010005 0x0000004e > > > > + 0x00010006 0x00000057 > > > > + 0x00010007 0x00000061 > > > > + 0x00010008 0x0000006b > > > > + 0x00010009 0x00000076 > > > > + > > > > + 0x00020000 0x00000029 > > > > + 0x00020001 0x00000033 > > > > + 0x00020002 0x0000003d > > > > + 0x00020003 0x00000049 > > > > + 0x00020004 0x00000056 > > > > + 0x00020005 0x00000061 > > > > + 0x00020006 0x0000006d > > > > + > > > > + 0x00030000 0x00000021 > > > > + 0x00030001 0x0000002a > > > > + 0x00030002 0x0000003c > > > > + 0x00030003 0x0000004e>; > > > > + big-endian; > > > > + #thermal-sensor-cells = <1>; > > > > + }; > > > > + > > > > + thermal-zones { > > > > + cpu_thermal: cpu-thermal { > > > > + polling-delay-passive = <1000>; > > > > + polling-delay = <5000>; > > > > + > > > > > > We usually do not have newline between properties but nodes, or > > > between property list and child node. > > > > I just follow the style of thermal binding of > > Documentation/devicetree/bindings/thermal/thermal.txt. > > Different subsystem or binding examples use different style, but when we put > things together in the platform dts, we would like to have them in a unified style. Good point here. I will fix it and send the new version. Thanks. -Hongtao.
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi index 38806ca..40604e9 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi @@ -45,6 +45,8 @@ */ #include <dt-bindings/interrupt-controller/arm-gic.h> +#include <dt-bindings/thermal/thermal.h> + / { compatible = "fsl,ls1046a"; @@ -67,6 +69,7 @@ clocks = <&clockgen 1 0>; next-level-cache = <&l2>; cpu-idle-states = <&CPU_PH20>; + #cooling-cells = <2>; }; cpu1: cpu@1 { @@ -279,6 +282,82 @@ clocks = <&sysclk>; }; + tmu: tmu@1f00000 { + compatible = "fsl,qoriq-tmu"; + reg = <0x0 0x1f00000 0x0 0x10000>; + interrupts = <0 33 0x4>; + fsl,tmu-range = <0xb0000 0x9002a 0x6004c 0x30062>; + fsl,tmu-calibration = <0x00000000 0x00000026 + 0x00000001 0x0000002d + 0x00000002 0x00000032 + 0x00000003 0x00000039 + 0x00000004 0x0000003f + 0x00000005 0x00000046 + 0x00000006 0x0000004d + 0x00000007 0x00000054 + 0x00000008 0x0000005a + 0x00000009 0x00000061 + 0x0000000a 0x0000006a + 0x0000000b 0x00000071 + + 0x00010000 0x00000025 + 0x00010001 0x0000002c + 0x00010002 0x00000035 + 0x00010003 0x0000003d + 0x00010004 0x00000045 + 0x00010005 0x0000004e + 0x00010006 0x00000057 + 0x00010007 0x00000061 + 0x00010008 0x0000006b + 0x00010009 0x00000076 + + 0x00020000 0x00000029 + 0x00020001 0x00000033 + 0x00020002 0x0000003d + 0x00020003 0x00000049 + 0x00020004 0x00000056 + 0x00020005 0x00000061 + 0x00020006 0x0000006d + + 0x00030000 0x00000021 + 0x00030001 0x0000002a + 0x00030002 0x0000003c + 0x00030003 0x0000004e>; + big-endian; + #thermal-sensor-cells = <1>; + }; + + thermal-zones { + cpu_thermal: cpu-thermal { + polling-delay-passive = <1000>; + polling-delay = <5000>; + + thermal-sensors = <&tmu 3>; + + trips { + cpu_alert: cpu-alert { + temperature = <85000>; + hysteresis = <2000>; + type = "passive"; + }; + cpu_crit: cpu-crit { + temperature = <95000>; + hysteresis = <2000>; + type = "critical"; + }; + }; + + cooling-maps { + map0 { + trip = <&cpu_alert>; + cooling-device = + <&cpu0 THERMAL_NO_LIMIT + THERMAL_NO_LIMIT>; + }; + }; + }; + }; + dspi: dspi@2100000 { compatible = "fsl,ls1021a-v1.0-dspi"; #address-cells = <1>;
Also add nodes and properties for thermal management support. Signed-off-by: Jia Hongtao <hongtao.jia@nxp.com> --- arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 79 ++++++++++++++++++++++++++ 1 file changed, 79 insertions(+)