On 20.12.2022 03:47, Dmitry Baryshkov wrote:
> Specify pre-parsed per-sensor calibration nvmem cells in the tsens
> device node rather than parsing the whole data blob in the driver.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
> ---
> arch/arm64/boot/dts/qcom/msm8916.dtsi | 70 ++++++++++++++++++++++++---
> 1 file changed, 64 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
> index 2ca8e977fc2a..af7ba66bb7cd 100644
> --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
> @@ -442,11 +442,57 @@ qfprom: qfprom@5c000 {
> reg = <0x0005c000 0x1000>;
> #address-cells = <1>;
> #size-cells = <1>;
> - tsens_caldata: caldata@d0 {
> - reg = <0xd0 0x8>;
> + tsens_base1: base1@d0 {
> + reg = <0xd0 0x1>;
> + bits = <0 7>;
> };
> - tsens_calsel: calsel@ec {
> - reg = <0xec 0x4>;
> + tsens_s0_p1: s0_p1@d0 {
No underscores in node names.
> + reg = <0xd0 0x2>;
> + bits = <7 5>;
> + };
> + tsens_s0_p2: s0_p2@d1 {
> + reg = <0xd1 0x2>;
> + bits = <4 5>;
> + };
> + tsens_s1_p1: s1_p1@d2 {
> + reg = <0xd2 0x1>;
> + bits = <1 5>;
> + };
> + tsens_s1_p2: s1_p2@d2 {
> + reg = <0xd2 0x2>;
> + bits = <6 5>;
> + };
> + tsens_s2_p1: s2_p1@d3 {
> + reg = <0xd3 0x1>;
> + bits = <3 5>;
> + };
> + tsens_s2_p2: s2_p2@d4 {
> + reg = <0xd4 0x1>;
> + bits = <0 5>;
> + };
> + tsens_s3_p1: s3_p1@d4 {
> + reg = <0xd4 0x2>;
> + bits = <5 5>;
> + };
> + tsens_s3_p2: s3_p2@d5 {
> + reg = <0xd5 0x1>;
> + bits = <2 5>;
> + };
> + tsens_s4_p1: s4_p1@d5 {
> + reg = <0xd5 0x2>;
> + bits = <7 5>;
> + };
> + tsens_s4_p2: s4_p2@d6 {
> + reg = <0xd6 0x2>;
> + bits = <4 5>;
> + };
> + tsens_base2: base2@d7 {
> + reg = <0xd7 0x1>;
> + bits = <1 7>;
> + };
> + tsens_mode: mode@ec {
> + reg = <0xef 0x1>;
> + bits = <5 3>;
> };
I (gotta admin, a bit painfully) went through all of these again
and they all seem correct!
Konrad
> };
>
> @@ -473,8 +519,20 @@ tsens: thermal-sensor@4a9000 {
> compatible = "qcom,msm8916-tsens", "qcom,tsens-v0_1";
> reg = <0x004a9000 0x1000>, /* TM */
> <0x004a8000 0x1000>; /* SROT */
> - nvmem-cells = <&tsens_caldata>, <&tsens_calsel>;
> - nvmem-cell-names = "calib", "calib_sel";
> + nvmem-cells = <&tsens_mode>,
> + <&tsens_base1>, <&tsens_base2>,
> + <&tsens_s0_p1>, <&tsens_s0_p2>,
> + <&tsens_s1_p1>, <&tsens_s1_p2>,
> + <&tsens_s2_p1>, <&tsens_s2_p2>,
> + <&tsens_s3_p1>, <&tsens_s3_p2>,
> + <&tsens_s4_p1>, <&tsens_s4_p2>;
> + nvmem-cell-names = "mode",
> + "base1", "base2",
> + "s0_p1", "s0_p2",
> + "s1_p1", "s1_p2",
> + "s2_p1", "s2_p2",
> + "s3_p1", "s3_p2",
> + "s4_p1", "s4_p2";
> #qcom,sensors = <5>;
> interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;
> interrupt-names = "uplow";
