| Message ID | 20170723141354.42646-3-icenowy@aosc.io (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sun, Jul 23, 2017 at 10:13 PM, Icenowy Zheng <icenowy@aosc.io> wrote: > As the H3 SoC, which is also in sun8i line, has totally different > register map for the thermal sensor (a cut down version of GPADC), we > should rename A23/A33-specified registers to contain A23, in order to > prevent obfuscation with H3 registers. Currently these registers are > only prefixed "SUN8I", not "SUN8I_A23". > > Add "_A23" after "SUN8I" on the register names. Nit: the compatible string as well as the initial driver targets the A33. Naming the registers as such would be more consistent. Otherwise, Reviewed-by: Chen-Yu Tsai <wens@csie.org>
在 2017-07-24 14:02，Chen-Yu Tsai 写道： > On Sun, Jul 23, 2017 at 10:13 PM, Icenowy Zheng <icenowy@aosc.io> > wrote: >> As the H3 SoC, which is also in sun8i line, has totally different >> register map for the thermal sensor (a cut down version of GPADC), we >> should rename A23/A33-specified registers to contain A23, in order to >> prevent obfuscation with H3 registers. Currently these registers are >> only prefixed "SUN8I", not "SUN8I_A23". >> >> Add "_A23" after "SUN8I" on the register names. > > Nit: the compatible string as well as the initial driver targets the > A33. > Naming the registers as such would be more consistent. But the registers are the same between A23 and A33. In fact the only difference between A23 and A33 is the formula's factors. > > Otherwise, > > Reviewed-by: Chen-Yu Tsai <wens@csie.org>
On Mon, Jul 24, 2017 at 2:06 PM, <icenowy@aosc.io> wrote: > 在 2017-07-24 14:02，Chen-Yu Tsai 写道： >> >> On Sun, Jul 23, 2017 at 10:13 PM, Icenowy Zheng <icenowy@aosc.io> wrote: >>> >>> As the H3 SoC, which is also in sun8i line, has totally different >>> register map for the thermal sensor (a cut down version of GPADC), we >>> should rename A23/A33-specified registers to contain A23, in order to >>> prevent obfuscation with H3 registers. Currently these registers are >>> only prefixed "SUN8I", not "SUN8I_A23". >>> >>> Add "_A23" after "SUN8I" on the register names. >> >> >> Nit: the compatible string as well as the initial driver targets the A33. >> Naming the registers as such would be more consistent. > > > But the registers are the same between A23 and A33. > > In fact the only difference between A23 and A33 is the formula's factors. The goal here is to keep things consistent. Nothing in this driver as it currently is mentions A23. Unless you plan on adding additional commits to support the A23, and a note explaining the similarity of the A23 and A33 ADCs, this is only going to confuse people. ChenYu > >> >> Otherwise, >> >> Reviewed-by: Chen-Yu Tsai <wens@csie.org> > > > -- > You received this message because you are subscribed to the Google Groups > "linux-sunxi" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to linux-sunxi+unsubscribe@googlegroups.com. > For more options, visit https://groups.google.com/d/optout.
diff --git a/drivers/iio/adc/sun4i-gpadc-iio.c b/drivers/iio/adc/sun4i-gpadc-iio.c index 81d4c39e414a..41769bc6a429 100644 --- a/drivers/iio/adc/sun4i-gpadc-iio.c +++ b/drivers/iio/adc/sun4i-gpadc-iio.c @@ -88,7 +88,7 @@ static const struct gpadc_data sun6i_gpadc_data = { static const struct gpadc_data sun8i_a33_gpadc_data = { .temp_offset = -1662, .temp_scale = 162, - .tp_mode_en = SUN8I_GPADC_CTRL1_CHOP_TEMP_EN, + .tp_mode_en = SUN8I_A23_GPADC_CTRL1_CHOP_TEMP_EN, }; struct sun4i_gpadc_iio { diff --git a/include/linux/mfd/sun4i-gpadc.h b/include/linux/mfd/sun4i-gpadc.h index 139872c2e0fe..d31d962bb7d8 100644 --- a/include/linux/mfd/sun4i-gpadc.h +++ b/include/linux/mfd/sun4i-gpadc.h @@ -38,9 +38,9 @@ #define SUN6I_GPADC_CTRL1_ADC_CHAN_SELECT(x) (GENMASK(3, 0) & BIT(x)) #define SUN6I_GPADC_CTRL1_ADC_CHAN_MASK GENMASK(3, 0) -/* TP_CTRL1 bits for sun8i SoCs */ -#define SUN8I_GPADC_CTRL1_CHOP_TEMP_EN BIT(8) -#define SUN8I_GPADC_CTRL1_GPADC_CALI_EN BIT(7) +/* TP_CTRL1 bits for sun8i A23/A33 SoCs */ +#define SUN8I_A23_GPADC_CTRL1_CHOP_TEMP_EN BIT(8) +#define SUN8I_A23_GPADC_CTRL1_GPADC_CALI_EN BIT(7) #define SUN4I_GPADC_CTRL2 0x08
As the H3 SoC, which is also in sun8i line, has totally different register map for the thermal sensor (a cut down version of GPADC), we should rename A23/A33-specified registers to contain A23, in order to prevent obfuscation with H3 registers. Currently these registers are only prefixed "SUN8I", not "SUN8I_A23". Add "_A23" after "SUN8I" on the register names. Signed-off-by: Icenowy Zheng <icenowy@aosc.io> --- drivers/iio/adc/sun4i-gpadc-iio.c | 2 +- include/linux/mfd/sun4i-gpadc.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)