aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2410
diff options
context:
space:
mode:
authorMaurus Cuelenaere <mcuelenaere@gmail.com>2010-05-04 07:12:32 -0400
committerBen Dooks <ben-linux@fluff.org>2010-05-12 04:43:03 -0400
commit6cd82ffe0cd3836b32b29bd1436e5fd551957d54 (patch)
treed34f023240f7f456cf1c74a325afd15bce2ba2d4 /arch/arm/mach-s3c2410
parent7ebd467551ed6ae200d7835a84bbda0dcadaa511 (diff)
ARM: SAMSUNG: Move HWMON from plat-s3c24xx to plat-samsung
Move HWMON platform definition from plat-s3c24xx to plat-samsung and adjust mach-bast to use the new s3c_hwmon_set_platdata(). This allows usage of dev-hwmon by other Samsung SoCs. Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/mach-s3c2410')
-rw-r--r--arch/arm/mach-s3c2410/Kconfig1
-rw-r--r--arch/arm/mach-s3c2410/mach-bast.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig
index 554731868b07..ca5c3c62f37b 100644
--- a/arch/arm/mach-s3c2410/Kconfig
+++ b/arch/arm/mach-s3c2410/Kconfig
@@ -110,6 +110,7 @@ config ARCH_BAST
110 select MACH_BAST_IDE 110 select MACH_BAST_IDE
111 select S3C24XX_DCLK 111 select S3C24XX_DCLK
112 select ISA 112 select ISA
113 select S3C_DEV_HWMON
113 select S3C_DEV_USB_HOST 114 select S3C_DEV_USB_HOST
114 select S3C_DEV_NAND 115 select S3C_DEV_NAND
115 help 116 help
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c
index 02b1b6220cba..c8786df72b9e 100644
--- a/arch/arm/mach-s3c2410/mach-bast.c
+++ b/arch/arm/mach-s3c2410/mach-bast.c
@@ -634,7 +634,7 @@ static void __init bast_map_io(void)
634 634
635 s3c24xx_register_clocks(bast_clocks, ARRAY_SIZE(bast_clocks)); 635 s3c24xx_register_clocks(bast_clocks, ARRAY_SIZE(bast_clocks));
636 636
637 s3c_device_hwmon.dev.platform_data = &bast_hwmon_info; 637 s3c_hwmon_set_platdata(&bast_hwmon_info);
638 638
639 s3c24xx_init_io(bast_iodesc, ARRAY_SIZE(bast_iodesc)); 639 s3c24xx_init_io(bast_iodesc, ARRAY_SIZE(bast_iodesc));
640 s3c24xx_init_clocks(0); 640 s3c24xx_init_clocks(0);