2014-10-31 12:38:16

by Abhilash Kesavan

[permalink] [raw]
Subject: [PATCH] iio: adc: exynos_adc: Add support for ADCv3 on exynos7

The ADC on exynos7 is quite similar to ADCv2. The differences are as
follows:
- v3 has 8 input channels (10 in v2).
- v3 does not include an ADC PHY control register.
- Some ADC_CON2 register bits being used in v2 are listed as
reserved in v3. This results in a different init_hw function
for v3.

Signed-off-by: Abhilash Kesavan <[email protected]>
---
- Based on Naveen's "iio: exynos-adc: use syscon instead of ioremap" patchset
http://comments.gmane.org/gmane.linux.kernel.iio/13943

.../devicetree/bindings/arm/samsung/exynos-adc.txt | 2 ++
drivers/iio/adc/exynos_adc.c | 32 ++++++++++++++++++++
2 files changed, 34 insertions(+)

diff --git a/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt b/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
index c368210..a11e32c 100644
--- a/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
+++ b/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
@@ -14,6 +14,8 @@ Required properties:
for exynos4412/5250 and s5pv210 controllers.
Must be "samsung,exynos-adc-v2" for
future controllers.
+ Must be "samsung,exynos-adc-v3" for
+ the ADC in Exynos7 and compatibles
Must be "samsung,exynos3250-adc" for
controllers compatible with ADC of Exynos3250.
Must be "samsung,s3c2410-adc" for
diff --git a/drivers/iio/adc/exynos_adc.c b/drivers/iio/adc/exynos_adc.c
index fe03177..74d0a9d 100644
--- a/drivers/iio/adc/exynos_adc.c
+++ b/drivers/iio/adc/exynos_adc.c
@@ -390,6 +390,35 @@ static const struct exynos_adc_data exynos3250_adc_data = {
.start_conv = exynos_adc_v2_start_conv,
};

+static void exynos_adc_v3_init_hw(struct exynos_adc *info)
+{
+ u32 con1, con2;
+
+ if (info->data->needs_adc_phy)
+ regmap_write(info->pmu_map, info->data->phy_offset, 1);
+
+ con1 = ADC_V2_CON1_SOFT_RESET;
+ writel(con1, ADC_V2_CON1(info->regs));
+
+ con2 = readl(ADC_V2_CON2(info->regs));
+ con2 &= ~ADC_V2_CON2_C_TIME(7);
+ con2 |= ADC_V2_CON2_C_TIME(0);
+ writel(con2, ADC_V2_CON2(info->regs));
+
+ /* Enable interrupts */
+ writel(1, ADC_V2_INT_EN(info->regs));
+}
+
+static const struct exynos_adc_data exynos_adc_v3_data = {
+ .num_channels = MAX_ADC_V1_CHANNELS,
+ .mask = ADC_DATX_MASK, /* 12 bit ADC resolution */
+
+ .init_hw = exynos_adc_v3_init_hw,
+ .exit_hw = exynos_adc_v2_exit_hw,
+ .clear_irq = exynos_adc_v2_clear_irq,
+ .start_conv = exynos_adc_v2_start_conv,
+};
+
static const struct of_device_id exynos_adc_match[] = {
{
.compatible = "samsung,s3c2410-adc",
@@ -413,6 +442,9 @@ static const struct of_device_id exynos_adc_match[] = {
.compatible = "samsung,exynos-adc-v2",
.data = &exynos_adc_v2_data,
}, {
+ .compatible = "samsung,exynos-adc-v3",
+ .data = &exynos_adc_v3_data,
+ }, {
.compatible = "samsung,exynos3250-adc",
.data = &exynos3250_adc_data,
},
--
1.7.9.5


2014-10-31 12:47:20

by Chanwoo Choi

[permalink] [raw]
Subject: Re: [PATCH] iio: adc: exynos_adc: Add support for ADCv3 on exynos7

Hi Abhilash,

On 10/31/2014 09:38 PM, Abhilash Kesavan wrote:
> The ADC on exynos7 is quite similar to ADCv2. The differences are as
> follows:
> - v3 has 8 input channels (10 in v2).
> - v3 does not include an ADC PHY control register.
> - Some ADC_CON2 register bits being used in v2 are listed as
> reserved in v3. This results in a different init_hw function
> for v3.
>
> Signed-off-by: Abhilash Kesavan <[email protected]>
> ---
> - Based on Naveen's "iio: exynos-adc: use syscon instead of ioremap" patchset
> http://comments.gmane.org/gmane.linux.kernel.iio/13943
>
> .../devicetree/bindings/arm/samsung/exynos-adc.txt | 2 ++
> drivers/iio/adc/exynos_adc.c | 32 ++++++++++++++++++++
> 2 files changed, 34 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt b/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
> index c368210..a11e32c 100644
> --- a/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
> +++ b/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
> @@ -14,6 +14,8 @@ Required properties:
> for exynos4412/5250 and s5pv210 controllers.
> Must be "samsung,exynos-adc-v2" for
> future controllers.
> + Must be "samsung,exynos-adc-v3" for
> + the ADC in Exynos7 and compatibles

I prefer to use 'exynos7-adc' instead of 'exynos-adc-v3'.
Exynos7 has little different from existing ADCv2.

Also, If you want to use 'exynos-adc-v3' compatible,
Exynos7's TRM have to include the correct version(v3) infromation.

Thanks,
Chanwoo Choi



> Must be "samsung,exynos3250-adc" for
> controllers compatible with ADC of Exynos3250.
> Must be "samsung,s3c2410-adc" for
> diff --git a/drivers/iio/adc/exynos_adc.c b/drivers/iio/adc/exynos_adc.c
> index fe03177..74d0a9d 100644
> --- a/drivers/iio/adc/exynos_adc.c
> +++ b/drivers/iio/adc/exynos_adc.c
> @@ -390,6 +390,35 @@ static const struct exynos_adc_data exynos3250_adc_data = {
> .start_conv = exynos_adc_v2_start_conv,
> };
>
> +static void exynos_adc_v3_init_hw(struct exynos_adc *info)
> +{
> + u32 con1, con2;
> +
> + if (info->data->needs_adc_phy)
> + regmap_write(info->pmu_map, info->data->phy_offset, 1);
> +
> + con1 = ADC_V2_CON1_SOFT_RESET;
> + writel(con1, ADC_V2_CON1(info->regs));
> +
> + con2 = readl(ADC_V2_CON2(info->regs));
> + con2 &= ~ADC_V2_CON2_C_TIME(7);
> + con2 |= ADC_V2_CON2_C_TIME(0);
> + writel(con2, ADC_V2_CON2(info->regs));
> +
> + /* Enable interrupts */
> + writel(1, ADC_V2_INT_EN(info->regs));
> +}
> +
> +static const struct exynos_adc_data exynos_adc_v3_data = {
> + .num_channels = MAX_ADC_V1_CHANNELS,
> + .mask = ADC_DATX_MASK, /* 12 bit ADC resolution */
> +
> + .init_hw = exynos_adc_v3_init_hw,
> + .exit_hw = exynos_adc_v2_exit_hw,
> + .clear_irq = exynos_adc_v2_clear_irq,
> + .start_conv = exynos_adc_v2_start_conv,
> +};
> +
> static const struct of_device_id exynos_adc_match[] = {
> {
> .compatible = "samsung,s3c2410-adc",
> @@ -413,6 +442,9 @@ static const struct of_device_id exynos_adc_match[] = {
> .compatible = "samsung,exynos-adc-v2",
> .data = &exynos_adc_v2_data,
> }, {
> + .compatible = "samsung,exynos-adc-v3",
> + .data = &exynos_adc_v3_data,
> + }, {
> .compatible = "samsung,exynos3250-adc",
> .data = &exynos3250_adc_data,
> },
>

2014-10-31 14:01:50

by Abhilash Kesavan

[permalink] [raw]
Subject: Re: [PATCH] iio: adc: exynos_adc: Add support for ADCv3 on exynos7

Hi Chanwoo,

Thanks for the quick response.

On Fri, Oct 31, 2014 at 6:17 PM, Chanwoo Choi <[email protected]> wrote:
> Hi Abhilash,
>
> On 10/31/2014 09:38 PM, Abhilash Kesavan wrote:
>> The ADC on exynos7 is quite similar to ADCv2. The differences are as
>> follows:
>> - v3 has 8 input channels (10 in v2).
>> - v3 does not include an ADC PHY control register.
>> - Some ADC_CON2 register bits being used in v2 are listed as
>> reserved in v3. This results in a different init_hw function
>> for v3.
>>
>> Signed-off-by: Abhilash Kesavan <[email protected]>
>> ---
>> - Based on Naveen's "iio: exynos-adc: use syscon instead of ioremap" patchset
>> http://comments.gmane.org/gmane.linux.kernel.iio/13943
>>
>> .../devicetree/bindings/arm/samsung/exynos-adc.txt | 2 ++
>> drivers/iio/adc/exynos_adc.c | 32 ++++++++++++++++++++
>> 2 files changed, 34 insertions(+)
>>
>> diff --git a/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt b/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
>> index c368210..a11e32c 100644
>> --- a/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
>> +++ b/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
>> @@ -14,6 +14,8 @@ Required properties:
>> for exynos4412/5250 and s5pv210 controllers.
>> Must be "samsung,exynos-adc-v2" for
>> future controllers.
>> + Must be "samsung,exynos-adc-v3" for
>> + the ADC in Exynos7 and compatibles
>
> I prefer to use 'exynos7-adc' instead of 'exynos-adc-v3'.
> Exynos7 has little different from existing ADCv2.

Sure, I'll change it. The reason for my choosing v3 was that reading
the version register (0x20 offset) showed a value of 0x80000009 in
Exynos7 as against 0x80000008 in both 5420 and 3250.
>
> Also, If you want to use 'exynos-adc-v3' compatible,
> Exynos7's TRM have to include the correct version(v3) infromation.

I could not see any mention of the ADC controller version in the
Exynos7 UM other than the version register. Does that mean it is v2 ?

Regards,
Abhilash
>
> Thanks,
> Chanwoo Choi
>
>
>
>> Must be "samsung,exynos3250-adc" for
>> controllers compatible with ADC of Exynos3250.
>> Must be "samsung,s3c2410-adc" for
>> diff --git a/drivers/iio/adc/exynos_adc.c b/drivers/iio/adc/exynos_adc.c
>> index fe03177..74d0a9d 100644
>> --- a/drivers/iio/adc/exynos_adc.c
>> +++ b/drivers/iio/adc/exynos_adc.c
>> @@ -390,6 +390,35 @@ static const struct exynos_adc_data exynos3250_adc_data = {
>> .start_conv = exynos_adc_v2_start_conv,
>> };
>>
>> +static void exynos_adc_v3_init_hw(struct exynos_adc *info)
>> +{
>> + u32 con1, con2;
>> +
>> + if (info->data->needs_adc_phy)
>> + regmap_write(info->pmu_map, info->data->phy_offset, 1);
>> +
>> + con1 = ADC_V2_CON1_SOFT_RESET;
>> + writel(con1, ADC_V2_CON1(info->regs));
>> +
>> + con2 = readl(ADC_V2_CON2(info->regs));
>> + con2 &= ~ADC_V2_CON2_C_TIME(7);
>> + con2 |= ADC_V2_CON2_C_TIME(0);
>> + writel(con2, ADC_V2_CON2(info->regs));
>> +
>> + /* Enable interrupts */
>> + writel(1, ADC_V2_INT_EN(info->regs));
>> +}
>> +
>> +static const struct exynos_adc_data exynos_adc_v3_data = {
>> + .num_channels = MAX_ADC_V1_CHANNELS,
>> + .mask = ADC_DATX_MASK, /* 12 bit ADC resolution */
>> +
>> + .init_hw = exynos_adc_v3_init_hw,
>> + .exit_hw = exynos_adc_v2_exit_hw,
>> + .clear_irq = exynos_adc_v2_clear_irq,
>> + .start_conv = exynos_adc_v2_start_conv,
>> +};
>> +
>> static const struct of_device_id exynos_adc_match[] = {
>> {
>> .compatible = "samsung,s3c2410-adc",
>> @@ -413,6 +442,9 @@ static const struct of_device_id exynos_adc_match[] = {
>> .compatible = "samsung,exynos-adc-v2",
>> .data = &exynos_adc_v2_data,
>> }, {
>> + .compatible = "samsung,exynos-adc-v3",
>> + .data = &exynos_adc_v3_data,
>> + }, {
>> .compatible = "samsung,exynos3250-adc",
>> .data = &exynos3250_adc_data,
>> },
>>
>

2014-10-31 16:14:19

by Chanwoo Choi

[permalink] [raw]
Subject: Re: [PATCH] iio: adc: exynos_adc: Add support for ADCv3 on exynos7

Hi Abhilash,

On Fri, Oct 31, 2014 at 11:01 PM, Abhilash Kesavan
<[email protected]> wrote:
> Hi Chanwoo,
>
> Thanks for the quick response.
>
> On Fri, Oct 31, 2014 at 6:17 PM, Chanwoo Choi <[email protected]> wrote:
>> Hi Abhilash,
>>
>> On 10/31/2014 09:38 PM, Abhilash Kesavan wrote:
>>> The ADC on exynos7 is quite similar to ADCv2. The differences are as
>>> follows:
>>> - v3 has 8 input channels (10 in v2).
>>> - v3 does not include an ADC PHY control register.
>>> - Some ADC_CON2 register bits being used in v2 are listed as
>>> reserved in v3. This results in a different init_hw function
>>> for v3.
>>>
>>> Signed-off-by: Abhilash Kesavan <[email protected]>
>>> ---
>>> - Based on Naveen's "iio: exynos-adc: use syscon instead of ioremap" patchset
>>> http://comments.gmane.org/gmane.linux.kernel.iio/13943
>>>
>>> .../devicetree/bindings/arm/samsung/exynos-adc.txt | 2 ++
>>> drivers/iio/adc/exynos_adc.c | 32 ++++++++++++++++++++
>>> 2 files changed, 34 insertions(+)
>>>
>>> diff --git a/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt b/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
>>> index c368210..a11e32c 100644
>>> --- a/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
>>> +++ b/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
>>> @@ -14,6 +14,8 @@ Required properties:
>>> for exynos4412/5250 and s5pv210 controllers.
>>> Must be "samsung,exynos-adc-v2" for
>>> future controllers.
>>> + Must be "samsung,exynos-adc-v3" for
>>> + the ADC in Exynos7 and compatibles
>>
>> I prefer to use 'exynos7-adc' instead of 'exynos-adc-v3'.
>> Exynos7 has little different from existing ADCv2.
>
> Sure, I'll change it. The reason for my choosing v3 was that reading
> the version register (0x20 offset) showed a value of 0x80000009 in
> Exynos7 as against 0x80000008 in both 5420 and 3250.
>>
>> Also, If you want to use 'exynos-adc-v3' compatible,
>> Exynos7's TRM have to include the correct version(v3) infromation.
>
> I could not see any mention of the ADC controller version in the
> Exynos7 UM other than the version register. Does that mean it is v2 ?

So am I. I don't see any version number of ADC in Exynos TRM.

Additionally,
I have a question about Exynos7. If you possible,
did you tell me about full name of Exynos7 SoC (e.g., Exynos5433, Exynos52..)?

Best Regards,
Chanwoo Choi

>
> Regards,
> Abhilash
>>
>> Thanks,
>> Chanwoo Choi
>>
>>
>>
>>> Must be "samsung,exynos3250-adc" for
>>> controllers compatible with ADC of Exynos3250.
>>> Must be "samsung,s3c2410-adc" for
>>> diff --git a/drivers/iio/adc/exynos_adc.c b/drivers/iio/adc/exynos_adc.c
>>> index fe03177..74d0a9d 100644
>>> --- a/drivers/iio/adc/exynos_adc.c
>>> +++ b/drivers/iio/adc/exynos_adc.c
>>> @@ -390,6 +390,35 @@ static const struct exynos_adc_data exynos3250_adc_data = {
>>> .start_conv = exynos_adc_v2_start_conv,
>>> };
>>>
>>> +static void exynos_adc_v3_init_hw(struct exynos_adc *info)
>>> +{
>>> + u32 con1, con2;
>>> +
>>> + if (info->data->needs_adc_phy)
>>> + regmap_write(info->pmu_map, info->data->phy_offset, 1);
>>> +
>>> + con1 = ADC_V2_CON1_SOFT_RESET;
>>> + writel(con1, ADC_V2_CON1(info->regs));
>>> +
>>> + con2 = readl(ADC_V2_CON2(info->regs));
>>> + con2 &= ~ADC_V2_CON2_C_TIME(7);
>>> + con2 |= ADC_V2_CON2_C_TIME(0);
>>> + writel(con2, ADC_V2_CON2(info->regs));
>>> +
>>> + /* Enable interrupts */
>>> + writel(1, ADC_V2_INT_EN(info->regs));
>>> +}
>>> +
>>> +static const struct exynos_adc_data exynos_adc_v3_data = {
>>> + .num_channels = MAX_ADC_V1_CHANNELS,
>>> + .mask = ADC_DATX_MASK, /* 12 bit ADC resolution */
>>> +
>>> + .init_hw = exynos_adc_v3_init_hw,
>>> + .exit_hw = exynos_adc_v2_exit_hw,
>>> + .clear_irq = exynos_adc_v2_clear_irq,
>>> + .start_conv = exynos_adc_v2_start_conv,
>>> +};
>>> +
>>> static const struct of_device_id exynos_adc_match[] = {
>>> {
>>> .compatible = "samsung,s3c2410-adc",
>>> @@ -413,6 +442,9 @@ static const struct of_device_id exynos_adc_match[] = {
>>> .compatible = "samsung,exynos-adc-v2",
>>> .data = &exynos_adc_v2_data,
>>> }, {
>>> + .compatible = "samsung,exynos-adc-v3",
>>> + .data = &exynos_adc_v3_data,
>>> + }, {
>>> .compatible = "samsung,exynos3250-adc",
>>> .data = &exynos3250_adc_data,
>>> },
>>>
>>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

2014-11-01 04:00:30

by Abhilash Kesavan

[permalink] [raw]
Subject: Re: [PATCH] iio: adc: exynos_adc: Add support for ADCv3 on exynos7

Hi Chanwoo,

On Fri, Oct 31, 2014 at 9:44 PM, Chanwoo Choi <[email protected]> wrote:
> Hi Abhilash,
>
> On Fri, Oct 31, 2014 at 11:01 PM, Abhilash Kesavan
> <[email protected]> wrote:
>> Hi Chanwoo,
>>
>> Thanks for the quick response.
>>
>> On Fri, Oct 31, 2014 at 6:17 PM, Chanwoo Choi <[email protected]> wrote:
>>> Hi Abhilash,
>>>
>>> On 10/31/2014 09:38 PM, Abhilash Kesavan wrote:
>>>> The ADC on exynos7 is quite similar to ADCv2. The differences are as
>>>> follows:
>>>> - v3 has 8 input channels (10 in v2).
>>>> - v3 does not include an ADC PHY control register.
>>>> - Some ADC_CON2 register bits being used in v2 are listed as
>>>> reserved in v3. This results in a different init_hw function
>>>> for v3.
>>>>
>>>> Signed-off-by: Abhilash Kesavan <[email protected]>
>>>> ---
>>>> - Based on Naveen's "iio: exynos-adc: use syscon instead of ioremap" patchset
>>>> http://comments.gmane.org/gmane.linux.kernel.iio/13943
>>>>
>>>> .../devicetree/bindings/arm/samsung/exynos-adc.txt | 2 ++
>>>> drivers/iio/adc/exynos_adc.c | 32 ++++++++++++++++++++
>>>> 2 files changed, 34 insertions(+)
>>>>
>>>> diff --git a/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt b/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
>>>> index c368210..a11e32c 100644
>>>> --- a/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
>>>> +++ b/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
>>>> @@ -14,6 +14,8 @@ Required properties:
>>>> for exynos4412/5250 and s5pv210 controllers.
>>>> Must be "samsung,exynos-adc-v2" for
>>>> future controllers.
>>>> + Must be "samsung,exynos-adc-v3" for
>>>> + the ADC in Exynos7 and compatibles
>>>
>>> I prefer to use 'exynos7-adc' instead of 'exynos-adc-v3'.
>>> Exynos7 has little different from existing ADCv2.
>>
>> Sure, I'll change it. The reason for my choosing v3 was that reading
>> the version register (0x20 offset) showed a value of 0x80000009 in
>> Exynos7 as against 0x80000008 in both 5420 and 3250.
>>>
>>> Also, If you want to use 'exynos-adc-v3' compatible,
>>> Exynos7's TRM have to include the correct version(v3) infromation.
>>
>> I could not see any mention of the ADC controller version in the
>> Exynos7 UM other than the version register. Does that mean it is v2 ?
>
> So am I. I don't see any version number of ADC in Exynos TRM.
OK, considering the small differences between ADCv2 and this
controller, I will change the compatible to exynos7-adc.
Patch will be posted in a bit.
>
> Additionally,
> I have a question about Exynos7. If you possible,
> did you tell me about full name of Exynos7 SoC (e.g., Exynos5433, Exynos52..)?
The soc name is Exynos7 and it has 4 A57 cores.
>
> Best Regards,
> Chanwoo Choi
>
>>
>> Regards,
>> Abhilash
>>>
>>> Thanks,
>>> Chanwoo Choi
>>>
>>>
>>>
>>>> Must be "samsung,exynos3250-adc" for
>>>> controllers compatible with ADC of Exynos3250.
>>>> Must be "samsung,s3c2410-adc" for
>>>> diff --git a/drivers/iio/adc/exynos_adc.c b/drivers/iio/adc/exynos_adc.c
>>>> index fe03177..74d0a9d 100644
>>>> --- a/drivers/iio/adc/exynos_adc.c
>>>> +++ b/drivers/iio/adc/exynos_adc.c
>>>> @@ -390,6 +390,35 @@ static const struct exynos_adc_data exynos3250_adc_data = {
>>>> .start_conv = exynos_adc_v2_start_conv,
>>>> };
>>>>
>>>> +static void exynos_adc_v3_init_hw(struct exynos_adc *info)
>>>> +{
>>>> + u32 con1, con2;
>>>> +
>>>> + if (info->data->needs_adc_phy)
>>>> + regmap_write(info->pmu_map, info->data->phy_offset, 1);
>>>> +
>>>> + con1 = ADC_V2_CON1_SOFT_RESET;
>>>> + writel(con1, ADC_V2_CON1(info->regs));
>>>> +
>>>> + con2 = readl(ADC_V2_CON2(info->regs));
>>>> + con2 &= ~ADC_V2_CON2_C_TIME(7);
>>>> + con2 |= ADC_V2_CON2_C_TIME(0);
>>>> + writel(con2, ADC_V2_CON2(info->regs));
>>>> +
>>>> + /* Enable interrupts */
>>>> + writel(1, ADC_V2_INT_EN(info->regs));
>>>> +}
>>>> +
>>>> +static const struct exynos_adc_data exynos_adc_v3_data = {
>>>> + .num_channels = MAX_ADC_V1_CHANNELS,
>>>> + .mask = ADC_DATX_MASK, /* 12 bit ADC resolution */
>>>> +
>>>> + .init_hw = exynos_adc_v3_init_hw,
>>>> + .exit_hw = exynos_adc_v2_exit_hw,
>>>> + .clear_irq = exynos_adc_v2_clear_irq,
>>>> + .start_conv = exynos_adc_v2_start_conv,
>>>> +};
>>>> +
>>>> static const struct of_device_id exynos_adc_match[] = {
>>>> {
>>>> .compatible = "samsung,s3c2410-adc",
>>>> @@ -413,6 +442,9 @@ static const struct of_device_id exynos_adc_match[] = {
>>>> .compatible = "samsung,exynos-adc-v2",
>>>> .data = &exynos_adc_v2_data,
>>>> }, {
>>>> + .compatible = "samsung,exynos-adc-v3",
>>>> + .data = &exynos_adc_v3_data,
>>>> + }, {
>>>> .compatible = "samsung,exynos3250-adc",
>>>> .data = &exynos3250_adc_data,
>>>> },
>>>>
>>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
>> the body of a message to [email protected]
>> More majordomo info at http://vger.kernel.org/majordomo-info.html

2014-11-01 04:00:56

by Abhilash Kesavan

[permalink] [raw]
Subject: [PATCH v2] iio: adc: exynos_adc: Add support for exynos7

The ADC on exynos7 is quite similar to ADCv2. The differences are as
follows:
- exynos7-adc has 8 input channels (as against 10 in ADCv2).
- exynos7 does not include an ADC PHY control register.
- Some ADC_CON2 register bits being used in ADCv2 are listed as
reserved in exynos7-adc. This results in a different init_hw
function for exynos7.

Signed-off-by: Abhilash Kesavan <[email protected]>
---
- Based on Naveen's "iio: exynos-adc: use syscon instead of ioremap" patchset
http://comments.gmane.org/gmane.linux.kernel.iio/13943

.../devicetree/bindings/arm/samsung/exynos-adc.txt | 2 ++
drivers/iio/adc/exynos_adc.c | 32 ++++++++++++++++++++++
2 files changed, 34 insertions(+)

diff --git a/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt b/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
index c368210..f46ca9a 100644
--- a/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
+++ b/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
@@ -16,6 +16,8 @@ Required properties:
future controllers.
Must be "samsung,exynos3250-adc" for
controllers compatible with ADC of Exynos3250.
+ Must be "samsung,exynos7-adc" for
+ the ADC in Exynos7 and compatibles
Must be "samsung,s3c2410-adc" for
the ADC in s3c2410 and compatibles
Must be "samsung,s3c2416-adc" for
diff --git a/drivers/iio/adc/exynos_adc.c b/drivers/iio/adc/exynos_adc.c
index fe03177..3a2dbb3 100644
--- a/drivers/iio/adc/exynos_adc.c
+++ b/drivers/iio/adc/exynos_adc.c
@@ -390,6 +390,35 @@ static const struct exynos_adc_data exynos3250_adc_data = {
.start_conv = exynos_adc_v2_start_conv,
};

+static void exynos_adc_exynos7_init_hw(struct exynos_adc *info)
+{
+ u32 con1, con2;
+
+ if (info->data->needs_adc_phy)
+ regmap_write(info->pmu_map, info->data->phy_offset, 1);
+
+ con1 = ADC_V2_CON1_SOFT_RESET;
+ writel(con1, ADC_V2_CON1(info->regs));
+
+ con2 = readl(ADC_V2_CON2(info->regs));
+ con2 &= ~ADC_V2_CON2_C_TIME(7);
+ con2 |= ADC_V2_CON2_C_TIME(0);
+ writel(con2, ADC_V2_CON2(info->regs));
+
+ /* Enable interrupts */
+ writel(1, ADC_V2_INT_EN(info->regs));
+}
+
+static const struct exynos_adc_data exynos7_adc_data = {
+ .num_channels = MAX_ADC_V1_CHANNELS,
+ .mask = ADC_DATX_MASK, /* 12 bit ADC resolution */
+
+ .init_hw = exynos_adc_exynos7_init_hw,
+ .exit_hw = exynos_adc_v2_exit_hw,
+ .clear_irq = exynos_adc_v2_clear_irq,
+ .start_conv = exynos_adc_v2_start_conv,
+};
+
static const struct of_device_id exynos_adc_match[] = {
{
.compatible = "samsung,s3c2410-adc",
@@ -415,6 +444,9 @@ static const struct of_device_id exynos_adc_match[] = {
}, {
.compatible = "samsung,exynos3250-adc",
.data = &exynos3250_adc_data,
+ }, {
+ .compatible = "samsung,exynos7-adc",
+ .data = &exynos7_adc_data,
},
{},
};
--
2.1.0

2014-11-01 06:28:00

by Chanwoo Choi

[permalink] [raw]
Subject: Re: [PATCH] iio: adc: exynos_adc: Add support for ADCv3 on exynos7

Hi Abhilash,

On Sat, Nov 1, 2014 at 1:00 PM, Abhilash Kesavan
<[email protected]> wrote:
> Hi Chanwoo,
>
> On Fri, Oct 31, 2014 at 9:44 PM, Chanwoo Choi <[email protected]> wrote:
>> Hi Abhilash,
>>
>> On Fri, Oct 31, 2014 at 11:01 PM, Abhilash Kesavan
>> <[email protected]> wrote:
>>> Hi Chanwoo,
>>>
>>> Thanks for the quick response.
>>>
>>> On Fri, Oct 31, 2014 at 6:17 PM, Chanwoo Choi <[email protected]> wrote:
>>>> Hi Abhilash,
>>>>
>>>> On 10/31/2014 09:38 PM, Abhilash Kesavan wrote:
>>>>> The ADC on exynos7 is quite similar to ADCv2. The differences are as
>>>>> follows:
>>>>> - v3 has 8 input channels (10 in v2).
>>>>> - v3 does not include an ADC PHY control register.
>>>>> - Some ADC_CON2 register bits being used in v2 are listed as
>>>>> reserved in v3. This results in a different init_hw function
>>>>> for v3.
>>>>>
>>>>> Signed-off-by: Abhilash Kesavan <[email protected]>
>>>>> ---
>>>>> - Based on Naveen's "iio: exynos-adc: use syscon instead of ioremap" patchset
>>>>> http://comments.gmane.org/gmane.linux.kernel.iio/13943
>>>>>
>>>>> .../devicetree/bindings/arm/samsung/exynos-adc.txt | 2 ++
>>>>> drivers/iio/adc/exynos_adc.c | 32 ++++++++++++++++++++
>>>>> 2 files changed, 34 insertions(+)
>>>>>
>>>>> diff --git a/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt b/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
>>>>> index c368210..a11e32c 100644
>>>>> --- a/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
>>>>> +++ b/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
>>>>> @@ -14,6 +14,8 @@ Required properties:
>>>>> for exynos4412/5250 and s5pv210 controllers.
>>>>> Must be "samsung,exynos-adc-v2" for
>>>>> future controllers.
>>>>> + Must be "samsung,exynos-adc-v3" for
>>>>> + the ADC in Exynos7 and compatibles
>>>>
>>>> I prefer to use 'exynos7-adc' instead of 'exynos-adc-v3'.
>>>> Exynos7 has little different from existing ADCv2.
>>>
>>> Sure, I'll change it. The reason for my choosing v3 was that reading
>>> the version register (0x20 offset) showed a value of 0x80000009 in
>>> Exynos7 as against 0x80000008 in both 5420 and 3250.
>>>>
>>>> Also, If you want to use 'exynos-adc-v3' compatible,
>>>> Exynos7's TRM have to include the correct version(v3) infromation.
>>>
>>> I could not see any mention of the ADC controller version in the
>>> Exynos7 UM other than the version register. Does that mean it is v2 ?
>>
>> So am I. I don't see any version number of ADC in Exynos TRM.
> OK, considering the small differences between ADCv2 and this
> controller, I will change the compatible to exynos7-adc.
> Patch will be posted in a bit.
>>
>> Additionally,
>> I have a question about Exynos7. If you possible,
>> did you tell me about full name of Exynos7 SoC (e.g., Exynos5433, Exynos52..)?
> The soc name is Exynos7 and it has 4 A57 cores.

I wondered what is Exynos7. Thanks for your reply.

Best Regards,
Chanwoo Choi

>>
>> Best Regards,
>> Chanwoo Choi
>>
>>>
>>> Regards,
>>> Abhilash
>>>>
>>>> Thanks,
>>>> Chanwoo Choi
>>>>
>>>>
>>>>
>>>>> Must be "samsung,exynos3250-adc" for
>>>>> controllers compatible with ADC of Exynos3250.
>>>>> Must be "samsung,s3c2410-adc" for
>>>>> diff --git a/drivers/iio/adc/exynos_adc.c b/drivers/iio/adc/exynos_adc.c
>>>>> index fe03177..74d0a9d 100644
>>>>> --- a/drivers/iio/adc/exynos_adc.c
>>>>> +++ b/drivers/iio/adc/exynos_adc.c
>>>>> @@ -390,6 +390,35 @@ static const struct exynos_adc_data exynos3250_adc_data = {
>>>>> .start_conv = exynos_adc_v2_start_conv,
>>>>> };
>>>>>
>>>>> +static void exynos_adc_v3_init_hw(struct exynos_adc *info)
>>>>> +{
>>>>> + u32 con1, con2;
>>>>> +
>>>>> + if (info->data->needs_adc_phy)
>>>>> + regmap_write(info->pmu_map, info->data->phy_offset, 1);
>>>>> +
>>>>> + con1 = ADC_V2_CON1_SOFT_RESET;
>>>>> + writel(con1, ADC_V2_CON1(info->regs));
>>>>> +
>>>>> + con2 = readl(ADC_V2_CON2(info->regs));
>>>>> + con2 &= ~ADC_V2_CON2_C_TIME(7);
>>>>> + con2 |= ADC_V2_CON2_C_TIME(0);
>>>>> + writel(con2, ADC_V2_CON2(info->regs));
>>>>> +
>>>>> + /* Enable interrupts */
>>>>> + writel(1, ADC_V2_INT_EN(info->regs));
>>>>> +}
>>>>> +
>>>>> +static const struct exynos_adc_data exynos_adc_v3_data = {
>>>>> + .num_channels = MAX_ADC_V1_CHANNELS,
>>>>> + .mask = ADC_DATX_MASK, /* 12 bit ADC resolution */
>>>>> +
>>>>> + .init_hw = exynos_adc_v3_init_hw,
>>>>> + .exit_hw = exynos_adc_v2_exit_hw,
>>>>> + .clear_irq = exynos_adc_v2_clear_irq,
>>>>> + .start_conv = exynos_adc_v2_start_conv,
>>>>> +};
>>>>> +
>>>>> static const struct of_device_id exynos_adc_match[] = {
>>>>> {
>>>>> .compatible = "samsung,s3c2410-adc",
>>>>> @@ -413,6 +442,9 @@ static const struct of_device_id exynos_adc_match[] = {
>>>>> .compatible = "samsung,exynos-adc-v2",
>>>>> .data = &exynos_adc_v2_data,
>>>>> }, {
>>>>> + .compatible = "samsung,exynos-adc-v3",
>>>>> + .data = &exynos_adc_v3_data,
>>>>> + }, {
>>>>> .compatible = "samsung,exynos3250-adc",
>>>>> .data = &exynos3250_adc_data,
>>>>> },
>>>>>
>>>>
>>> --
>>> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
>>> the body of a message to [email protected]
>>> More majordomo info at http://vger.kernel.org/majordomo-info.html
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

2014-11-01 07:34:45

by Abhilash Kesavan

[permalink] [raw]
Subject: Re: [PATCH] iio: adc: exynos_adc: Add support for ADCv3 on exynos7

Hi Chanwoo,

On Sat, Nov 1, 2014 at 11:57 AM, Chanwoo Choi <[email protected]> wrote:
> Hi Abhilash,
>
> On Sat, Nov 1, 2014 at 1:00 PM, Abhilash Kesavan
> <[email protected]> wrote:
>> Hi Chanwoo,
>>
>> On Fri, Oct 31, 2014 at 9:44 PM, Chanwoo Choi <[email protected]> wrote:
>>> Hi Abhilash,
>>>
>>> On Fri, Oct 31, 2014 at 11:01 PM, Abhilash Kesavan
>>> <[email protected]> wrote:
>>>> Hi Chanwoo,
>>>>
>>>> Thanks for the quick response.
>>>>
>>>> On Fri, Oct 31, 2014 at 6:17 PM, Chanwoo Choi <[email protected]> wrote:
>>>>> Hi Abhilash,
>>>>>
>>>>> On 10/31/2014 09:38 PM, Abhilash Kesavan wrote:
>>>>>> The ADC on exynos7 is quite similar to ADCv2. The differences are as
>>>>>> follows:
>>>>>> - v3 has 8 input channels (10 in v2).
>>>>>> - v3 does not include an ADC PHY control register.
>>>>>> - Some ADC_CON2 register bits being used in v2 are listed as
>>>>>> reserved in v3. This results in a different init_hw function
>>>>>> for v3.
>>>>>>
>>>>>> Signed-off-by: Abhilash Kesavan <[email protected]>
>>>>>> ---
>>>>>> - Based on Naveen's "iio: exynos-adc: use syscon instead of ioremap" patchset
>>>>>> http://comments.gmane.org/gmane.linux.kernel.iio/13943
>>>>>>
>>>>>> .../devicetree/bindings/arm/samsung/exynos-adc.txt | 2 ++
>>>>>> drivers/iio/adc/exynos_adc.c | 32 ++++++++++++++++++++
>>>>>> 2 files changed, 34 insertions(+)
>>>>>>
>>>>>> diff --git a/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt b/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
>>>>>> index c368210..a11e32c 100644
>>>>>> --- a/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
>>>>>> +++ b/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
>>>>>> @@ -14,6 +14,8 @@ Required properties:
>>>>>> for exynos4412/5250 and s5pv210 controllers.
>>>>>> Must be "samsung,exynos-adc-v2" for
>>>>>> future controllers.
>>>>>> + Must be "samsung,exynos-adc-v3" for
>>>>>> + the ADC in Exynos7 and compatibles
>>>>>
>>>>> I prefer to use 'exynos7-adc' instead of 'exynos-adc-v3'.
>>>>> Exynos7 has little different from existing ADCv2.
>>>>
>>>> Sure, I'll change it. The reason for my choosing v3 was that reading
>>>> the version register (0x20 offset) showed a value of 0x80000009 in
>>>> Exynos7 as against 0x80000008 in both 5420 and 3250.
>>>>>
>>>>> Also, If you want to use 'exynos-adc-v3' compatible,
>>>>> Exynos7's TRM have to include the correct version(v3) infromation.
>>>>
>>>> I could not see any mention of the ADC controller version in the
>>>> Exynos7 UM other than the version register. Does that mean it is v2 ?
>>>
>>> So am I. I don't see any version number of ADC in Exynos TRM.
>> OK, considering the small differences between ADCv2 and this
>> controller, I will change the compatible to exynos7-adc.
>> Patch will be posted in a bit.
>>>
>>> Additionally,
>>> I have a question about Exynos7. If you possible,
>>> did you tell me about full name of Exynos7 SoC (e.g., Exynos5433, Exynos52..)?
>> The soc name is Exynos7 and it has 4 A57 cores.
>
> I wondered what is Exynos7. Thanks for your reply.

Exynos7 is a System-On-Chip that is based on 64-bit ARMv8 RISC
processor. As mentioned earlier, it has a Cortex-A57 quad core
configuration targeted towards high-performance applications.

I have posted v2 with your suggested modifications
(https://lkml.org/lkml/2014/11/1/2), kindly review.

Regards,
Abhilash

>
> Best Regards,
> Chanwoo Choi
>
>>>
>>> Best Regards,
>>> Chanwoo Choi
>>>
>>>>
>>>> Regards,
>>>> Abhilash
>>>>>
>>>>> Thanks,
>>>>> Chanwoo Choi
>>>>>
>>>>>
>>>>>
>>>>>> Must be "samsung,exynos3250-adc" for
>>>>>> controllers compatible with ADC of Exynos3250.
>>>>>> Must be "samsung,s3c2410-adc" for
>>>>>> diff --git a/drivers/iio/adc/exynos_adc.c b/drivers/iio/adc/exynos_adc.c
>>>>>> index fe03177..74d0a9d 100644
>>>>>> --- a/drivers/iio/adc/exynos_adc.c
>>>>>> +++ b/drivers/iio/adc/exynos_adc.c
>>>>>> @@ -390,6 +390,35 @@ static const struct exynos_adc_data exynos3250_adc_data = {
>>>>>> .start_conv = exynos_adc_v2_start_conv,
>>>>>> };
>>>>>>
>>>>>> +static void exynos_adc_v3_init_hw(struct exynos_adc *info)
>>>>>> +{
>>>>>> + u32 con1, con2;
>>>>>> +
>>>>>> + if (info->data->needs_adc_phy)
>>>>>> + regmap_write(info->pmu_map, info->data->phy_offset, 1);
>>>>>> +
>>>>>> + con1 = ADC_V2_CON1_SOFT_RESET;
>>>>>> + writel(con1, ADC_V2_CON1(info->regs));
>>>>>> +
>>>>>> + con2 = readl(ADC_V2_CON2(info->regs));
>>>>>> + con2 &= ~ADC_V2_CON2_C_TIME(7);
>>>>>> + con2 |= ADC_V2_CON2_C_TIME(0);
>>>>>> + writel(con2, ADC_V2_CON2(info->regs));
>>>>>> +
>>>>>> + /* Enable interrupts */
>>>>>> + writel(1, ADC_V2_INT_EN(info->regs));
>>>>>> +}
>>>>>> +
>>>>>> +static const struct exynos_adc_data exynos_adc_v3_data = {
>>>>>> + .num_channels = MAX_ADC_V1_CHANNELS,
>>>>>> + .mask = ADC_DATX_MASK, /* 12 bit ADC resolution */
>>>>>> +
>>>>>> + .init_hw = exynos_adc_v3_init_hw,
>>>>>> + .exit_hw = exynos_adc_v2_exit_hw,
>>>>>> + .clear_irq = exynos_adc_v2_clear_irq,
>>>>>> + .start_conv = exynos_adc_v2_start_conv,
>>>>>> +};
>>>>>> +
>>>>>> static const struct of_device_id exynos_adc_match[] = {
>>>>>> {
>>>>>> .compatible = "samsung,s3c2410-adc",
>>>>>> @@ -413,6 +442,9 @@ static const struct of_device_id exynos_adc_match[] = {
>>>>>> .compatible = "samsung,exynos-adc-v2",
>>>>>> .data = &exynos_adc_v2_data,
>>>>>> }, {
>>>>>> + .compatible = "samsung,exynos-adc-v3",
>>>>>> + .data = &exynos_adc_v3_data,
>>>>>> + }, {
>>>>>> .compatible = "samsung,exynos3250-adc",
>>>>>> .data = &exynos3250_adc_data,
>>>>>> },
>>>>>>
>>>>>
>>>> --
>>>> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
>>>> the body of a message to [email protected]
>>>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
>> the body of a message to [email protected]
>> More majordomo info at http://vger.kernel.org/majordomo-info.html

2014-11-01 08:25:32

by Chanwoo Choi

[permalink] [raw]
Subject: Re: [PATCH v2] iio: adc: exynos_adc: Add support for exynos7

Hi Abhilash,

On Sat, Nov 1, 2014 at 1:00 PM, Abhilash Kesavan <[email protected]> wrote:
> The ADC on exynos7 is quite similar to ADCv2. The differences are as
> follows:
> - exynos7-adc has 8 input channels (as against 10 in ADCv2).
> - exynos7 does not include an ADC PHY control register.
> - Some ADC_CON2 register bits being used in ADCv2 are listed as
> reserved in exynos7-adc. This results in a different init_hw
> function for exynos7.
>
> Signed-off-by: Abhilash Kesavan <[email protected]>
> ---
> - Based on Naveen's "iio: exynos-adc: use syscon instead of ioremap" patchset
> http://comments.gmane.org/gmane.linux.kernel.iio/13943
>
> .../devicetree/bindings/arm/samsung/exynos-adc.txt | 2 ++
> drivers/iio/adc/exynos_adc.c | 32 ++++++++++++++++++++++
> 2 files changed, 34 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt b/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
> index c368210..f46ca9a 100644
> --- a/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
> +++ b/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
> @@ -16,6 +16,8 @@ Required properties:
> future controllers.
> Must be "samsung,exynos3250-adc" for
> controllers compatible with ADC of Exynos3250.
> + Must be "samsung,exynos7-adc" for
> + the ADC in Exynos7 and compatibles
> Must be "samsung,s3c2410-adc" for
> the ADC in s3c2410 and compatibles
> Must be "samsung,s3c2416-adc" for
> diff --git a/drivers/iio/adc/exynos_adc.c b/drivers/iio/adc/exynos_adc.c
> index fe03177..3a2dbb3 100644
> --- a/drivers/iio/adc/exynos_adc.c
> +++ b/drivers/iio/adc/exynos_adc.c
> @@ -390,6 +390,35 @@ static const struct exynos_adc_data exynos3250_adc_data = {
> .start_conv = exynos_adc_v2_start_conv,
> };
>
> +static void exynos_adc_exynos7_init_hw(struct exynos_adc *info)
> +{
> + u32 con1, con2;
> +
> + if (info->data->needs_adc_phy)
> + regmap_write(info->pmu_map, info->data->phy_offset, 1);
> +
> + con1 = ADC_V2_CON1_SOFT_RESET;
> + writel(con1, ADC_V2_CON1(info->regs));
> +
> + con2 = readl(ADC_V2_CON2(info->regs));
> + con2 &= ~ADC_V2_CON2_C_TIME(7);
> + con2 |= ADC_V2_CON2_C_TIME(0);
> + writel(con2, ADC_V2_CON2(info->regs));
> +
> + /* Enable interrupts */
> + writel(1, ADC_V2_INT_EN(info->regs));
> +}
> +
> +static const struct exynos_adc_data exynos7_adc_data = {
> + .num_channels = MAX_ADC_V1_CHANNELS,
> + .mask = ADC_DATX_MASK, /* 12 bit ADC resolution */
> +
> + .init_hw = exynos_adc_exynos7_init_hw,
> + .exit_hw = exynos_adc_v2_exit_hw,
> + .clear_irq = exynos_adc_v2_clear_irq,
> + .start_conv = exynos_adc_v2_start_conv,
> +};
> +
> static const struct of_device_id exynos_adc_match[] = {
> {
> .compatible = "samsung,s3c2410-adc",
> @@ -415,6 +444,9 @@ static const struct of_device_id exynos_adc_match[] = {
> }, {
> .compatible = "samsung,exynos3250-adc",
> .data = &exynos3250_adc_data,
> + }, {
> + .compatible = "samsung,exynos7-adc",
> + .data = &exynos7_adc_data,
> },
> {},
> };

Looks good to me.

Reviewed-by: Chanwoo Choi <[email protected]>

Best Regards,
Chanwoo Choi

2014-11-05 15:37:48

by Jonathan Cameron

[permalink] [raw]
Subject: Re: [PATCH v2] iio: adc: exynos_adc: Add support for exynos7

On 01/11/14 08:25, Chanwoo Choi wrote:
> Hi Abhilash,
>
> On Sat, Nov 1, 2014 at 1:00 PM, Abhilash Kesavan <[email protected]> wrote:
>> The ADC on exynos7 is quite similar to ADCv2. The differences are as
>> follows:
>> - exynos7-adc has 8 input channels (as against 10 in ADCv2).
>> - exynos7 does not include an ADC PHY control register.
>> - Some ADC_CON2 register bits being used in ADCv2 are listed as
>> reserved in exynos7-adc. This results in a different init_hw
>> function for exynos7.
>>
>> Signed-off-by: Abhilash Kesavan <[email protected]>

Looks good.

Applied to the togreg branch of iio.git, initially pushed out as testing for the
autobuilders to play.

Jonathan
>> ---
>> - Based on Naveen's "iio: exynos-adc: use syscon instead of ioremap" patchset
>> http://comments.gmane.org/gmane.linux.kernel.iio/13943
>>
>> .../devicetree/bindings/arm/samsung/exynos-adc.txt | 2 ++
>> drivers/iio/adc/exynos_adc.c | 32 ++++++++++++++++++++++
>> 2 files changed, 34 insertions(+)
>>
>> diff --git a/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt b/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
>> index c368210..f46ca9a 100644
>> --- a/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
>> +++ b/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
>> @@ -16,6 +16,8 @@ Required properties:
>> future controllers.
>> Must be "samsung,exynos3250-adc" for
>> controllers compatible with ADC of Exynos3250.
>> + Must be "samsung,exynos7-adc" for
>> + the ADC in Exynos7 and compatibles
>> Must be "samsung,s3c2410-adc" for
>> the ADC in s3c2410 and compatibles
>> Must be "samsung,s3c2416-adc" for
>> diff --git a/drivers/iio/adc/exynos_adc.c b/drivers/iio/adc/exynos_adc.c
>> index fe03177..3a2dbb3 100644
>> --- a/drivers/iio/adc/exynos_adc.c
>> +++ b/drivers/iio/adc/exynos_adc.c
>> @@ -390,6 +390,35 @@ static const struct exynos_adc_data exynos3250_adc_data = {
>> .start_conv = exynos_adc_v2_start_conv,
>> };
>>
>> +static void exynos_adc_exynos7_init_hw(struct exynos_adc *info)
>> +{
>> + u32 con1, con2;
>> +
>> + if (info->data->needs_adc_phy)
>> + regmap_write(info->pmu_map, info->data->phy_offset, 1);
>> +
>> + con1 = ADC_V2_CON1_SOFT_RESET;
>> + writel(con1, ADC_V2_CON1(info->regs));
>> +
>> + con2 = readl(ADC_V2_CON2(info->regs));
>> + con2 &= ~ADC_V2_CON2_C_TIME(7);
>> + con2 |= ADC_V2_CON2_C_TIME(0);
>> + writel(con2, ADC_V2_CON2(info->regs));
>> +
>> + /* Enable interrupts */
>> + writel(1, ADC_V2_INT_EN(info->regs));
>> +}
>> +
>> +static const struct exynos_adc_data exynos7_adc_data = {
>> + .num_channels = MAX_ADC_V1_CHANNELS,
>> + .mask = ADC_DATX_MASK, /* 12 bit ADC resolution */
>> +
>> + .init_hw = exynos_adc_exynos7_init_hw,
>> + .exit_hw = exynos_adc_v2_exit_hw,
>> + .clear_irq = exynos_adc_v2_clear_irq,
>> + .start_conv = exynos_adc_v2_start_conv,
>> +};
>> +
>> static const struct of_device_id exynos_adc_match[] = {
>> {
>> .compatible = "samsung,s3c2410-adc",
>> @@ -415,6 +444,9 @@ static const struct of_device_id exynos_adc_match[] = {
>> }, {
>> .compatible = "samsung,exynos3250-adc",
>> .data = &exynos3250_adc_data,
>> + }, {
>> + .compatible = "samsung,exynos7-adc",
>> + .data = &exynos7_adc_data,
>> },
>> {},
>> };
>
> Looks good to me.
>
> Reviewed-by: Chanwoo Choi <[email protected]>
>
> Best Regards,
> Chanwoo Choi
>