Merge branch 'v3.4-samsung-fixes-1' of... (00bd60fe) · Commits · 戴 / test

arch/arm/mach-exynos/common.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -583,10 +583,11 @@ core_initcall(exynos_core_init);
		#ifdef CONFIG_CACHE_L2X0
		static int __init exynos4_l2x0_cache_init(void)
		{
		int ret;

		if (soc_is_exynos5250())
		return 0;

		int ret;
		ret = l2x0_of_init(L2_AUX_VAL, L2_AUX_MASK);
		if (!ret) {
		l2x0_regs_phys = virt_to_phys(&l2x0_saved_regs);

+0 −2

Original line number	Diff line number	Diff line
		@@ -35,8 +35,6 @@
		#include <mach/irqs.h>
		#include <mach/dma.h>

		static u64 dma_dmamask = DMA_BIT_MASK(32);

		static u8 exynos4210_pdma0_peri[] = {
		DMACH_PCM0_RX,
		DMACH_PCM0_TX,

+3 −4

Original line number	Diff line number	Diff line
		@@ -21,10 +21,9 @@
		*/

		.macro addruart, rp, rv, tmp
		mov \rp, #0x10000000
		ldr \rp, [\rp, #0x0]
		and \rp, \rp, #0xf00000
		teq \rp, #0x500000 @@ EXYNOS5
		mrc p15, 0, \tmp, c0, c0, 0
		and \tmp, \tmp, #0xf0
		teq \tmp, #0xf0 @@ A15
		ldreq \rp, =EXYNOS5_PA_UART
		movne \rp, #EXYNOS4_PA_UART @@ EXYNOS4
		ldr \rv, =S3C_VA_UART

+16 −1

Original line number	Diff line number	Diff line
		@@ -20,9 +20,24 @@ volatile u8 *uart_base;

		#include <plat/uncompress.h>

		static unsigned int __raw_readl(unsigned int ptr)
		{
		return ((volatile unsigned int )ptr);
		}

		static void arch_detect_cpu(void)
		{
		if (machine_is_smdk5250())
		u32 chip_id = __raw_readl(EXYNOS_PA_CHIPID);

		/*
		* product_id is bits 31:12
		* bits 23:20 describe the exynosX family
		*
		*/
		chip_id >>= 20;
		chip_id &= 0xf;

		if (chip_id == 0x5)
		uart_base = (volatile u8 )EXYNOS5_PA_UART + (S3C_UART_OFFSET CONFIG_S3C_LOWLEVEL_UART_PORT);
		else
		uart_base = (volatile u8 )EXYNOS4_PA_UART + (S3C_UART_OFFSET CONFIG_S3C_LOWLEVEL_UART_PORT);

0 → 100644

+18 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2012 Samsung Electronics Co., Ltd.
		* http://www.samsung.com
		*
		* Common Header for S3C24XX SoCs
		*
		* 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 __ARCH_ARM_MACH_S3C24XX_COMMON_H
		#define __ARCH_ARM_MACH_S3C24XX_COMMON_H __FILE__

		void s3c2410_restart(char mode, const char *cmd);
		void s3c244x_restart(char mode, const char *cmd);

		#endif /* __ARCH_ARM_MACH_S3C24XX_COMMON_H */