Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50e9769a authored by Naveen Krishna Ch's avatar Naveen Krishna Ch Committed by Kukjin Kim
Browse files

ARM: SAMSUNG: Implement set_name function for ADC devices 



This patch implements s3c_adc_setname() for Samsung SoCs.
Also updates its usage in S3C64XX, S5P6440, and S5PV210.

Signed-off-by: default avatarNaveen Krishna Ch <ch.naveen@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 0ab0b6d2

arch/arm/mach-s3c64xx/s3c6410.c

+2 −2
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ 
#include <plat/clock.h>

#include <plat/sdhci.h>

#include <plat/ata-core.h>

#include <plat/adc-core.h>

#include <plat/iic-core.h>

#include <plat/adc.h>

#include <plat/onenand-core.h>

#include <mach/s3c6400.h>

#include <mach/s3c6410.h>
@@ -55,7 +55,7 @@ void __init s3c6410_map_io(void) 
	s3c_i2c0_setname("s3c2440-i2c");

	s3c_i2c1_setname("s3c2440-i2c");



	s3c_device_adc.name	= "s3c64xx-adc";

	s3c_adc_setname("s3c64xx-adc");

	s3c_device_nand.name = "s3c6400-nand";

	s3c_onenand_setname("s3c6410-onenand");

	s3c64xx_onenand1_setname("s3c6410-onenand");

arch/arm/mach-s5p6440/cpu.c

+2 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <plat/devs.h>

#include <plat/clock.h>

#include <plat/s5p6440.h>

#include <plat/adc-core.h>



static void s5p6440_idle(void)

{
@@ -61,7 +62,7 @@ static void s5p6440_idle(void) 
void __init s5p6440_map_io(void)

{

	/* initialize any device information early */

	s3c_device_adc.name	= "s3c64xx-adc";

	s3c_adc_setname("s3c64xx-adc");

}



void __init s5p6440_init_clocks(int xtal)

arch/arm/mach-s5pv210/cpu.c

+3 −4
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <plat/devs.h>

#include <plat/clock.h>

#include <plat/s5pv210.h>

#include <plat/adc-core.h>

#include <plat/iic-core.h>

#include <plat/sdhci.h>
@@ -76,10 +77,6 @@ static void s5pv210_idle(void) 


void __init s5pv210_map_io(void)

{

#ifdef CONFIG_S3C_DEV_ADC

	s3c_device_adc.name	= "s3c64xx-adc";

#endif



	iotable_init(s5pv210_iodesc, ARRAY_SIZE(s5pv210_iodesc));



	/* initialise device information early */
@@ -87,6 +84,8 @@ void __init s5pv210_map_io(void) 
	s5pv210_default_sdhci1();

	s5pv210_default_sdhci2();



	s3c_adc_setname("s3c64xx-adc");



	/* the i2c devices are directly compatible with s3c2440 */

	s3c_i2c0_setname("s3c2440-i2c");

	s3c_i2c1_setname("s3c2440-i2c");

arch/arm/plat-samsung/include/plat/adc-core.h

0 → 100644
+28 −0
Original line number Diff line number Diff line 
/* linux/arch/arm/plat-samsung/include/plat/adc-core.h

 *

 * Copyright (c) 2010 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com/

 *

 * Samsung ADC Controller core functions

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

*/



#ifndef __ASM_PLAT_ADC_CORE_H

#define __ASM_PLAT_ADC_CORE_H __FILE__



/* These functions are only for use with the core support code, such as

 * the cpu specific initialisation code

 */



/* re-define device name depending on support. */

static inline void s3c_adc_setname(char *name)

{

#ifdef CONFIG_SAMSUNG_DEV_ADC

	s3c_device_adc.name = name;

#endif

}



#endif /* __ASM_PLAT_ADC_CORE_H */