Merge with 5653c3aa411a13f9d9eba43f93f34e33d5dd9a31

[arc.git] / arch / ppc / mpc55xx / drivers / Adc_560x.c

diff --git a/arch/ppc/mpc55xx/drivers/Adc_560x.c b/arch/ppc/mpc55xx/drivers/Adc_560x.c
index bb8633ebe880fba31015d4604f027c9dc478221e..42ed7d6e338bf19c52122ced9a57724e8dae393a 100644 (file)
--- a/arch/ppc/mpc55xx/drivers/Adc_560x.c
+++ b/arch/ppc/mpc55xx/drivers/Adc_560x.c
@@ -568,9 +568,9 @@ void Adc_StartGroupConversion (Adc_GroupType group)
                hwPtr->CTR[1].B.INPLATCH = groupPtr->adcChannelConvTime.INPLATCH;\r
                hwPtr->CTR[1].B.INPCMP = groupPtr->adcChannelConvTime.INPCMP;\r
                hwPtr->CTR[1].B.INPSAMP = groupPtr->adcChannelConvTime.INPSAMP;\r
-//             hwPtr->CTR[2].B.INPLATCH = groupPtr->adcChannelConvTime.INPLATCH;\r
-//             hwPtr->CTR[2].B.INPCMP = groupPtr->adcChannelConvTime.INPCMP;\r
-//             hwPtr->CTR[2].B.INPSAMP = groupPtr->adcChannelConvTime.INPSAMP;\r
+               hwPtr->CTR[2].B.INPLATCH = groupPtr->adcChannelConvTime.INPLATCH;\r
+               hwPtr->CTR[2].B.INPCMP = groupPtr->adcChannelConvTime.INPCMP;\r
+               hwPtr->CTR[2].B.INPSAMP = groupPtr->adcChannelConvTime.INPSAMP;\r
 \r
                for(uint8 i =0; i < groupPtr->numberOfChannels; i++)\r
                {\r
@@ -590,12 +590,12 @@ void Adc_StartGroupConversion (Adc_GroupType group)
                /* Enable Normal conversion */\r
                hwPtr->NCMR[0].R = groupChannelIdMask[0];\r
                hwPtr->NCMR[1].R = groupChannelIdMask[1];\r
-//             hwPtr->NCMR[2].R = groupChannelIdMask[2];\r
+               hwPtr->NCMR[2].R = groupChannelIdMask[2];\r
 \r
                /* Enable Channel Interrupt */\r
                hwPtr->CIMR[0].R = groupChannelIdMask[0];\r
                hwPtr->CIMR[1].R = groupChannelIdMask[1];\r
-//             hwPtr->CIMR[2].R = groupChannelIdMask[2];\r
+               hwPtr->CIMR[2].R = groupChannelIdMask[2];\r
 #endif\r
                /* Clear interrupts */\r
                hwPtr->ISR.B.ECH = 1;\r