summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/imx7s.dtsi
diff options
context:
space:
mode:
authorFabio Estevam <festevam@gmail.com>2019-12-23 15:07:19 +0300
committerShawn Guo <shawnguo@kernel.org>2020-01-09 10:35:06 +0300
commitff80398d2a11c6e22c9aae47b3fd01a48d377552 (patch)
tree3e6e0405c40f262ef9f36c3582aaa31c67e5c029 /arch/arm/boot/dts/imx7s.dtsi
parenta52e537da7e900518e13503a957f15bf3ac901a9 (diff)
downloadlinux-ff80398d2a11c6e22c9aae47b3fd01a48d377552.tar.xz
ARM: dts: imx7: Unify temp-grade and speed-grade nodes
The following warning is seen when building with W=1: arch/arm/boot/dts/imx7s.dtsi:551.39-553.7: Warning (unique_unit_address): /soc/aips-bus@30000000/ocotp-ctrl@30350000/temp-grade@10: duplicate unit-address (also used in node /soc/aips-bus@30000000/ocotp-ctrl@30350000/speed-grade@10) Since temp-grade and speed-grade point to the same node, replace them by a single one to avoid the duplicate unit-address warning. Signed-off-by: Fabio Estevam <festevam@gmail.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/imx7s.dtsi')
-rw-r--r--arch/arm/boot/dts/imx7s.dtsi9
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index 139ab9b98472..568d7a984aa6 100644
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -152,8 +152,7 @@
interrupt-parent = <&gpc>;
interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
fsl,tempmon = <&anatop>;
- nvmem-cells = <&tempmon_calib>,
- <&tempmon_temp_grade>;
+ nvmem-cells = <&tempmon_calib>, <&fuse_grade>;
nvmem-cell-names = "calib", "temp_grade";
clocks = <&clks IMX7D_PLL_SYS_MAIN_CLK>;
};
@@ -548,11 +547,7 @@
reg = <0x3c 0x4>;
};
- tempmon_temp_grade: temp-grade@10 {
- reg = <0x10 0x4>;
- };
-
- cpu_speed_grade: speed-grade@10 {
+ fuse_grade: fuse-grade@10 {
reg = <0x10 0x4>;
};
};