ARM: dts: imx: Make tempmon node as child of anatop node
Subsystems (2)
PATCH 1/1 ARM: dts: imx: Make tempmon node as child of anatop node
i.MX6/7 SoCs' temperature sensor is inside anatop module from HW perspective, so it should be a child node of anatop.
--- arch/arm/boot/dts/imx6qdl.dtsi | 22 +++++++++++----------- arch/arm/boot/dts/imx6sl.dtsi | 20 ++++++++++---------- arch/arm/boot/dts/imx6sll.dtsi | 20 ++++++++++---------- arch/arm/boot/dts/imx6sx.dtsi | 20 ++++++++++---------- arch/arm/boot/dts/imx6ul.dtsi | 20 ++++++++++---------- arch/arm/boot/dts/imx7s.dtsi | 20 ++++++++++---------- 6 files changed, 61 insertions(+), 61 deletions(-)
arch/arm/boot/dts/imx6qdl.dtsi +11 -11
@@ -69,17 +69,6 @@ }; }; - tempmon: tempmon { - compatible = "fsl,imx6q-tempmon"; - interrupt-parent = <&gpc>; - interrupts = <0 49 IRQ_TYPE_LEVEL_HIGH>; - fsl,tempmon = <&anatop>; - nvmem-cells = <&tempmon_calib>, <&tempmon_temp_grade>; - nvmem-cell-names = "calib", "temp_grade"; - clocks = <&clks IMX6QDL_CLK_PLL3_USB_OTG>; - #thermal-sensor-cells = <0>; - }; - ldb: ldb { #address-cells = <1>; #size-cells = <0>;
@@ -795,6 +784,17 @@ anatop-min-voltage = <725000>; anatop-max-voltage = <1450000>; }; + + tempmon: tempmon { + compatible = "fsl,imx6q-tempmon"; + interrupt-parent = <&gpc>; + interrupts = <0 49 IRQ_TYPE_LEVEL_HIGH>; + fsl,tempmon = <&anatop>; + nvmem-cells = <&tempmon_calib>, <&tempmon_temp_grade>; + nvmem-cell-names = "calib", "temp_grade"; + clocks = <&clks IMX6QDL_CLK_PLL3_USB_OTG>; + #thermal-sensor-cells = <0>; + }; }; usbphy1: usbphy@20c9000 {
arch/arm/boot/dts/imx6sl.dtsi +10 -10
@@ -93,16 +93,6 @@ }; }; - tempmon: tempmon { - compatible = "fsl,imx6q-tempmon"; - interrupts = <0 49 IRQ_TYPE_LEVEL_HIGH>; - interrupt-parent = <&gpc>; - fsl,tempmon = <&anatop>; - nvmem-cells = <&tempmon_calib>, <&tempmon_temp_grade>; - nvmem-cell-names = "calib", "temp_grade"; - clocks = <&clks IMX6SL_CLK_PLL3_USB_OTG>; - }; - pmu { compatible = "arm,cortex-a9-pmu"; interrupt-parent = <&gpc>;
@@ -628,6 +618,16 @@ anatop-min-voltage = <725000>; anatop-max-voltage = <1450000>; }; + + tempmon: tempmon { + compatible = "fsl,imx6q-tempmon"; + interrupts = <0 49 IRQ_TYPE_LEVEL_HIGH>; + interrupt-parent = <&gpc>; + fsl,tempmon = <&anatop>; + nvmem-cells = <&tempmon_calib>, <&tempmon_temp_grade>; + nvmem-cell-names = "calib", "temp_grade"; + clocks = <&clks IMX6SL_CLK_PLL3_USB_OTG>; + }; }; usbphy1: usbphy@20c9000 {
arch/arm/boot/dts/imx6sll.dtsi +10 -10
@@ -105,16 +105,6 @@ clock-output-names = "ipp_di1"; }; - tempmon: temperature-sensor { - compatible = "fsl,imx6sll-tempmon", "fsl,imx6sx-tempmon"; - interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>; - interrupt-parent = <&gpc>; - fsl,tempmon = <&anatop>; - nvmem-cells = <&tempmon_calib>, <&tempmon_temp_grade>; - nvmem-cell-names = "calib", "temp_grade"; - clocks = <&clks IMX6SLL_CLK_PLL3_USB_OTG>; - }; - soc { #address-cells = <1>; #size-cells = <1>;
@@ -531,6 +521,16 @@ anatop-max-voltage = <3400000>; anatop-enable-bit = <0>; }; + + tempmon: temperature-sensor { + compatible = "fsl,imx6sll-tempmon", "fsl,imx6sx-tempmon"; + interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>; + interrupt-parent = <&gpc>; + fsl,tempmon = <&anatop>; + nvmem-cells = <&tempmon_calib>, <&tempmon_temp_grade>; + nvmem-cell-names = "calib", "temp_grade"; + clocks = <&clks IMX6SLL_CLK_PLL3_USB_OTG>; + }; }; usbphy1: usb-phy@20c9000 {
arch/arm/boot/dts/imx6sx.dtsi +10 -10
@@ -134,16 +134,6 @@ clock-output-names = "anaclk2"; }; - tempmon: tempmon { - compatible = "fsl,imx6sx-tempmon", "fsl,imx6q-tempmon"; - interrupt-parent = <&gpc>; - interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>; - fsl,tempmon = <&anatop>; - nvmem-cells = <&tempmon_calib>, <&tempmon_temp_grade>; - nvmem-cell-names = "calib", "temp_grade"; - clocks = <&clks IMX6SX_CLK_PLL3_USB_OTG>; - }; - pmu { compatible = "arm,cortex-a9-pmu"; interrupt-parent = <&gpc>;
@@ -696,6 +686,16 @@ anatop-min-voltage = <725000>; anatop-max-voltage = <1450000>; }; + + tempmon: tempmon { + compatible = "fsl,imx6sx-tempmon", "fsl,imx6q-tempmon"; + interrupt-parent = <&gpc>; + interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>; + fsl,tempmon = <&anatop>; + nvmem-cells = <&tempmon_calib>, <&tempmon_temp_grade>; + nvmem-cell-names = "calib", "temp_grade"; + clocks = <&clks IMX6SX_CLK_PLL3_USB_OTG>; + }; }; usbphy1: usbphy@20c9000 {
arch/arm/boot/dts/imx6ul.dtsi +10 -10
@@ -131,16 +131,6 @@ clock-output-names = "ipp_di1"; }; - tempmon: tempmon { - compatible = "fsl,imx6ul-tempmon", "fsl,imx6sx-tempmon"; - interrupt-parent = <&gpc>; - interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>; - fsl,tempmon = <&anatop>; - nvmem-cells = <&tempmon_calib>, <&tempmon_temp_grade>; - nvmem-cell-names = "calib", "temp_grade"; - clocks = <&clks IMX6UL_CLK_PLL3_USB_OTG>; - }; - pmu { compatible = "arm,cortex-a7-pmu"; interrupt-parent = <&gpc>;
@@ -611,6 +601,16 @@ anatop-min-voltage = <725000>; anatop-max-voltage = <1450000>; }; + + tempmon: tempmon { + compatible = "fsl,imx6ul-tempmon", "fsl,imx6sx-tempmon"; + interrupt-parent = <&gpc>; + interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>; + fsl,tempmon = <&anatop>; + nvmem-cells = <&tempmon_calib>, <&tempmon_temp_grade>; + nvmem-cell-names = "calib", "temp_grade"; + clocks = <&clks IMX6UL_CLK_PLL3_USB_OTG>; + }; }; usbphy1: usbphy@20c9000 {
arch/arm/boot/dts/imx7s.dtsi +10 -10
@@ -147,16 +147,6 @@ }; }; - tempmon: tempmon { - compatible = "fsl,imx7d-tempmon"; - interrupt-parent = <&gpc>; - interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>; - fsl,tempmon = <&anatop>; - nvmem-cells = <&tempmon_calib>, <&fuse_grade>; - nvmem-cell-names = "calib", "temp_grade"; - clocks = <&clks IMX7D_PLL_SYS_MAIN_CLK>; - }; - timer { compatible = "arm,armv7-timer"; interrupt-parent = <&intc>;
@@ -586,6 +576,16 @@ anatop-max-voltage = <1300000>; anatop-enable-bit = <0>; }; + + tempmon: tempmon { + compatible = "fsl,imx7d-tempmon"; + interrupt-parent = <&gpc>; + interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>; + fsl,tempmon = <&anatop>; + nvmem-cells = <&tempmon_calib>, <&fuse_grade>; + nvmem-cell-names = "calib", "temp_grade"; + clocks = <&clks IMX7D_PLL_SYS_MAIN_CLK>; + }; }; snvs: snvs@30370000 {
Signature · 1 line
2.7.4
Quoted 7 lines
From: Anson Huang <[email protected]>
Sent: Wednesday, May 20, 2020 2:30 PMi.MX6/7 SoCs' temperature sensor is inside anatop module from HW perspective, so it should be a child node of anatop.
Signed-off-by Anson Huang <[email protected]>
BTW, I think you also need a binding doc for this change.
Regards
Aisheng
Quoted 250 lines
--- arch/arm/boot/dts/imx6qdl.dtsi | 22 +++++++++++----------- arch/arm/boot/dts/imx6sl.dtsi | 20 ++++++++++---------- arch/arm/boot/dts/imx6sll.dtsi | 20 ++++++++++---------- arch/arm/boot/dts/imx6sx.dtsi | 20 ++++++++++---------- arch/arm/boot/dts/imx6ul.dtsi | 20 ++++++++++---------- arch/arm/boot/dts/imx7s.dtsi | 20 ++++++++++---------- 6 files changed, 61 insertions(+), 61 deletions(-)arch/arm/boot/dts/imx6qdl.dtsi +11
-11@@ -69,17 +69,6 @@ }; }; - tempmon: tempmon { - compatible = "fsl,imx6q-tempmon"; - interrupt-parent = <&gpc>; - interrupts = <0 49 IRQ_TYPE_LEVEL_HIGH>; - fsl,tempmon = <&anatop>; - nvmem-cells = <&tempmon_calib>, <&tempmon_temp_grade>; - nvmem-cell-names = "calib", "temp_grade"; - clocks = <&clks IMX6QDL_CLK_PLL3_USB_OTG>; - #thermal-sensor-cells = <0>; - }; - ldb: ldb { #address-cells = <1>; #size-cells = <0>;@@ -795,6 +784,17 @@ anatop-min-voltage = <725000>; anatop-max-voltage = <1450000>; }; + + tempmon: tempmon { + compatible = "fsl,imx6q-tempmon"; + interrupt-parent = <&gpc>; + interrupts = <0 49 IRQ_TYPE_LEVEL_HIGH>; + fsl,tempmon = <&anatop>; + nvmem-cells = <&tempmon_calib>, <&tempmon_temp_grade>; + nvmem-cell-names = "calib", "temp_grade"; + clocks = <&clks IMX6QDL_CLK_PLL3_USB_OTG>; + #thermal-sensor-cells = <0>; + }; };arch/arm/boot/dts/imx6qdl.dtsi +0
-0usbphy1: usbphy@20c9000 {arch/arm/boot/dts/imx6sl.dtsi +10
-10@@ -93,16 +93,6 @@ }; }; - tempmon: tempmon { - compatible = "fsl,imx6q-tempmon"; - interrupts = <0 49 IRQ_TYPE_LEVEL_HIGH>; - interrupt-parent = <&gpc>; - fsl,tempmon = <&anatop>; - nvmem-cells = <&tempmon_calib>, <&tempmon_temp_grade>; - nvmem-cell-names = "calib", "temp_grade"; - clocks = <&clks IMX6SL_CLK_PLL3_USB_OTG>; - }; - pmu { compatible = "arm,cortex-a9-pmu"; interrupt-parent = <&gpc>;@@ -628,6 +618,16 @@ anatop-min-voltage = <725000>; anatop-max-voltage = <1450000>; }; + + tempmon: tempmon { + compatible = "fsl,imx6q-tempmon"; + interrupts = <0 49 IRQ_TYPE_LEVEL_HIGH>; + interrupt-parent = <&gpc>; + fsl,tempmon = <&anatop>; + nvmem-cells = <&tempmon_calib>, <&tempmon_temp_grade>; + nvmem-cell-names = "calib", "temp_grade"; + clocks = <&clks IMX6SL_CLK_PLL3_USB_OTG>; + }; };arch/arm/boot/dts/imx6sl.dtsi +0
-0usbphy1: usbphy@20c9000 {arch/arm/boot/dts/imx6sll.dtsi +10
-10@@ -105,16 +105,6 @@ clock-output-names = "ipp_di1"; }; - tempmon: temperature-sensor { - compatible = "fsl,imx6sll-tempmon", "fsl,imx6sx-tempmon"; - interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>; - interrupt-parent = <&gpc>; - fsl,tempmon = <&anatop>; - nvmem-cells = <&tempmon_calib>, <&tempmon_temp_grade>; - nvmem-cell-names = "calib", "temp_grade"; - clocks = <&clks IMX6SLL_CLK_PLL3_USB_OTG>; - }; - soc { #address-cells = <1>; #size-cells = <1>;@@ -531,6 +521,16 @@ anatop-max-voltage = <3400000>; anatop-enable-bit = <0>; }; + + tempmon: temperature-sensor { + compatible = "fsl,imx6sll-tempmon", "fsl,imx6sx-tempmon"; + interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>; + interrupt-parent = <&gpc>; + fsl,tempmon = <&anatop>; + nvmem-cells = <&tempmon_calib>, <&tempmon_temp_grade>; + nvmem-cell-names = "calib", "temp_grade"; + clocks = <&clks IMX6SLL_CLK_PLL3_USB_OTG>; + }; };arch/arm/boot/dts/imx6sll.dtsi +0
-0usbphy1: usb-phy@20c9000 {arch/arm/boot/dts/imx6sx.dtsi +10
-10@@ -134,16 +134,6 @@ clock-output-names = "anaclk2"; }; - tempmon: tempmon { - compatible = "fsl,imx6sx-tempmon", "fsl,imx6q-tempmon"; - interrupt-parent = <&gpc>; - interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>; - fsl,tempmon = <&anatop>; - nvmem-cells = <&tempmon_calib>, <&tempmon_temp_grade>; - nvmem-cell-names = "calib", "temp_grade"; - clocks = <&clks IMX6SX_CLK_PLL3_USB_OTG>; - }; - pmu { compatible = "arm,cortex-a9-pmu"; interrupt-parent = <&gpc>;@@ -696,6 +686,16 @@ anatop-min-voltage = <725000>; anatop-max-voltage = <1450000>; }; + + tempmon: tempmon { + compatible = "fsl,imx6sx-tempmon", "fsl,imx6q-tempmon"; + interrupt-parent = <&gpc>; + interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>; + fsl,tempmon = <&anatop>; + nvmem-cells = <&tempmon_calib>, <&tempmon_temp_grade>; + nvmem-cell-names = "calib", "temp_grade"; + clocks = <&clks IMX6SX_CLK_PLL3_USB_OTG>; + }; };arch/arm/boot/dts/imx6sx.dtsi +0
-0usbphy1: usbphy@20c9000 {arch/arm/boot/dts/imx6ul.dtsi +10
-10@@ -131,16 +131,6 @@ clock-output-names = "ipp_di1"; }; - tempmon: tempmon { - compatible = "fsl,imx6ul-tempmon", "fsl,imx6sx-tempmon"; - interrupt-parent = <&gpc>; - interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>; - fsl,tempmon = <&anatop>; - nvmem-cells = <&tempmon_calib>, <&tempmon_temp_grade>; - nvmem-cell-names = "calib", "temp_grade"; - clocks = <&clks IMX6UL_CLK_PLL3_USB_OTG>; - }; - pmu { compatible = "arm,cortex-a7-pmu"; interrupt-parent = <&gpc>;@@ -611,6 +601,16 @@ anatop-min-voltage = <725000>; anatop-max-voltage = <1450000>; }; + + tempmon: tempmon { + compatible = "fsl,imx6ul-tempmon", "fsl,imx6sx-tempmon"; + interrupt-parent = <&gpc>; + interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>; + fsl,tempmon = <&anatop>; + nvmem-cells = <&tempmon_calib>, <&tempmon_temp_grade>; + nvmem-cell-names = "calib", "temp_grade"; + clocks = <&clks IMX6UL_CLK_PLL3_USB_OTG>; + }; };arch/arm/boot/dts/imx6ul.dtsi +0
-0usbphy1: usbphy@20c9000 {arch/arm/boot/dts/imx7s.dtsi index renamed from arch/arm/boot/dts/imx7s.dtsi +0
-08bac491..3904558 100644
arch/arm/boot/dts/imx7s.dtsi +10
-10@@ -147,16 +147,6 @@ }; }; - tempmon: tempmon { - compatible = "fsl,imx7d-tempmon"; - interrupt-parent = <&gpc>; - interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>; - fsl,tempmon = <&anatop>; - nvmem-cells = <&tempmon_calib>, <&fuse_grade>; - nvmem-cell-names = "calib", "temp_grade"; - clocks = <&clks IMX7D_PLL_SYS_MAIN_CLK>; - }; - timer { compatible = "arm,armv7-timer"; interrupt-parent = <&intc>;@@ -586,6 +576,16 @@ anatop-max-voltage = <1300000>; anatop-enable-bit = <0>; }; + + tempmon: tempmon { + compatible = "fsl,imx7d-tempmon"; + interrupt-parent = <&gpc>; + interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>; + fsl,tempmon = <&anatop>; + nvmem-cells = <&tempmon_calib>, <&fuse_grade>; + nvmem-cell-names = "calib", "temp_grade"; + clocks = <&clks IMX7D_PLL_SYS_MAIN_CLK>; + }; };snvs: snvs@30370000 {
--
2.7.4
Quoted 8 lines
Subject: RE: [PATCH] ARM: dts: imx: Make tempmon node as child of anatop node
Quoted 3 lines
From: Anson Huang <[email protected]>
Sent: Wednesday, May 20, 2020 2:30 PM
Quoted 8 lines
Quoted 4 lines
i.MX6/7 SoCs' temperature sensor is inside anatop module from HW perspective, so it should be a child node of anatop.
Signed-off-by Anson Huang <[email protected]>Reviewed-by Dong Aisheng <[email protected]>BTW, I think you also need a binding doc for this change.
The binding doc is the imx-thermal.yaml I sent out, it is suggested by Rob to move tempmon into anatop node, that is why I did this patch to align with the binding doc.
Anson
Quoted 14 lines
From: Anson Huang <[email protected]>
Sent: Wednesday, May 20, 2020 3:47 PMQuoted 11 lines
Subject: RE: [PATCH] ARM: dts: imx: Make tempmon node as child of anatop node
Quoted 7 lines
From: Anson Huang <[email protected]>
Sent: Wednesday, May 20, 2020 2:30 PMi.MX6/7 SoCs' temperature sensor is inside anatop module from HW perspective, so it should be a child node of anatop.
Signed-off-by Anson Huang <[email protected]>
Quoted 7 lines
Quoted 3 lines
Reviewed-by Dong Aisheng <[email protected]>BTW, I think you also need a binding doc for this change.
The binding doc is the
imx-thermal.yamlI sent out, it is suggested by Rob to move tempmon into anatop node, that is why I did this patch to align with the binding doc.
That's thermal binding doc.
We need a binding doc to describe the constraints for anatop as well.
Regards
Aisheng
Quoted 1 line
Anson
Quoted 21 lines
Subject: RE: [PATCH] ARM: dts: imx: Make tempmon node as child of anatop node
Quoted 16 lines
From: Anson Huang <[email protected]>
Sent: Wednesday, May 20, 2020 3:47 PMQuoted 13 lines
Subject: RE: [PATCH] ARM: dts: imx: Make tempmon node as child of anatop node
Quoted 7 lines
From: Anson Huang <[email protected]>
Sent: Wednesday, May 20, 2020 2:30 PMi.MX6/7 SoCs' temperature sensor is inside anatop module from HW perspective, so it should be a child node of anatop.
Signed-off-by Anson Huang <[email protected]>Reviewed-by Dong Aisheng <[email protected]>
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
BTW, I think you also need a binding doc for this change.
The binding doc is the
imx-thermal.yamlI sent out, it is suggested by Rob to move tempmon into anatop node, that is why I did this patch to align with the binding doc.That's thermal binding doc.
We need a binding doc to describe the constraints for anatop as well.
anatop includes PMU, thermal etc., need to think about how to add it and where to put it, will think about it later.
Anson
Quoted 28 lines
From: Anson Huang <[email protected]>
Sent: Wednesday, May 20, 2020 4:12 PMQuoted 25 lines
Subject: RE: [PATCH] ARM: dts: imx: Make tempmon node as child of anatop node
Quoted 21 lines
From: Anson Huang <[email protected]>
Sent: Wednesday, May 20, 2020 3:47 PMQuoted 6 lines
Subject: RE: [PATCH] ARM: dts: imx: Make tempmon node as child of anatop node
Quoted 3 lines
From: Anson Huang <[email protected]>
Sent: Wednesday, May 20, 2020 2:30 PMQuoted 8 lines
Quoted 4 lines
i.MX6/7 SoCs' temperature sensor is inside anatop module from HW perspective, so it should be a child node of anatop.
Signed-off-by Anson Huang <[email protected]>Reviewed-by Dong Aisheng <[email protected]>BTW, I think you also need a binding doc for this change.
The binding doc is the
imx-thermal.yamlI sent out, it is suggested by Rob to move tempmon into anatop node, that is why I did this patch to align with the binding doc.
Quoted 5 lines
Quoted 2 lines
That's thermal binding doc.
We need a binding doc to describe the constraints for anatop as well.anatop includes PMU, thermal etc., need to think about how to add it and where to put it, will think about it later.
We can combine them into one.
Regards
Aisheng
Quoted 2 lines
Anson
Shawn Guo
AppliedQuoted 4 lines · Anson Huang
i.MX6/7 SoCs' temperature sensor is inside anatop module from HW perspective, so it should be a child node of anatop.
Signed-off-by Anson Huang <[email protected]>
Applied, thanks.