| Message ID | 1402943069-19420-2-git-send-email-hdegoede@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Hans, On Mon, Jun 16, 2014 at 08:24:28PM +0200, Hans de Goede wrote: > Testing has revealed that the temperature in the rtp controller of the A10 > (sun4i) SoC has a resolution of 50 milli degrees / step, where as the > A13 (sun5i) and later models have 100 milli degrees / step. > > Add a new sun5i-a13-ts compatible to differentiate the newer models and > set the resolution based on the compatible string. > > This fixes the temperature reported on the A10 being twice as high as expected. Should we maybe add explicit temperature steps property so that we won;t need to patch again if they decided to change resolution again? Thanks.
Hi, On 06/16/2014 11:30 PM, Dmitry Torokhov wrote: > Hi Hans, > > On Mon, Jun 16, 2014 at 08:24:28PM +0200, Hans de Goede wrote: >> Testing has revealed that the temperature in the rtp controller of the A10 >> (sun4i) SoC has a resolution of 50 milli degrees / step, where as the >> A13 (sun5i) and later models have 100 milli degrees / step. >> >> Add a new sun5i-a13-ts compatible to differentiate the newer models and >> set the resolution based on the compatible string. >> >> This fixes the temperature reported on the A10 being twice as high as expected. > > Should we maybe add explicit temperature steps property so that we won;t > need to patch again if they decided to change resolution again? I can understand where your coming from, but in general the rule for devicetree bindings is to not add properties for things which are purely dependent on the SoC generation. Those must be deferred from the compatible string. Regards, Hans -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, On 06/16/2014 11:30 PM, Dmitry Torokhov wrote: > Hi Hans, > > On Mon, Jun 16, 2014 at 08:24:28PM +0200, Hans de Goede wrote: >> Testing has revealed that the temperature in the rtp controller of the A10 >> (sun4i) SoC has a resolution of 50 milli degrees / step, where as the >> A13 (sun5i) and later models have 100 milli degrees / step. >> >> Add a new sun5i-a13-ts compatible to differentiate the newer models and >> set the resolution based on the compatible string. >> >> This fixes the temperature reported on the A10 being twice as high as expected. > > Should we maybe add explicit temperature steps property so that we won;t > need to patch again if they decided to change resolution again? Self NAK, further testing has revealed that it is likely not the resolution which is different on the A10, but that we need to apply a different offset. Regards, Hans -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/devicetree/bindings/input/touchscreen/sun4i.txt b/Documentation/devicetree/bindings/input/touchscreen/sun4i.txt index aef5779..5106709 100644 --- a/Documentation/devicetree/bindings/input/touchscreen/sun4i.txt +++ b/Documentation/devicetree/bindings/input/touchscreen/sun4i.txt @@ -2,7 +2,7 @@ sun4i resistive touchscreen controller -------------------------------------- Required properties: - - compatible: "allwinner,sun4i-a10-ts" + - compatible: "allwinner,sun4i-a10-ts" or "allwinner,sun5i-a13-ts" - reg: mmio address range of the chip - interrupts: interrupt to which the chip is connected diff --git a/drivers/input/touchscreen/sun4i-ts.c b/drivers/input/touchscreen/sun4i-ts.c index 2ba8260..5661be0 100644 --- a/drivers/input/touchscreen/sun4i-ts.c +++ b/drivers/input/touchscreen/sun4i-ts.c @@ -111,6 +111,7 @@ struct sun4i_ts_data { unsigned int irq; bool ignore_fifo_data; int temp_data; + int temp_step; }; static void sun4i_ts_irq_handle_input(struct sun4i_ts_data *ts, u32 reg_val) @@ -189,7 +190,7 @@ static ssize_t show_temp(struct device *dev, struct device_attribute *devattr, if (ts->temp_data == -1) return -EAGAIN; - return sprintf(buf, "%d\n", (ts->temp_data - 1447) * 100); + return sprintf(buf, "%d\n", (ts->temp_data - 1447) * ts->temp_step); } static ssize_t show_temp_label(struct device *dev, @@ -224,6 +225,10 @@ static int sun4i_ts_probe(struct platform_device *pdev) ts->dev = dev; ts->ignore_fifo_data = true; ts->temp_data = -1; + if (of_device_is_compatible(np, "allwinner,sun4i-a10-ts")) + ts->temp_step = 50; + else + ts->temp_step = 100; ts_attached = of_property_read_bool(np, "allwinner,ts-attached"); if (ts_attached) { @@ -318,6 +323,7 @@ static int sun4i_ts_remove(struct platform_device *pdev) static const struct of_device_id sun4i_ts_of_match[] = { { .compatible = "allwinner,sun4i-a10-ts", }, + { .compatible = "allwinner,sun5i-a13-ts", }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, sun4i_ts_of_match);
Testing has revealed that the temperature in the rtp controller of the A10 (sun4i) SoC has a resolution of 50 milli degrees / step, where as the A13 (sun5i) and later models have 100 milli degrees / step. Add a new sun5i-a13-ts compatible to differentiate the newer models and set the resolution based on the compatible string. This fixes the temperature reported on the A10 being twice as high as expected. Reported-by: Tong Zhang <lovewilliam@gmail.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- Documentation/devicetree/bindings/input/touchscreen/sun4i.txt | 2 +- drivers/input/touchscreen/sun4i-ts.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-)