Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758634Ab1F3HuK (ORCPT ); Thu, 30 Jun 2011 03:50:10 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:40951 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753072Ab1F3Hti (ORCPT ); Thu, 30 Jun 2011 03:49:38 -0400 X-AuditID: cbfee61b-b7bfdae000006d51-42-4e0c2a8fb779 Date: Thu, 30 Jun 2011 16:49:33 +0900 From: MyungJoo Ham Subject: [PATCH v3 4/6] ARM: EXYNOS4: Support ADC In-reply-to: <1309420175-10301-1-git-send-email-myungjoo.ham@samsung.com> To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Cc: Kukjin Kim , Russell King , Ben Dooks , Kyungmin Park , Changhwan Youn , Marek Szyprowski , Greg Kroah-Hartman , Mark Brown , Jassi Brar , Seungwhan Youn , linux-kernel@vger.kernel.org, myungjoo.ham@gmail.com Message-id: <1309420175-10301-5-git-send-email-myungjoo.ham@samsung.com> X-Mailer: git-send-email 1.7.4.1 Content-transfer-encoding: 7BIT References: <1309420175-10301-1-git-send-email-myungjoo.ham@samsung.com> X-OriginalArrivalTime: 30 Jun 2011 07:49:50.0203 (UTC) FILETIME=[4A3B5CB0:01CC36FA] X-Brightmail-Tracker: AAAAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3003 Lines: 93 Signed-off-by: MyungJoo Ham Signed-off-by: Kyungmin Park -- Updates from v2 - Based on EXT_GIC patches from Changhwan Youn (ARM: EXYNOS4: Adds External GIC) --- arch/arm/mach-exynos4/Kconfig | 1 + arch/arm/mach-exynos4/cpu.c | 4 ++++ arch/arm/mach-exynos4/include/mach/irqs.h | 3 +++ arch/arm/mach-exynos4/include/mach/map.h | 5 +++++ 4 files changed, 13 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig index 0aca083..80f4fbe 100644 --- a/arch/arm/mach-exynos4/Kconfig +++ b/arch/arm/mach-exynos4/Kconfig @@ -184,6 +184,7 @@ config MACH_NURI select EXYNOS4_SETUP_SDHCI select EXYNOS4_SETUP_USB_PHY select SAMSUNG_DEV_PWM + select SAMSUNG_DEV_ADC help Machine support for Samsung Mobile NURI Board. diff --git a/arch/arm/mach-exynos4/cpu.c b/arch/arm/mach-exynos4/cpu.c index 5423ed8..7ffa81d 100644 --- a/arch/arm/mach-exynos4/cpu.c +++ b/arch/arm/mach-exynos4/cpu.c @@ -21,7 +21,9 @@ #include #include +#include #include +#include #include #include #include @@ -141,6 +143,8 @@ void __init exynos4_map_io(void) exynos4_default_sdhci2(); exynos4_default_sdhci3(); + s3c_adc_setname("samsung-adc-v3"); + s3c_fimc_setname(0, "exynos4-fimc"); s3c_fimc_setname(1, "exynos4-fimc"); s3c_fimc_setname(2, "exynos4-fimc"); diff --git a/arch/arm/mach-exynos4/include/mach/irqs.h b/arch/arm/mach-exynos4/include/mach/irqs.h index 250427f..31f6bed 100644 --- a/arch/arm/mach-exynos4/include/mach/irqs.h +++ b/arch/arm/mach-exynos4/include/mach/irqs.h @@ -139,6 +139,9 @@ #define MAX_COMBINER_NR 16 +#define IRQ_ADC IRQ_ADC0 +#define IRQ_TC IRQ_PEN0 + #define S5P_IRQ_EINT_BASE COMBINER_IRQ(MAX_COMBINER_NR, 0) #define S5P_EINT_BASE1 (S5P_IRQ_EINT_BASE + 0) diff --git a/arch/arm/mach-exynos4/include/mach/map.h b/arch/arm/mach-exynos4/include/mach/map.h index e4b5c79..e03e820 100644 --- a/arch/arm/mach-exynos4/include/mach/map.h +++ b/arch/arm/mach-exynos4/include/mach/map.h @@ -110,6 +110,9 @@ #define EXYNOS4_PA_IIC(x) (0x13860000 + ((x) * 0x10000)) +#define EXYNOS4_PA_ADC 0x13910000 +#define EXYNOS4_PA_ADC1 0x13911000 + #define EXYNOS4_PA_AC97 0x139A0000 #define EXYNOS4_PA_SPDIF 0x139B0000 @@ -132,6 +135,8 @@ #define S3C_PA_IIC5 EXYNOS4_PA_IIC(5) #define S3C_PA_IIC6 EXYNOS4_PA_IIC(6) #define S3C_PA_IIC7 EXYNOS4_PA_IIC(7) +#define SAMSUNG_PA_ADC EXYNOS4_PA_ADC +#define SAMSUNG_PA_ADC1 EXYNOS4_PA_ADC1 #define S3C_PA_RTC EXYNOS4_PA_RTC #define S3C_PA_WDT EXYNOS4_PA_WATCHDOG -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/