diff for duplicates of <52C2A30E.5010705@redhat.com> diff --git a/a/1.txt b/N1/1.txt index 15075a2..c071a25 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -10,7 +10,7 @@ On 12/27/2013 05:34 PM, Guenter Roeck wrote: >> the internal temperature sensor can be used to measure the SoC temperature >> independent of there actually being a touchscreen attached to the controller. >> ->> Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +>> Signed-off-by: Hans de Goede <hdegoede@redhat.com> > > Hi Hans, > @@ -18,7 +18,7 @@ On 12/27/2013 05:34 PM, Guenter Roeck wrote: > Assuming you fix the nitpicks and the question is not a concern, > feel free to add > -> Reviewed-by: Guenter Roeck <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org> +> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > > Guenter > @@ -54,10 +54,10 @@ On 12/27/2013 05:34 PM, Guenter Roeck wrote: >> +++ b/drivers/input/touchscreen/sun4i-ts.c >> @@ -3,6 +3,9 @@ >> * ->> * Copyright (C) 2013 - 2014 Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +>> * Copyright (C) 2013 - 2014 Hans de Goede <hdegoede@redhat.com> >> * >> + * The hwmon parts are based on work by Corentin LABBE which is: ->> + * Copyright (C) 2013 Corentin LABBE <clabbe.montjoie-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> +>> + * Copyright (C) 2013 Corentin LABBE <clabbe.montjoie@gmail.com> >> + * >> * This program is free software; you can redistribute it and/or modify >> * it under the terms of the GNU General Public License as published by @@ -137,7 +137,7 @@ Yes what is being read is a 12 bit unsigned value, with all the upper bits set t >> + struct sun4i_ts_data *ts = dev_get_drvdata(dev); >> + >> + /* No temp_data until the first irq */ ->> + if (ts->temp_data == -1) +>> + if (ts->temp_data = -1) >> + return -EAGAIN; >> + >> + return sprintf(buf, "%d\n", (ts->temp_data - 1447) * 100); @@ -163,7 +163,7 @@ Yes what is being read is a 12 bit unsigned value, with all the upper bits set t >> { >> struct sun4i_ts_data *ts; >> struct device *dev = &pdev->dev; ->> + struct device_node *np =dev->of_node; +>> + struct device_node *np Þv->of_node; > > Missing space after '=' (checkpatch error). > @@ -240,3 +240,8 @@ Oops, should have run checkpatch on v2 too, my bad. Both fixed now. Regards, Hans + +_______________________________________________ +lm-sensors mailing list +lm-sensors@lm-sensors.org +http://lists.lm-sensors.org/mailman/listinfo/lm-sensors diff --git a/a/content_digest b/N1/content_digest index 9e48af9..2d6b231 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,9 +2,9 @@ "ref\01388156399-29677-3-git-send-email-hdegoede@redhat.com\0" "ref\020131227163419.GA20135@roeck-us.net\0" "ref\020131227163419.GA20135-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org\0" - "From\0Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\0" + "From\0Hans de Goede <hdegoede@redhat.com>\0" "Subject\0Re: [lm-sensors] [PATCH v2 2/5] input: sun4i-ts: Add support for temperature sensor\0" - "Date\0Tue, 31 Dec 2013 11:57:18 +0100\0" + "Date\0Tue, 31 Dec 2013 10:57:18 +0000\0" "To\0Guenter Roeck <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>\0" "Cc\0Dmitry Torokhov <dmitry.torokhov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>" LM Sensors <lm-sensors-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org> @@ -27,7 +27,7 @@ ">> the internal temperature sensor can be used to measure the SoC temperature\n" ">> independent of there actually being a touchscreen attached to the controller.\n" ">>\n" - ">> Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\n" + ">> Signed-off-by: Hans de Goede <hdegoede@redhat.com>\n" ">\n" "> Hi Hans,\n" ">\n" @@ -35,7 +35,7 @@ "> Assuming you fix the nitpicks and the question is not a concern,\n" "> feel free to add\n" ">\n" - "> Reviewed-by: Guenter Roeck <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>\n" + "> Reviewed-by: Guenter Roeck <linux@roeck-us.net>\n" ">\n" "> Guenter\n" ">\n" @@ -71,10 +71,10 @@ ">> +++ b/drivers/input/touchscreen/sun4i-ts.c\n" ">> @@ -3,6 +3,9 @@\n" ">> *\n" - ">> * Copyright (C) 2013 - 2014 Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\n" + ">> * Copyright (C) 2013 - 2014 Hans de Goede <hdegoede@redhat.com>\n" ">> *\n" ">> + * The hwmon parts are based on work by Corentin LABBE which is:\n" - ">> + * Copyright (C) 2013 Corentin LABBE <clabbe.montjoie-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" + ">> + * Copyright (C) 2013 Corentin LABBE <clabbe.montjoie@gmail.com>\n" ">> + *\n" ">> * This program is free software; you can redistribute it and/or modify\n" ">> * it under the terms of the GNU General Public License as published by\n" @@ -154,7 +154,7 @@ ">> +\tstruct sun4i_ts_data *ts = dev_get_drvdata(dev);\n" ">> +\n" ">> +\t/* No temp_data until the first irq */\n" - ">> +\tif (ts->temp_data == -1)\n" + ">> +\tif (ts->temp_data = -1)\n" ">> +\t\treturn -EAGAIN;\n" ">> +\n" ">> +\treturn sprintf(buf, \"%d\\n\", (ts->temp_data - 1447) * 100);\n" @@ -180,7 +180,7 @@ ">> {\n" ">> \tstruct sun4i_ts_data *ts;\n" ">> \tstruct device *dev = &pdev->dev;\n" - ">> +\tstruct device_node *np =dev->of_node;\n" + ">> +\tstruct device_node *np \303\236v->of_node;\n" ">\n" "> Missing space after '=' (checkpatch error).\n" ">\n" @@ -256,6 +256,11 @@ "\n" "Regards,\n" "\n" - Hans + "Hans\n" + "\n" + "_______________________________________________\n" + "lm-sensors mailing list\n" + "lm-sensors@lm-sensors.org\n" + http://lists.lm-sensors.org/mailman/listinfo/lm-sensors -82ea81f8f283388841e5471cdbfa2134997ea5557ab65b1be31a8886ddcbf05a +4462e42f26c0e61829d8ef42ea1be614d9cda27ac20876855dab527bb82cfe3e
diff --git a/a/1.txt b/N2/1.txt index 15075a2..d830c88 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -10,7 +10,7 @@ On 12/27/2013 05:34 PM, Guenter Roeck wrote: >> the internal temperature sensor can be used to measure the SoC temperature >> independent of there actually being a touchscreen attached to the controller. >> ->> Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +>> Signed-off-by: Hans de Goede <hdegoede@redhat.com> > > Hi Hans, > @@ -18,7 +18,7 @@ On 12/27/2013 05:34 PM, Guenter Roeck wrote: > Assuming you fix the nitpicks and the question is not a concern, > feel free to add > -> Reviewed-by: Guenter Roeck <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org> +> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > > Guenter > @@ -42,7 +42,7 @@ On 12/27/2013 05:34 PM, Guenter Roeck wrote: >> + >> Example: >> ->> rtp: rtp@01c25000 { +>> rtp: rtp at 01c25000 { >> compatible = "allwinner,sun4i-ts"; >> reg = <0x01c25000 0x100>; >> interrupts = <29>; @@ -54,10 +54,10 @@ On 12/27/2013 05:34 PM, Guenter Roeck wrote: >> +++ b/drivers/input/touchscreen/sun4i-ts.c >> @@ -3,6 +3,9 @@ >> * ->> * Copyright (C) 2013 - 2014 Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +>> * Copyright (C) 2013 - 2014 Hans de Goede <hdegoede@redhat.com> >> * >> + * The hwmon parts are based on work by Corentin LABBE which is: ->> + * Copyright (C) 2013 Corentin LABBE <clabbe.montjoie-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> +>> + * Copyright (C) 2013 Corentin LABBE <clabbe.montjoie@gmail.com> >> + * >> * This program is free software; you can redistribute it and/or modify >> * it under the terms of the GNU General Public License as published by diff --git a/a/content_digest b/N2/content_digest index 9e48af9..a578be3 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,18 +1,10 @@ "ref\01388156399-29677-1-git-send-email-hdegoede@redhat.com\0" "ref\01388156399-29677-3-git-send-email-hdegoede@redhat.com\0" "ref\020131227163419.GA20135@roeck-us.net\0" - "ref\020131227163419.GA20135-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org\0" - "From\0Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\0" - "Subject\0Re: [lm-sensors] [PATCH v2 2/5] input: sun4i-ts: Add support for temperature sensor\0" + "From\0hdegoede@redhat.com (Hans de Goede)\0" + "Subject\0[lm-sensors] [PATCH v2 2/5] input: sun4i-ts: Add support for temperature sensor\0" "Date\0Tue, 31 Dec 2013 11:57:18 +0100\0" - "To\0Guenter Roeck <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>\0" - "Cc\0Dmitry Torokhov <dmitry.torokhov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>" - LM Sensors <lm-sensors-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org> - linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org - Corentin LABBE <clabbe.montjoie-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> - linux-input-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> - " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi,\n" @@ -27,7 +19,7 @@ ">> the internal temperature sensor can be used to measure the SoC temperature\n" ">> independent of there actually being a touchscreen attached to the controller.\n" ">>\n" - ">> Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\n" + ">> Signed-off-by: Hans de Goede <hdegoede@redhat.com>\n" ">\n" "> Hi Hans,\n" ">\n" @@ -35,7 +27,7 @@ "> Assuming you fix the nitpicks and the question is not a concern,\n" "> feel free to add\n" ">\n" - "> Reviewed-by: Guenter Roeck <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>\n" + "> Reviewed-by: Guenter Roeck <linux@roeck-us.net>\n" ">\n" "> Guenter\n" ">\n" @@ -59,7 +51,7 @@ ">> +\n" ">> Example:\n" ">>\n" - ">> \trtp: rtp@01c25000 {\n" + ">> \trtp: rtp at 01c25000 {\n" ">> \t\tcompatible = \"allwinner,sun4i-ts\";\n" ">> \t\treg = <0x01c25000 0x100>;\n" ">> \t\tinterrupts = <29>;\n" @@ -71,10 +63,10 @@ ">> +++ b/drivers/input/touchscreen/sun4i-ts.c\n" ">> @@ -3,6 +3,9 @@\n" ">> *\n" - ">> * Copyright (C) 2013 - 2014 Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\n" + ">> * Copyright (C) 2013 - 2014 Hans de Goede <hdegoede@redhat.com>\n" ">> *\n" ">> + * The hwmon parts are based on work by Corentin LABBE which is:\n" - ">> + * Copyright (C) 2013 Corentin LABBE <clabbe.montjoie-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" + ">> + * Copyright (C) 2013 Corentin LABBE <clabbe.montjoie@gmail.com>\n" ">> + *\n" ">> * This program is free software; you can redistribute it and/or modify\n" ">> * it under the terms of the GNU General Public License as published by\n" @@ -258,4 +250,4 @@ "\n" Hans -82ea81f8f283388841e5471cdbfa2134997ea5557ab65b1be31a8886ddcbf05a +a2b87cd62caab2b93934ff794cece7b92412e8ffde780c49ce4a764d1e1d360f
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.