Commit bd977efd authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'next/cleanup-samsung' of... 

Merge branch 'next/cleanup-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup

From Kukjin Kim <kgene.kim@samsung.com>:

Samsung cleanup patches for v3.6 and most of them are removing
useless codes

* 'next/cleanup-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

:
  ARM: EXYNOS: Remove the L2 cache latency setting for EXYNOS5
  ARM: EXYNOS: Remove leftovers of the Samsung specific power domain control
  ARM: SAMSUNG: Remove unused variable 'running' on PWM
  ARM: SAMSUNG: remove unused SPI clock headers
  ARM: S3C24XX: remove unused header <mach/bast-pmu.h>
  ARM: S3C24XX: Remove duplicate header file inclusion
  ARM: SAMSUNG: Remove description corresponding to a deleted element
  ARM: S5PC100: Remove unused variable in dma.c file
  ARM: S5P64X0: Remove unused variable in dma.c file

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 5914f1a5 c8dd5110

arch/arm/mach-exynos/common.c

+0 −25
Original line number Diff line number Diff line
@@ -712,31 +712,6 @@ static int __init exynos4_l2x0_cache_init(void) 
early_initcall(exynos4_l2x0_cache_init);

#endif



static int __init exynos5_l2_cache_init(void)

{

	unsigned int val;



	if (!soc_is_exynos5250())

		return 0;



	asm volatile("mrc p15, 0, %0, c1, c0, 0\n"

		     "bic %0, %0, #(1 << 2)\n"	/* cache disable */

		     "mcr p15, 0, %0, c1, c0, 0\n"

		     "mrc p15, 1, %0, c9, c0, 2\n"

		     : "=r"(val));



	val |= (1 << 9) | (1 << 5) | (2 << 6) | (2 << 0);



	asm volatile("mcr p15, 1, %0, c9, c0, 2\n" : : "r"(val));

	asm volatile("mrc p15, 0, %0, c1, c0, 0\n"

		     "orr %0, %0, #(1 << 2)\n"	/* cache enable */

		     "mcr p15, 0, %0, c1, c0, 0\n"

		     : : "r"(val));



	return 0;

}

early_initcall(exynos5_l2_cache_init);



static int __init exynos_init(void)

{

	printk(KERN_INFO "EXYNOS: Initializing architecture\n");

arch/arm/mach-exynos/include/mach/spi-clocks.h

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
/* linux/arch/arm/mach-exynos4/include/mach/spi-clocks.h

 *

 * Copyright (C) 2011 Samsung Electronics Co. Ltd.

 *

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

#define __ASM_ARCH_SPI_CLKS_H __FILE__



/* Must source from SCLK_SPI */

#define EXYNOS_SPI_SRCCLK_SCLK		0



#endif /* __ASM_ARCH_SPI_CLKS_H */

arch/arm/mach-exynos/mach-nuri.c

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ 
#include <plat/gpio-cfg.h>

#include <plat/iic.h>

#include <plat/mfc.h>

#include <plat/pd.h>

#include <plat/fimc-core.h>

#include <plat/camport.h>

#include <plat/mipi_csis.h>

arch/arm/mach-exynos/mach-origen.c

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
#include <plat/clock.h>

#include <plat/gpio-cfg.h>

#include <plat/backlight.h>

#include <plat/pd.h>

#include <plat/fb.h>

#include <plat/mfc.h>

arch/arm/mach-exynos/mach-smdkv310.c

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
#include <plat/keypad.h>

#include <plat/sdhci.h>

#include <plat/iic.h>

#include <plat/pd.h>

#include <plat/gpio-cfg.h>

#include <plat/backlight.h>

#include <plat/mfc.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE