diff for duplicates of <1483927934.2281.3.camel@intel.com> diff --git a/a/1.txt b/N1/1.txt index d53e1a8..415cdbf 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -46,7 +46,7 @@ On Sun, 2017-01-08 at 11:17 +0000, Jonathan Cameron wrote: > > > Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org> > > One comment inline but not a blocker. > > -> > I would ideally like an ack from the thermal side. The relevant +> > I would ideally like an ack from the thermal side.??The relevant > > code > > is small, but best to be sure and keep them in the loop as well. > > @@ -70,7 +70,7 @@ On Sun, 2017-01-08 at 11:17 +0000, Jonathan Cameron wrote: > Jonathan > > > > -> > +> >? > > > + > > > +static int sun4i_gpadc_probe(struct platform_device *pdev) > > > +{ @@ -106,50 +106,50 @@ On Sun, 2017-01-08 at 11:17 +0000, Jonathan Cameron wrote: > > > *)platform_get_device_id(pdev)->driver_data; > > > + > > > + /* -> > > + * Since the controller needs to be in touchscreen mode +> > > + ?* Since the controller needs to be in touchscreen mode > > > for its thermal -> > > + * sensor to operate properly, and that switching +> > > + ?* sensor to operate properly, and that switching > > > between the two modes -> > > + * needs a delay, always registering in the thermal +> > > + ?* needs a delay, always registering in the thermal > > > framework will -> > > + * significantly slow down the conversion rate of the +> > > + ?* significantly slow down the conversion rate of the > > > ADCs. -> > > + * -> > > + * Therefore, instead of depending on THERMAL_OF in +> > > + ?* +> > > + ?* Therefore, instead of depending on THERMAL_OF in > > > Kconfig, we only -> > > + * register the sensor if that option is enabled, +> > > + ?* register the sensor if that option is enabled, > > > eventually leaving -> > > + * that choice to the user. -> > > + */ +> > > + ?* that choice to the user. +> > > + ?*/ > > > + > > > + if (IS_ENABLED(CONFIG_THERMAL_OF)) { > > > + /* -> > > + * This driver is a child of an MFD which has a +> > > + ?* This driver is a child of an MFD which has a > > > node in the DT -> > > + * but not its children, because of DT backward +> > > + ?* but not its children, because of DT backward > > > compatibility -> > > + * for A10, A13 and A31 SoCs. Therefore, the +> > > + ?* for A10, A13 and A31 SoCs. Therefore, the > > > resulting devices -> > > + * of this driver do not have an of_node +> > > + ?* of this driver do not have an of_node > > > variable. -> > > + * However, its parent (the MFD driver) has an +> > > + ?* However, its parent (the MFD driver) has an > > > of_node variable -> > > + * and since +> > > + ?* and since > > > devm_thermal_zone_of_sensor_register uses its first -> > > + * argument to match the phandle defined in the +> > > + ?* argument to match the phandle defined in the > > > node of the -> > > + * thermal driver with the of_node of the device +> > > + ?* thermal driver with the of_node of the device > > > passed as first -> > > + * argument and the third argument to call ops +> > > + ?* argument and the third argument to call ops > > > from -> > > + * thermal_zone_of_device_ops, the solution is +> > > + ?* thermal_zone_of_device_ops, the solution is > > > to use the parent -> > > + * device as first argument to match the phandle +> > > + ?* device as first argument to match the phandle > > > with its -> > > + * of_node, and the device from this driver as +> > > + ?* of_node, and the device from this driver as > > > third argument to -> > > + * return the temperature. -> > > + */ +> > > + ?* return the temperature. +> > > + ?*/ I'd leave this for Eduardo. thanks, @@ -157,8 +157,8 @@ rui > > > + struct thermal_zone_device *tzd; > > > + tzd = devm_thermal_zone_of_sensor_register(pdev- > > > >dev.parent, 0, -> > > + info, -> > > + &sun4 +> > > + ???info, +> > > + ???&sun4 > > > i_ts_tz_ops); > > > + if (IS_ERR(tzd)) { > > > + dev_err(&pdev->dev, @@ -177,7 +177,7 @@ rui > > > + } > > > + > > > + pm_runtime_set_autosuspend_delay(&pdev->dev, -> > > + SUN4I_GPADC_AUTOSUSPEND +> > > + ?SUN4I_GPADC_AUTOSUSPEND > > > _DELAY); > > > + pm_runtime_use_autosuspend(&pdev->dev); > > > + pm_runtime_set_suspended(&pdev->dev); @@ -185,20 +185,20 @@ rui > > > + > > > + if (IS_ENABLED(CONFIG_THERMAL_OF)) { > > > + ret = sun4i_irq_init(pdev, "TEMP_DATA_PENDING", -> > > + sun4i_gpadc_temp_data_irq_h +> > > + ?????sun4i_gpadc_temp_data_irq_h > > > andler, -> > > + "temp_data", &info- +> > > + ?????"temp_data", &info- > > > >temp_data_irq, -> > > + &info- +> > > + ?????&info- > > > >ignore_temp_data_irq); > > > + if (ret < 0) > > > + goto err; > > > + } > > > + > > > + ret = sun4i_irq_init(pdev, "FIFO_DATA_PENDING", -> > > + sun4i_gpadc_fifo_data_irq_handler, +> > > + ?????sun4i_gpadc_fifo_data_irq_handler, > > > "fifo_data", -> > > + &info->fifo_data_irq, &info- +> > > + ?????&info->fifo_data_irq, &info- > > > >ignore_fifo_data_irq); > > > + if (ret < 0) > > > + goto err; @@ -278,34 +278,34 @@ rui > > > --- a/include/linux/mfd/sun4i-gpadc.h > > > +++ b/include/linux/mfd/sun4i-gpadc.h > > > @@ -28,6 +28,7 @@ -> > > #define SUN4I_GPADC_CTRL1_TP_MODE_EN BIT( +> > > ?#define SUN4I_GPADC_CTRL1_TP_MODE_EN BIT( > > > 4) -> > > #define SUN4I_GPADC_CTRL1_TP_ADC_SELECT B +> > > ?#define SUN4I_GPADC_CTRL1_TP_ADC_SELECT B > > > IT(3) -> > > #define SUN4I_GPADC_CTRL1_ADC_CHAN_SELECT(x) (GEN +> > > ?#define SUN4I_GPADC_CTRL1_ADC_CHAN_SELECT(x) (GEN > > > MASK(2, 0) & (x)) > > > +#define SUN4I_GPADC_CTRL1_ADC_CHAN_MASK G > > > ENMASK(2, 0) -> > > -> > > /* TP_CTRL1 bits for sun6i SOCs */ -> > > #define SUN6I_GPADC_CTRL1_TOUCH_PAN_CALI_EN BIT(7 +> > > ? +> > > ?/* TP_CTRL1 bits for sun6i SOCs */ +> > > ?#define SUN6I_GPADC_CTRL1_TOUCH_PAN_CALI_EN BIT(7 > > > ) > > > @@ -35,6 +36,7 @@ -> > > #define SUN6I_GPADC_CTRL1_TP_MODE_EN BIT( +> > > ?#define SUN6I_GPADC_CTRL1_TP_MODE_EN BIT( > > > 5) -> > > #define SUN6I_GPADC_CTRL1_TP_ADC_SELECT B +> > > ?#define SUN6I_GPADC_CTRL1_TP_ADC_SELECT B > > > IT(4) -> > > #define SUN6I_GPADC_CTRL1_ADC_CHAN_SELECT(x) (GEN +> > > ?#define SUN6I_GPADC_CTRL1_ADC_CHAN_SELECT(x) (GEN > > > MASK(3, 0) & BIT(x)) > > > +#define SUN6I_GPADC_CTRL1_ADC_CHAN_MASK G > > > ENMASK(3, 0) -> > > -> > > #define SUN4I_GPADC_CTRL2 0x08 -> > > +> > > ? +> > > ?#define SUN4I_GPADC_CTRL2 0x08 +> > > ? > > > > > -- > > To unsubscribe from this list: send the line "unsubscribe linux- > > iio" in -> > the body of a message to majordomo@vger.kernel.org -> > More majordomo info at http://vger.kernel.org/majordomo-info.html +> > the body of a message to majordomo at vger.kernel.org +> > More majordomo info at??http://vger.kernel.org/majordomo-info.html > > diff --git a/a/content_digest b/N1/content_digest index 7118808..eb716ad 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,24 +2,10 @@ "ref\020161213143332.24988-4-quentin.schulz@free-electrons.com\0" "ref\08132b799-6c6e-fc74-ebac-6959ac4c97a7@kernel.org\0" "ref\0f8285a90-656f-0da4-ee81-47b79ce4cd2c@kernel.org\0" - "From\0Zhang Rui <rui.zhang@intel.com>\0" - "Subject\0Re: [PATCH v9 3/3] iio: adc: add support for Allwinner SoCs ADC\0" + "From\0rui.zhang@intel.com (Zhang Rui)\0" + "Subject\0[PATCH v9 3/3] iio: adc: add support for Allwinner SoCs ADC\0" "Date\0Mon, 09 Jan 2017 10:12:14 +0800\0" - "To\0Jonathan Cameron <jic23@kernel.org>" - Quentin Schulz <quentin.schulz@free-electrons.com> - linux@armlinux.org.uk - maxime.ripard@free-electrons.com - wens@csie.org - knaack.h@gmx.de - lars@metafoo.de - pmeerw@pmeerw.net - " lee.jones@linaro.org\0" - "Cc\0linux-arm-kernel@lists.infradead.org" - linux-kernel@vger.kernel.org - linux-iio@vger.kernel.org - antoine.tenart@free-electrons.com - thomas.petazzoni@free-electrons.com - " edubezval@gmail.com <edubezval@gmail.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi,\n" @@ -70,7 +56,7 @@ "> > > Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org>\n" "> > One comment inline but not a blocker.\n" "> > \n" - "> > I would ideally like an ack from the thermal side.\302\240\302\240The relevant\n" + "> > I would ideally like an ack from the thermal side.??The relevant\n" "> > code\n" "> > is small, but best to be sure and keep them in the loop as well.\n" "> > \n" @@ -94,7 +80,7 @@ "> Jonathan\n" "> > \n" "> > \n" - "> >\302\240\n" + "> >?\n" "> > > +\n" "> > > +static int sun4i_gpadc_probe(struct platform_device *pdev)\n" "> > > +{\n" @@ -130,50 +116,50 @@ "> > > *)platform_get_device_id(pdev)->driver_data;\n" "> > > +\n" "> > > +\t/*\n" - "> > > +\t\302\240* Since the controller needs to be in touchscreen mode\n" + "> > > +\t?* Since the controller needs to be in touchscreen mode\n" "> > > for its thermal\n" - "> > > +\t\302\240* sensor to operate properly, and that switching\n" + "> > > +\t?* sensor to operate properly, and that switching\n" "> > > between the two modes\n" - "> > > +\t\302\240* needs a delay, always registering in the thermal\n" + "> > > +\t?* needs a delay, always registering in the thermal\n" "> > > framework will\n" - "> > > +\t\302\240* significantly slow down the conversion rate of the\n" + "> > > +\t?* significantly slow down the conversion rate of the\n" "> > > ADCs.\n" - "> > > +\t\302\240*\n" - "> > > +\t\302\240* Therefore, instead of depending on THERMAL_OF in\n" + "> > > +\t?*\n" + "> > > +\t?* Therefore, instead of depending on THERMAL_OF in\n" "> > > Kconfig, we only\n" - "> > > +\t\302\240* register the sensor if that option is enabled,\n" + "> > > +\t?* register the sensor if that option is enabled,\n" "> > > eventually leaving\n" - "> > > +\t\302\240* that choice to the user.\n" - "> > > +\t\302\240*/\n" + "> > > +\t?* that choice to the user.\n" + "> > > +\t?*/\n" "> > > +\n" "> > > +\tif (IS_ENABLED(CONFIG_THERMAL_OF)) {\n" "> > > +\t\t/*\n" - "> > > +\t\t\302\240* This driver is a child of an MFD which has a\n" + "> > > +\t\t?* This driver is a child of an MFD which has a\n" "> > > node in the DT\n" - "> > > +\t\t\302\240* but not its children, because of DT backward\n" + "> > > +\t\t?* but not its children, because of DT backward\n" "> > > compatibility\n" - "> > > +\t\t\302\240* for A10, A13 and A31 SoCs. Therefore, the\n" + "> > > +\t\t?* for A10, A13 and A31 SoCs. Therefore, the\n" "> > > resulting devices\n" - "> > > +\t\t\302\240* of this driver do not have an of_node\n" + "> > > +\t\t?* of this driver do not have an of_node\n" "> > > variable.\n" - "> > > +\t\t\302\240* However, its parent (the MFD driver) has an\n" + "> > > +\t\t?* However, its parent (the MFD driver) has an\n" "> > > of_node variable\n" - "> > > +\t\t\302\240* and since\n" + "> > > +\t\t?* and since\n" "> > > devm_thermal_zone_of_sensor_register uses its first\n" - "> > > +\t\t\302\240* argument to match the phandle defined in the\n" + "> > > +\t\t?* argument to match the phandle defined in the\n" "> > > node of the\n" - "> > > +\t\t\302\240* thermal driver with the of_node of the device\n" + "> > > +\t\t?* thermal driver with the of_node of the device\n" "> > > passed as first\n" - "> > > +\t\t\302\240* argument and the third argument to call ops\n" + "> > > +\t\t?* argument and the third argument to call ops\n" "> > > from\n" - "> > > +\t\t\302\240* thermal_zone_of_device_ops, the solution is\n" + "> > > +\t\t?* thermal_zone_of_device_ops, the solution is\n" "> > > to use the parent\n" - "> > > +\t\t\302\240* device as first argument to match the phandle\n" + "> > > +\t\t?* device as first argument to match the phandle\n" "> > > with its\n" - "> > > +\t\t\302\240* of_node, and the device from this driver as\n" + "> > > +\t\t?* of_node, and the device from this driver as\n" "> > > third argument to\n" - "> > > +\t\t\302\240* return the temperature.\n" - "> > > +\t\t\302\240*/\n" + "> > > +\t\t?* return the temperature.\n" + "> > > +\t\t?*/\n" "I'd leave this for Eduardo.\n" "\n" "thanks,\n" @@ -181,8 +167,8 @@ "> > > +\t\tstruct thermal_zone_device *tzd;\n" "> > > +\t\ttzd = devm_thermal_zone_of_sensor_register(pdev-\n" "> > > >dev.parent, 0,\n" - "> > > +\t\t\t\t\t\t\t\302\240\302\240\302\240info,\n" - "> > > +\t\t\t\t\t\t\t\302\240\302\240\302\240&sun4\n" + "> > > +\t\t\t\t\t\t\t???info,\n" + "> > > +\t\t\t\t\t\t\t???&sun4\n" "> > > i_ts_tz_ops);\n" "> > > +\t\tif (IS_ERR(tzd)) {\n" "> > > +\t\t\tdev_err(&pdev->dev,\n" @@ -201,7 +187,7 @@ "> > > +\t}\n" "> > > +\n" "> > > +\tpm_runtime_set_autosuspend_delay(&pdev->dev,\n" - "> > > +\t\t\t\t\t\302\240SUN4I_GPADC_AUTOSUSPEND\n" + "> > > +\t\t\t\t\t?SUN4I_GPADC_AUTOSUSPEND\n" "> > > _DELAY);\n" "> > > +\tpm_runtime_use_autosuspend(&pdev->dev);\n" "> > > +\tpm_runtime_set_suspended(&pdev->dev);\n" @@ -209,20 +195,20 @@ "> > > +\n" "> > > +\tif (IS_ENABLED(CONFIG_THERMAL_OF)) {\n" "> > > +\t\tret = sun4i_irq_init(pdev, \"TEMP_DATA_PENDING\",\n" - "> > > +\t\t\t\t\302\240\302\240\302\240\302\240\302\240sun4i_gpadc_temp_data_irq_h\n" + "> > > +\t\t\t\t?????sun4i_gpadc_temp_data_irq_h\n" "> > > andler,\n" - "> > > +\t\t\t\t\302\240\302\240\302\240\302\240\302\240\"temp_data\", &info-\n" + "> > > +\t\t\t\t?????\"temp_data\", &info-\n" "> > > >temp_data_irq,\n" - "> > > +\t\t\t\t\302\240\302\240\302\240\302\240\302\240&info-\n" + "> > > +\t\t\t\t?????&info-\n" "> > > >ignore_temp_data_irq);\n" "> > > +\t\tif (ret < 0)\n" "> > > +\t\t\tgoto err;\n" "> > > +\t}\n" "> > > +\n" "> > > +\tret = sun4i_irq_init(pdev, \"FIFO_DATA_PENDING\",\n" - "> > > +\t\t\t\302\240\302\240\302\240\302\240\302\240sun4i_gpadc_fifo_data_irq_handler,\n" + "> > > +\t\t\t?????sun4i_gpadc_fifo_data_irq_handler,\n" "> > > \"fifo_data\",\n" - "> > > +\t\t\t\302\240\302\240\302\240\302\240\302\240&info->fifo_data_irq, &info-\n" + "> > > +\t\t\t?????&info->fifo_data_irq, &info-\n" "> > > >ignore_fifo_data_irq);\n" "> > > +\tif (ret < 0)\n" "> > > +\t\tgoto err;\n" @@ -302,36 +288,36 @@ "> > > --- a/include/linux/mfd/sun4i-gpadc.h\n" "> > > +++ b/include/linux/mfd/sun4i-gpadc.h\n" "> > > @@ -28,6 +28,7 @@\n" - "> > > \302\240#define SUN4I_GPADC_CTRL1_TP_MODE_EN\t\t\tBIT(\n" + "> > > ?#define SUN4I_GPADC_CTRL1_TP_MODE_EN\t\t\tBIT(\n" "> > > 4)\n" - "> > > \302\240#define SUN4I_GPADC_CTRL1_TP_ADC_SELECT\t\t\tB\n" + "> > > ?#define SUN4I_GPADC_CTRL1_TP_ADC_SELECT\t\t\tB\n" "> > > IT(3)\n" - "> > > \302\240#define SUN4I_GPADC_CTRL1_ADC_CHAN_SELECT(x)\t\t(GEN\n" + "> > > ?#define SUN4I_GPADC_CTRL1_ADC_CHAN_SELECT(x)\t\t(GEN\n" "> > > MASK(2, 0) & (x))\n" "> > > +#define SUN4I_GPADC_CTRL1_ADC_CHAN_MASK\t\t\tG\n" "> > > ENMASK(2, 0)\n" - "> > > \302\240\n" - "> > > \302\240/* TP_CTRL1 bits for sun6i SOCs */\n" - "> > > \302\240#define SUN6I_GPADC_CTRL1_TOUCH_PAN_CALI_EN\t\tBIT(7\n" + "> > > ?\n" + "> > > ?/* TP_CTRL1 bits for sun6i SOCs */\n" + "> > > ?#define SUN6I_GPADC_CTRL1_TOUCH_PAN_CALI_EN\t\tBIT(7\n" "> > > )\n" "> > > @@ -35,6 +36,7 @@\n" - "> > > \302\240#define SUN6I_GPADC_CTRL1_TP_MODE_EN\t\t\tBIT(\n" + "> > > ?#define SUN6I_GPADC_CTRL1_TP_MODE_EN\t\t\tBIT(\n" "> > > 5)\n" - "> > > \302\240#define SUN6I_GPADC_CTRL1_TP_ADC_SELECT\t\t\tB\n" + "> > > ?#define SUN6I_GPADC_CTRL1_TP_ADC_SELECT\t\t\tB\n" "> > > IT(4)\n" - "> > > \302\240#define SUN6I_GPADC_CTRL1_ADC_CHAN_SELECT(x)\t\t(GEN\n" + "> > > ?#define SUN6I_GPADC_CTRL1_ADC_CHAN_SELECT(x)\t\t(GEN\n" "> > > MASK(3, 0) & BIT(x))\n" "> > > +#define SUN6I_GPADC_CTRL1_ADC_CHAN_MASK\t\t\tG\n" "> > > ENMASK(3, 0)\n" - "> > > \302\240\n" - "> > > \302\240#define SUN4I_GPADC_CTRL2\t\t\t\t0x08\n" - "> > > \302\240\n" + "> > > ?\n" + "> > > ?#define SUN4I_GPADC_CTRL2\t\t\t\t0x08\n" + "> > > ?\n" "> > > \n" "> > --\n" "> > To unsubscribe from this list: send the line \"unsubscribe linux-\n" "> > iio\" in\n" - "> > the body of a message to majordomo@vger.kernel.org\n" - "> > More majordomo info at\302\240\302\240http://vger.kernel.org/majordomo-info.html\n" + "> > the body of a message to majordomo at vger.kernel.org\n" + "> > More majordomo info at??http://vger.kernel.org/majordomo-info.html\n" > > -22f699dabc9771be157376042c6c8b86d245e7a65b695474750df175dc64ec5f +9d7011886ea8524691938ac65c313303531f087932d5c7ca3a682757d4eaa0dd
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.