| Message ID | 1319629012-21205-3-git-send-email-amit.kachhap@linaro.org |
|---|---|
| State | New |
| Headers | show |
Please split the two patches. 1. Add TMU Kconfig 2. board support On Wed, Oct 26, 2011 at 8:36 PM, Amit Daniel Kachhap <amit.kachhap@linaro.org> wrote: > Signed-off-by: Amit Daniel Kachhap <amit.kachhap@linaro.org> > --- > arch/arm/mach-exynos4/Kconfig | 5 +++++ > arch/arm/mach-exynos4/mach-origen.c | 10 ++++++++++ > 2 files changed, 15 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig > index cf467b5..786fdb7 100644 > --- a/arch/arm/mach-exynos4/Kconfig > +++ b/arch/arm/mach-exynos4/Kconfig > @@ -108,6 +108,11 @@ config EXYNOS4_SETUP_USB_PHY > help > Common setup code for USB PHY controller > > +config EXYNOS4_THERMAL > + bool > + depends on SENSORS_EXYNOS4_TMU > + default y > + > # machine support > > menu "EXYNOS4 Machines" > diff --git a/arch/arm/mach-exynos4/mach-origen.c b/arch/arm/mach-exynos4/mach-origen.c > index ed59f86..089b0e3 100644 > --- a/arch/arm/mach-exynos4/mach-origen.c > +++ b/arch/arm/mach-exynos4/mach-origen.c > @@ -24,6 +24,10 @@ > #include <plat/devs.h> > #include <plat/sdhci.h> > #include <plat/iic.h> > +#if defined(CONFIG_EXYNOS4_THERMAL) Do you this ifdef? > +#include <mach/exynos4-tmu.h> > +#include <mach/regs-tmu.h> > +#endif > > #include <mach/map.h> > > @@ -83,6 +87,9 @@ static struct platform_device *origen_devices[] __initdata = { > &s3c_device_hsmmc2, > &s3c_device_rtc, > &s3c_device_wdt, > +#ifdef CONFIG_EXYNOS4_THERMAL If you select the this config at origen kconfig. it's not needed. > + &exynos4_device_tmu, > +#endif > }; > > static void __init origen_map_io(void) > @@ -95,6 +102,9 @@ static void __init origen_map_io(void) > static void __init origen_machine_init(void) > { > s3c_sdhci2_set_platdata(&origen_hsmmc2_pdata); > +#ifdef CONFIG_EXYNOS4_THERMAL > + exynos4_tmu_set_platdata(NULL); > +#endif you can use it exynos4_tmu_set_platdata by adding proper ifdef at header file instead of C file > platform_add_devices(origen_devices, ARRAY_SIZE(origen_devices)); > } > > -- > 1.7.1 > > > _______________________________________________ > linaro-dev mailing list > linaro-dev@lists.linaro.org > http://lists.linaro.org/mailman/listinfo/linaro-dev >
diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig index cf467b5..786fdb7 100644 --- a/arch/arm/mach-exynos4/Kconfig +++ b/arch/arm/mach-exynos4/Kconfig @@ -108,6 +108,11 @@ config EXYNOS4_SETUP_USB_PHY help Common setup code for USB PHY controller +config EXYNOS4_THERMAL + bool + depends on SENSORS_EXYNOS4_TMU + default y + # machine support menu "EXYNOS4 Machines" diff --git a/arch/arm/mach-exynos4/mach-origen.c b/arch/arm/mach-exynos4/mach-origen.c index ed59f86..089b0e3 100644 --- a/arch/arm/mach-exynos4/mach-origen.c +++ b/arch/arm/mach-exynos4/mach-origen.c @@ -24,6 +24,10 @@ #include <plat/devs.h> #include <plat/sdhci.h> #include <plat/iic.h> +#if defined(CONFIG_EXYNOS4_THERMAL) +#include <mach/exynos4-tmu.h> +#include <mach/regs-tmu.h> +#endif #include <mach/map.h> @@ -83,6 +87,9 @@ static struct platform_device *origen_devices[] __initdata = { &s3c_device_hsmmc2, &s3c_device_rtc, &s3c_device_wdt, +#ifdef CONFIG_EXYNOS4_THERMAL + &exynos4_device_tmu, +#endif }; static void __init origen_map_io(void) @@ -95,6 +102,9 @@ static void __init origen_map_io(void) static void __init origen_machine_init(void) { s3c_sdhci2_set_platdata(&origen_hsmmc2_pdata); +#ifdef CONFIG_EXYNOS4_THERMAL + exynos4_tmu_set_platdata(NULL); +#endif platform_add_devices(origen_devices, ARRAY_SIZE(origen_devices)); }
Signed-off-by: Amit Daniel Kachhap <amit.kachhap@linaro.org> --- arch/arm/mach-exynos4/Kconfig | 5 +++++ arch/arm/mach-exynos4/mach-origen.c | 10 ++++++++++ 2 files changed, 15 insertions(+), 0 deletions(-)