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

Commit e6d1cb9f authored by Kukjin Kim's avatar Kukjin Kim
Browse files

ARM: SAMSUNG: Add support for handling of cpu revision 



This patch adds plat-samsung/cpu.c for detecting of cpu id and
silicon revision.

This patch was originally from Changhwan Youn <chaos.youn@samsung.com>

Acked-by: default avatarChanghwan Youn <chaos.youn@samsung.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent a3d93584

arch/arm/mach-s3c64xx/cpu.c

+2 −8
Original line number Diff line number Diff line
@@ -144,14 +144,8 @@ void __init s3c64xx_init_io(struct map_desc *mach_desc, int size) 
	iotable_init(s3c_iodesc, ARRAY_SIZE(s3c_iodesc));

	iotable_init(mach_desc, size);



	samsung_cpu_id = __raw_readl(S3C_VA_SYS + 0x118);

	if (!samsung_cpu_id) {

		/* S3C6400 has the ID register in a different place,

		 * and needs a write before it can be read. */



		__raw_writel(0x0, S3C_VA_SYS + 0xA1C);

		samsung_cpu_id = __raw_readl(S3C_VA_SYS + 0xA1C);

	}

	/* detect cpu id */

	s3c64xx_init_cpu();



	s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids));

}

arch/arm/plat-s3c24xx/cpu.c

+1 −0
Original line number Diff line number Diff line
@@ -224,6 +224,7 @@ void __init s3c24xx_init_io(struct map_desc *mach_desc, int size) 
	} else {

		samsung_cpu_id = s3c24xx_read_idcode_v4();

	}

	s3c24xx_init_cpu();



	arm_pm_restart = s3c24xx_pm_restart;

arch/arm/plat-s5p/cpu.c

+3 −1
Original line number Diff line number Diff line
@@ -119,6 +119,8 @@ void __init s5p_init_io(struct map_desc *mach_desc, 
	if (mach_desc)

		iotable_init(mach_desc, size);



	samsung_cpu_id = __raw_readl(cpuid_addr);

	/* detect cpu id and rev. */

	s5p_init_cpu(cpuid_addr);



	s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids));

}

arch/arm/plat-samsung/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ obj- := 


# Objects we always build independent of SoC choice



obj-y				+= init.o

obj-y				+= init.o cpu.o

obj-$(CONFIG_ARCH_USES_GETTIMEOFFSET)   += time.o

obj-y				+= clock.o

obj-y				+= pwm-clock.o

arch/arm/plat-samsung/cpu.c

0 → 100644
+58 −0
Original line number Diff line number Diff line 
/* linux/arch/arm/plat-samsung/cpu.c

 *

 * Copyright (c) 2009-2011 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com

 *

 * Samsung CPU Support

 *

 * 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.

*/



#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/io.h>



#include <asm/system.h>



#include <mach/map.h>

#include <plat/cpu.h>



unsigned long samsung_cpu_id;

static unsigned int samsung_cpu_rev;



unsigned int samsung_rev(void)

{

	return samsung_cpu_rev;

}

EXPORT_SYMBOL(samsung_rev);



void __init s3c24xx_init_cpu(void)

{

	/* nothing here yet */



	samsung_cpu_rev = 0;

}



void __init s3c64xx_init_cpu(void)

{

	samsung_cpu_id = __raw_readl(S3C_VA_SYS + 0x118);

	if (!samsung_cpu_id) {

		/*

		 * S3C6400 has the ID register in a different place,

		 * and needs a write before it can be read.

		 */

		__raw_writel(0x0, S3C_VA_SYS + 0xA1C);

		samsung_cpu_id = __raw_readl(S3C_VA_SYS + 0xA1C);

	}



	samsung_cpu_rev = 0;

}



void __init s5p_init_cpu(void __iomem *cpuid_addr)

{

	samsung_cpu_id = __raw_readl(cpuid_addr);

	samsung_cpu_rev = samsung_cpu_id & 0xFF;

}