Commit f5d35d87 authored by Peng Fan's avatar Peng Fan Committed by Shawn Guo

ARM: dts: imx: add nvmem property for cpu0

Add nvmem related property for cpu0, then nvmem API could be used
to read cpu speed grading to avoid directly read OCOTP registers
mapped which could not handle defer probe.
Signed-off-by: default avatarPeng Fan <peng.fan@nxp.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 98670a0b
...@@ -44,6 +44,8 @@ cpu0: cpu@0 { ...@@ -44,6 +44,8 @@ cpu0: cpu@0 {
arm-supply = <&reg_arm>; arm-supply = <&reg_arm>;
pu-supply = <&reg_pu>; pu-supply = <&reg_pu>;
soc-supply = <&reg_soc>; soc-supply = <&reg_soc>;
nvmem-cells = <&cpu_speed_grade>;
nvmem-cell-names = "speed_grade";
}; };
cpu@1 { cpu@1 {
......
...@@ -49,6 +49,8 @@ cpu0: cpu@0 { ...@@ -49,6 +49,8 @@ cpu0: cpu@0 {
arm-supply = <&reg_arm>; arm-supply = <&reg_arm>;
pu-supply = <&reg_pu>; pu-supply = <&reg_pu>;
soc-supply = <&reg_soc>; soc-supply = <&reg_soc>;
nvmem-cells = <&cpu_speed_grade>;
nvmem-cell-names = "speed_grade";
}; };
cpu1: cpu@1 { cpu1: cpu@1 {
......
...@@ -1165,6 +1165,12 @@ ocotp: ocotp-ctrl@21bc000 { ...@@ -1165,6 +1165,12 @@ ocotp: ocotp-ctrl@21bc000 {
compatible = "fsl,imx6q-ocotp", "syscon"; compatible = "fsl,imx6q-ocotp", "syscon";
reg = <0x021bc000 0x4000>; reg = <0x021bc000 0x4000>;
clocks = <&clks IMX6QDL_CLK_IIM>; clocks = <&clks IMX6QDL_CLK_IIM>;
#address-cells = <1>;
#size-cells = <1>;
cpu_speed_grade: speed-grade@10 {
reg = <0x10 4>;
};
}; };
tzasc@21d0000 { /* TZASC1 */ tzasc@21d0000 { /* TZASC1 */
......
...@@ -74,6 +74,8 @@ cpu@0 { ...@@ -74,6 +74,8 @@ cpu@0 {
arm-supply = <&reg_arm>; arm-supply = <&reg_arm>;
pu-supply = <&reg_pu>; pu-supply = <&reg_pu>;
soc-supply = <&reg_soc>; soc-supply = <&reg_soc>;
nvmem-cells = <&cpu_speed_grade>;
nvmem-cell-names = "speed_grade";
}; };
}; };
...@@ -953,6 +955,12 @@ ocotp: ocotp-ctrl@21bc000 { ...@@ -953,6 +955,12 @@ ocotp: ocotp-ctrl@21bc000 {
compatible = "fsl,imx6sl-ocotp", "syscon"; compatible = "fsl,imx6sl-ocotp", "syscon";
reg = <0x021bc000 0x4000>; reg = <0x021bc000 0x4000>;
clocks = <&clks IMX6SL_CLK_OCOTP>; clocks = <&clks IMX6SL_CLK_OCOTP>;
#address-cells = <1>;
#size-cells = <1>;
cpu_speed_grade: speed-grade@10 {
reg = <0x10 4>;
};
}; };
audmux: audmux@21d8000 { audmux: audmux@21d8000 {
......
...@@ -72,6 +72,8 @@ cpu0: cpu@0 { ...@@ -72,6 +72,8 @@ cpu0: cpu@0 {
<&clks IMX6SLL_CLK_PLL1_SYS>; <&clks IMX6SLL_CLK_PLL1_SYS>;
clock-names = "arm", "pll2_pfd2_396m", "step", clock-names = "arm", "pll2_pfd2_396m", "step",
"pll1_sw", "pll1_sys"; "pll1_sw", "pll1_sys";
nvmem-cells = <&cpu_speed_grade>;
nvmem-cell-names = "speed_grade";
}; };
}; };
...@@ -791,6 +793,10 @@ ocotp: ocotp-ctrl@21bc000 { ...@@ -791,6 +793,10 @@ ocotp: ocotp-ctrl@21bc000 {
reg = <0x021bc000 0x4000>; reg = <0x021bc000 0x4000>;
clocks = <&clks IMX6SLL_CLK_OCOTP>; clocks = <&clks IMX6SLL_CLK_OCOTP>;
cpu_speed_grade: speed-grade@10 {
reg = <0x10 4>;
};
tempmon_calib: calib@38 { tempmon_calib: calib@38 {
reg = <0x38 4>; reg = <0x38 4>;
}; };
......
...@@ -87,6 +87,8 @@ cpu0: cpu@0 { ...@@ -87,6 +87,8 @@ cpu0: cpu@0 {
"pll1_sw", "pll1_sys"; "pll1_sw", "pll1_sys";
arm-supply = <&reg_arm>; arm-supply = <&reg_arm>;
soc-supply = <&reg_soc>; soc-supply = <&reg_soc>;
nvmem-cells = <&cpu_speed_grade>;
nvmem-cell-names = "speed_grade";
}; };
}; };
...@@ -1058,6 +1060,10 @@ ocotp: ocotp-ctrl@21bc000 { ...@@ -1058,6 +1060,10 @@ ocotp: ocotp-ctrl@21bc000 {
reg = <0x021bc000 0x4000>; reg = <0x021bc000 0x4000>;
clocks = <&clks IMX6SX_CLK_OCOTP>; clocks = <&clks IMX6SX_CLK_OCOTP>;
cpu_speed_grade: speed-grade@10 {
reg = <0x10 4>;
};
tempmon_calib: calib@38 { tempmon_calib: calib@38 {
reg = <0x38 4>; reg = <0x38 4>;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment