diff for duplicates of <1499257985.23291.7.camel@nxp.com> diff --git a/a/1.txt b/N1/1.txt index 79179c9..cd8065d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -7,19 +7,19 @@ On Tue, 2017-07-04 at 11:54 -0700, Eduardo Valentin wrote: > > the read through that. > > > > @@ -347,29 +348,39 @@ static struct thermal_zone_device_ops imx_tz_ops = { -> > static int imx_get_sensor_data(struct platform_device *pdev) -> > { -> > struct imx_thermal_data *data = platform_get_drvdata(pdev); +> > ?static int imx_get_sensor_data(struct platform_device *pdev) +> > ?{ +> > ? struct imx_thermal_data *data = platform_get_drvdata(pdev); > > - struct regmap *map; > > + struct device_node *ocotp_np; > > + struct nvmem_device *ocotp; -> > int t1, n1; -> > int ret; -> > u32 val; -> > u64 temp64; -> > +> > ? int t1, n1; +> > ? int ret; +> > ? u32 val; +> > ? u64 temp64; +> > ? > > - map = syscon_regmap_lookup_by_phandle(pdev->dev.of_node, -> > - "fsl,tempmon-data"); +> > - ??????"fsl,tempmon-data"); > > - if (IS_ERR(map)) { > > - ret = PTR_ERR(map); > > - dev_err(&pdev->dev, "failed to get sensor regmap: %d\n", ret); @@ -35,13 +35,13 @@ On Tue, 2017-07-04 at 11:54 -0700, Eduardo Valentin wrote: > > + ret = PTR_ERR(ocotp); > > + if (ret != -EPROBE_DEFER) > > + dev_err(&pdev->dev, "failed to get fsl,tempmon-data nvmem device: %d\n", ret); -> > return ret; -> > } -> > +> > ? return ret; +> > ? } +> > ? > > @@ -404,10 +415,11 @@ static int imx_get_sensor_data(struct platform_device *pdev) -> > data->c2 = n1 * data->c1 + 1000 * t1; -> > -> > /* use OTP for thermal grade */ +> > ? data->c2 = n1 * data->c1 + 1000 * t1; +> > ? +> > ? /* use OTP for thermal grade */ > > - ret = regmap_read(map, OCOTP_MEM0, &val); > > - if (ret) { > > - dev_err(&pdev->dev, "failed to read temp grade: %d\n", ret); @@ -65,7 +65,3 @@ that doesn't work if the ocotp clock is not enabled. -- Regards, Leonard --- -To unsubscribe from this list: send the line "unsubscribe devicetree" in -the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org -More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index 0caacda..a3ceabb 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,25 +1,9 @@ "ref\0d1a8ec1ef73aefe6018f6a4923bd04b3ac34a5d4.1497879110.git.leonard.crestez@nxp.com\0" "ref\020170704185400.GB18084@localhost.localdomain\0" - "ref\020170704185400.GB18084-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org\0" - "From\0Leonard Crestez <leonard.crestez-3arQi8VN3Tc@public.gmane.org>\0" - "Subject\0Re: [PATCH] thermal: imx: interpret fsl,tempmon-data through nvmem\0" + "From\0leonard.crestez@nxp.com (Leonard Crestez)\0" + "Subject\0[PATCH] thermal: imx: interpret fsl,tempmon-data through nvmem\0" "Date\0Wed, 5 Jul 2017 15:33:05 +0300\0" - "To\0Eduardo Valentin <edubezval-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" - "Cc\0Shawn Guo <shawnguo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>" - Srinivas Kandagatla <srinivas.kandagatla-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> - Zhang Rui <rui.zhang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> - Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> - Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org> - " Lothar Wa\303\237mann <LW-bxm8fMRDkQLDiMYJYoSAnRvVK+yQ3ZXh@public.gmane.org>" - Fabio Estevam <fabio.estevam-3arQi8VN3Tc@public.gmane.org> - Bai Ping <ping.bai-3arQi8VN3Tc@public.gmane.org> - Anson Huang <Anson.Huang-3arQi8VN3Tc@public.gmane.org> - Dong Aisheng <aisheng.dong-3arQi8VN3Tc@public.gmane.org> - Octavian Purdila <octavian.purdila-3arQi8VN3Tc@public.gmane.org> - devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-pm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org - " linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Tue, 2017-07-04 at 11:54 -0700, Eduardo Valentin wrote:\n" @@ -31,19 +15,19 @@ "> > the read through that.\n" "> > \n" "> > @@ -347,29 +348,39 @@ static struct thermal_zone_device_ops imx_tz_ops = {\n" - "> > \302\240static int imx_get_sensor_data(struct platform_device *pdev)\n" - "> > \302\240{\n" - "> > \302\240\tstruct imx_thermal_data *data = platform_get_drvdata(pdev);\n" + "> > ?static int imx_get_sensor_data(struct platform_device *pdev)\n" + "> > ?{\n" + "> > ?\tstruct imx_thermal_data *data = platform_get_drvdata(pdev);\n" "> > -\tstruct regmap *map;\n" "> > +\tstruct device_node *ocotp_np;\n" "> > +\tstruct nvmem_device *ocotp;\n" - "> > \302\240\tint t1, n1;\n" - "> > \302\240\tint ret;\n" - "> > \302\240\tu32 val;\n" - "> > \302\240\tu64 temp64;\n" - "> > \302\240\n" + "> > ?\tint t1, n1;\n" + "> > ?\tint ret;\n" + "> > ?\tu32 val;\n" + "> > ?\tu64 temp64;\n" + "> > ?\n" "> > -\tmap = syscon_regmap_lookup_by_phandle(pdev->dev.of_node,\n" - "> > -\t\t\t\t\t\302\240\302\240\302\240\302\240\302\240\302\240\"fsl,tempmon-data\");\n" + "> > -\t\t\t\t\t??????\"fsl,tempmon-data\");\n" "> > -\tif (IS_ERR(map)) {\n" "> > -\t\tret = PTR_ERR(map);\n" "> > -\t\tdev_err(&pdev->dev, \"failed to get sensor regmap: %d\\n\", ret);\n" @@ -59,13 +43,13 @@ "> > +\t\tret = PTR_ERR(ocotp);\n" "> > +\t\tif (ret != -EPROBE_DEFER)\n" "> > +\t\t\tdev_err(&pdev->dev, \"failed to get fsl,tempmon-data nvmem device: %d\\n\", ret);\n" - "> > \302\240\t\treturn ret;\n" - "> > \302\240\t}\n" - "> > \302\240\n" + "> > ?\t\treturn ret;\n" + "> > ?\t}\n" + "> > ?\n" "> > @@ -404,10 +415,11 @@ static int imx_get_sensor_data(struct platform_device *pdev)\n" - "> > \302\240\tdata->c2 = n1 * data->c1 + 1000 * t1;\n" - "> > \302\240\n" - "> > \302\240\t/* use OTP for thermal grade */\n" + "> > ?\tdata->c2 = n1 * data->c1 + 1000 * t1;\n" + "> > ?\n" + "> > ?\t/* use OTP for thermal grade */\n" "> > -\tret = regmap_read(map, OCOTP_MEM0, &val);\n" "> > -\tif (ret) {\n" "> > -\t\tdev_err(&pdev->dev, \"failed to read temp grade: %d\\n\", ret);\n" @@ -88,10 +72,6 @@ "\n" "--\n" "Regards,\n" - "Leonard\n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" - "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + Leonard -c031952c15211d630676dfdcb45a34ff85df3268fc4637571b425b24d91edc2b +cce486ceaf28763c6107f9d8efa95364fb25605cf55717a142ab6a4db17173d8
diff --git a/a/1.txt b/N2/1.txt index 79179c9..65406fd 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -65,7 +65,3 @@ that doesn't work if the ocotp clock is not enabled. -- Regards, Leonard --- -To unsubscribe from this list: send the line "unsubscribe devicetree" in -the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org -More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N2/content_digest index 0caacda..5d47f8a 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,25 +1,24 @@ "ref\0d1a8ec1ef73aefe6018f6a4923bd04b3ac34a5d4.1497879110.git.leonard.crestez@nxp.com\0" "ref\020170704185400.GB18084@localhost.localdomain\0" - "ref\020170704185400.GB18084-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org\0" - "From\0Leonard Crestez <leonard.crestez-3arQi8VN3Tc@public.gmane.org>\0" + "From\0Leonard Crestez <leonard.crestez@nxp.com>\0" "Subject\0Re: [PATCH] thermal: imx: interpret fsl,tempmon-data through nvmem\0" "Date\0Wed, 5 Jul 2017 15:33:05 +0300\0" - "To\0Eduardo Valentin <edubezval-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" - "Cc\0Shawn Guo <shawnguo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>" - Srinivas Kandagatla <srinivas.kandagatla-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> - Zhang Rui <rui.zhang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> - Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> - Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org> - " Lothar Wa\303\237mann <LW-bxm8fMRDkQLDiMYJYoSAnRvVK+yQ3ZXh@public.gmane.org>" - Fabio Estevam <fabio.estevam-3arQi8VN3Tc@public.gmane.org> - Bai Ping <ping.bai-3arQi8VN3Tc@public.gmane.org> - Anson Huang <Anson.Huang-3arQi8VN3Tc@public.gmane.org> - Dong Aisheng <aisheng.dong-3arQi8VN3Tc@public.gmane.org> - Octavian Purdila <octavian.purdila-3arQi8VN3Tc@public.gmane.org> - devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-pm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org - " linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" + "To\0Eduardo Valentin <edubezval@gmail.com>\0" + "Cc\0Shawn Guo <shawnguo@kernel.org>" + Srinivas Kandagatla <srinivas.kandagatla@linaro.org> + Zhang Rui <rui.zhang@intel.com> + Rob Herring <robh+dt@kernel.org> + Mark Rutland <mark.rutland@arm.com> + " Lothar Wa\303\237mann <LW@karo-electronics.de>" + Fabio Estevam <fabio.estevam@nxp.com> + Bai Ping <ping.bai@nxp.com> + Anson Huang <Anson.Huang@nxp.com> + Dong Aisheng <aisheng.dong@nxp.com> + Octavian Purdila <octavian.purdila@nxp.com> + devicetree@vger.kernel.org + linux-pm@vger.kernel.org + linux-arm-kernel@lists.infradead.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "On Tue, 2017-07-04 at 11:54 -0700, Eduardo Valentin wrote:\n" @@ -88,10 +87,6 @@ "\n" "--\n" "Regards,\n" - "Leonard\n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" - "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + Leonard -c031952c15211d630676dfdcb45a34ff85df3268fc4637571b425b24d91edc2b +90742031b8413c1520a716e087b8ffd2b0afa0a7ed9d359284634ddcd67cde46
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.