Commit f447ea4b authored by Ben Dooks's avatar Ben Dooks
Browse files

ARM: Merge for-2635/samsung-hwmon 

Merge branch 'for-2635/samsung-hwmon' into for-linus/samsung2
parents c733a717 6cd82ffe

arch/arm/mach-s3c2410/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ config ARCH_BAST 
	select MACH_BAST_IDE

	select S3C24XX_DCLK

	select ISA

	select S3C_DEV_HWMON

	select S3C_DEV_USB_HOST

	select S3C_DEV_NAND

	help

arch/arm/mach-s3c2410/mach-bast.c

+1 −1
Original line number Diff line number Diff line
@@ -634,7 +634,7 @@ static void __init bast_map_io(void) 


	s3c24xx_register_clocks(bast_clocks, ARRAY_SIZE(bast_clocks));



	s3c_device_hwmon.dev.platform_data = &bast_hwmon_info;

	s3c_hwmon_set_platdata(&bast_hwmon_info);



	s3c24xx_init_io(bast_iodesc, ARRAY_SIZE(bast_iodesc));

	s3c24xx_init_clocks(0);

arch/arm/plat-s3c24xx/devs.c

+0 −8
Original line number Diff line number Diff line
@@ -343,14 +343,6 @@ struct platform_device s3c_device_adc = { 
	.resource	  = s3c_adc_resource,

};



/* HWMON */



struct platform_device s3c_device_hwmon = {

	.name		= "s3c-hwmon",

	.id		= -1,

	.dev.parent	= &s3c_device_adc.dev,

};



/* SDI */



static struct resource s3c_sdi_resource[] = {

arch/arm/plat-samsung/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -160,6 +160,11 @@ config S3C_DEV_HSMMC2 
	help

	  Compile in platform device definitions for HSMMC channel 2



config S3C_DEV_HWMON

	bool

	help

	    Compile in platform device definitions for HWMON



config S3C_DEV_I2C1

	bool

	help

arch/arm/plat-samsung/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ obj-$(CONFIG_S3C_ADC) += adc.o 
obj-$(CONFIG_S3C_DEV_HSMMC)	+= dev-hsmmc.o

obj-$(CONFIG_S3C_DEV_HSMMC1)	+= dev-hsmmc1.o

obj-$(CONFIG_S3C_DEV_HSMMC2)	+= dev-hsmmc2.o

obj-$(CONFIG_S3C_DEV_HWMON)	+= dev-hwmon.o

obj-y				+= dev-i2c0.o

obj-$(CONFIG_S3C_DEV_I2C1)	+= dev-i2c1.o

obj-$(CONFIG_S3C_DEV_FB)	+= dev-fb.o