ARM: SAMSUNG: Fix mux bit modification in s3c_adc_select

The mux bits in the adccon register should be cleared only
if muxing is really done in ADCCON and not another register.

This patch introduces a conditional for this.

Signed-off-by: Heiko Stuebner <[email protected]>
Signed-off-by: Kukjin Kim <[email protected]>

diff --git a/arch/arm/plat-samsung/adc.c b/arch/arm/plat-samsung/adc.c
index ee8deef1948156d02c01423ca1fc6b8f771451e2..7821055a5046ccc84670865e0bb53f6354d7069f 100644 (file)
--- a/arch/arm/plat-samsung/adc.c
+++ b/arch/arm/plat-samsung/adc.c
@@ -98,7 +98,8 @@ static inline void s3c_adc_select(struct adc_device *adc,
 
        client->select_cb(client, 1);
 
-       con &= ~S3C2410_ADCCON_MUXMASK;
+       if (cpu == TYPE_ADCV1 || cpu == TYPE_ADCV2)
+               con &= ~S3C2410_ADCCON_MUXMASK;
        con &= ~S3C2410_ADCCON_STDBM;
        con &= ~S3C2410_ADCCON_STARTMASK;