evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2012-07-10 14:09:29 +02:00
commit bd977efd2e
21 changed files with 0 additions and 306 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
arch/arm/mach-exynos/common.c
View file

@ -712,31 +712,6 @@ static int __init exynos4_l2x0_cache_init(void)
early_initcall(exynos4_l2x0_cache_init); early_initcall(exynos4_l2x0_cache_init);
#endif #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) static int __init exynos_init(void)
{ {
printk(KERN_INFO "EXYNOS: Initializing architecture\n"); printk(KERN_INFO "EXYNOS: Initializing architecture\n");

16
arch/arm/mach-exynos/include/mach/spi-clocks.h
View file

@ -1,16 +0,0 @@
/* 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 */

1
arch/arm/mach-exynos/mach-nuri.c
View file

@ -50,7 +50,6 @@
#include <plat/gpio-cfg.h> #include <plat/gpio-cfg.h>
#include <plat/iic.h> #include <plat/iic.h>
#include <plat/mfc.h> #include <plat/mfc.h>
#include <plat/pd.h>
#include <plat/fimc-core.h> #include <plat/fimc-core.h>
#include <plat/camport.h> #include <plat/camport.h>
#include <plat/mipi_csis.h> #include <plat/mipi_csis.h>

1
arch/arm/mach-exynos/mach-origen.c
View file

@ -38,7 +38,6 @@
#include <plat/clock.h> #include <plat/clock.h>
#include <plat/gpio-cfg.h> #include <plat/gpio-cfg.h>
#include <plat/backlight.h> #include <plat/backlight.h>
#include <plat/pd.h>
#include <plat/fb.h> #include <plat/fb.h>
#include <plat/mfc.h> #include <plat/mfc.h>

1
arch/arm/mach-exynos/mach-smdkv310.c
View file

@ -34,7 +34,6 @@
#include <plat/keypad.h> #include <plat/keypad.h>
#include <plat/sdhci.h> #include <plat/sdhci.h>
#include <plat/iic.h> #include <plat/iic.h>
#include <plat/pd.h>
#include <plat/gpio-cfg.h> #include <plat/gpio-cfg.h>
#include <plat/backlight.h> #include <plat/backlight.h>
#include <plat/mfc.h> #include <plat/mfc.h>

1
arch/arm/mach-exynos/mach-universal_c210.c
View file

@ -39,7 +39,6 @@
#include <plat/fb.h> #include <plat/fb.h>
#include <plat/mfc.h> #include <plat/mfc.h>
#include <plat/sdhci.h> #include <plat/sdhci.h>
#include <plat/pd.h>
#include <plat/regs-fb-v4.h> #include <plat/regs-fb-v4.h>
#include <plat/fimc-core.h> #include <plat/fimc-core.h>
#include <plat/s5p-time.h> #include <plat/s5p-time.h>

1
arch/arm/mach-s3c24xx/common.c
View file

@ -41,7 +41,6 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/regs-clock.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <plat/regs-serial.h> #include <plat/regs-serial.h>

40
arch/arm/mach-s3c24xx/include/mach/bast-pmu.h
View file

@ -1,40 +0,0 @@
/* arch/arm/mach-s3c2410/include/mach/bast-pmu.h
*
* Copyright (c) 2003-2004 Simtec Electronics
* Ben Dooks <ben@simtec.co.uk>
* Vincent Sanders <vince@simtec.co.uk>
*
* Machine BAST - Power Management chip
*
* 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_BASTPMU_H
#define __ASM_ARCH_BASTPMU_H "08_OCT_2004"
#define BASTPMU_REG_IDENT (0x00)
#define BASTPMU_REG_VERSION (0x01)
#define BASTPMU_REG_DDCCTRL (0x02)
#define BASTPMU_REG_POWER (0x03)
#define BASTPMU_REG_RESET (0x04)
#define BASTPMU_REG_GWO (0x05)
#define BASTPMU_REG_WOL (0x06)
#define BASTPMU_REG_WOR (0x07)
#define BASTPMU_REG_UID (0x09)
#define BASTPMU_EEPROM (0xC0)
#define BASTPMU_EEP_UID (BASTPMU_EEPROM + 0)
#define BASTPMU_EEP_WOL (BASTPMU_EEPROM + 8)
#define BASTPMU_EEP_WOR (BASTPMU_EEPROM + 9)
#define BASTPMU_IDENT_0 0x53
#define BASTPMU_IDENT_1 0x42
#define BASTPMU_IDENT_2 0x50
#define BASTPMU_IDENT_3 0x4d
#define BASTPMU_RESET_GUARD (0x55)
#endif /* __ASM_ARCH_BASTPMU_H */

18
arch/arm/mach-s3c64xx/include/mach/spi-clocks.h
View file

@ -1,18 +0,0 @@
/* linux/arch/arm/mach-s3c64xx/include/mach/spi-clocks.h
*
* Copyright (C) 2009 Samsung Electronics Ltd.
* Jaswinder Singh <jassi.brar@samsung.com>
*
* 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 __S3C64XX_PLAT_SPI_CLKS_H
#define __S3C64XX_PLAT_SPI_CLKS_H __FILE__
#define S3C64XX_SPI_SRCCLK_PCLK 0
#define S3C64XX_SPI_SRCCLK_SPIBUS 1
#define S3C64XX_SPI_SRCCLK_48M 2
#endif /* __S3C64XX_PLAT_SPI_CLKS_H */

2
arch/arm/mach-s5p64x0/dma.c
View file

@ -36,8 +36,6 @@
#include <plat/devs.h> #include <plat/devs.h>
#include <plat/irqs.h> #include <plat/irqs.h>
static u64 dma_dmamask = DMA_BIT_MASK(32);
static u8 s5p6440_pdma_peri[] = { static u8 s5p6440_pdma_peri[] = {
DMACH_UART0_RX, DMACH_UART0_RX,
DMACH_UART0_TX, DMACH_UART0_TX,

20
arch/arm/mach-s5p64x0/include/mach/spi-clocks.h
View file

@ -1,20 +0,0 @@
/* linux/arch/arm/mach-s5p64x0/include/mach/spi-clocks.h
*
* Copyright (c) 2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com
*
* Copyright (C) 2010 Samsung Electronics Co. Ltd.
* Jaswinder Singh <jassi.brar@samsung.com>
*
* 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__
#define S5P64X0_SPI_SRCCLK_PCLK 0
#define S5P64X0_SPI_SRCCLK_SCLK 1
#endif /* __ASM_ARCH_SPI_CLKS_H */

2
arch/arm/mach-s5pc100/dma.c
View file

@ -33,8 +33,6 @@
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/dma.h> #include <mach/dma.h>
static u64 dma_dmamask = DMA_BIT_MASK(32);
static u8 pdma0_peri[] = { static u8 pdma0_peri[] = {
DMACH_UART0_RX, DMACH_UART0_RX,
DMACH_UART0_TX, DMACH_UART0_TX,

18
arch/arm/mach-s5pc100/include/mach/spi-clocks.h
View file

@ -1,18 +0,0 @@
/* linux/arch/arm/mach-s5pc100/include/mach/spi-clocks.h
*
* Copyright (C) 2010 Samsung Electronics Co. Ltd.
* Jaswinder Singh <jassi.brar@samsung.com>
*
* 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 __S5PC100_PLAT_SPI_CLKS_H
#define __S5PC100_PLAT_SPI_CLKS_H __FILE__
#define S5PC100_SPI_SRCCLK_PCLK 0
#define S5PC100_SPI_SRCCLK_48M 1
#define S5PC100_SPI_SRCCLK_SPIBUS 2
#endif /* __S5PC100_PLAT_SPI_CLKS_H */

17
arch/arm/mach-s5pv210/include/mach/spi-clocks.h
View file

@ -1,17 +0,0 @@
/* linux/arch/arm/mach-s5pv210/include/mach/spi-clocks.h
*
* Copyright (C) 2010 Samsung Electronics Co. Ltd.
* Jaswinder Singh <jassi.brar@samsung.com>
*
* 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 __S5PV210_PLAT_SPI_CLKS_H
#define __S5PV210_PLAT_SPI_CLKS_H __FILE__
#define S5PV210_SPI_SRCCLK_PCLK 0
#define S5PV210_SPI_SRCCLK_SCLK 1
#endif /* __S5PV210_PLAT_SPI_CLKS_H */

8
arch/arm/plat-samsung/Kconfig
View file

@ -491,14 +491,6 @@ config S5P_SLEEP
Internal config node to apply common S5P sleep management code. Internal config node to apply common S5P sleep management code.
Can be selected by S5P and newer SoCs with similar sleep procedure. Can be selected by S5P and newer SoCs with similar sleep procedure.
comment "Power Domain"
config SAMSUNG_PD
bool "Samsung Power Domain"
depends on PM_RUNTIME
help
Say Y here if you want to control Power Domain by Runtime PM.
config DEBUG_S3C_UART config DEBUG_S3C_UART
depends on PLAT_SAMSUNG depends on PLAT_SAMSUNG
int int

4
arch/arm/plat-samsung/Makefile
View file

@ -60,10 +60,6 @@ obj-$(CONFIG_SAMSUNG_WAKEMASK) += wakeup-mask.o
obj-$(CONFIG_S5P_PM) += s5p-pm.o s5p-irq-pm.o obj-$(CONFIG_S5P_PM) += s5p-pm.o s5p-irq-pm.o
obj-$(CONFIG_S5P_SLEEP) += s5p-sleep.o obj-$(CONFIG_S5P_SLEEP) += s5p-sleep.o
# PD support
obj-$(CONFIG_SAMSUNG_PD) += pd.o
# PWM support # PWM support
obj-$(CONFIG_HAVE_PWM) += pwm.o obj-$(CONFIG_HAVE_PWM) += pwm.o

1
arch/arm/plat-samsung/include/plat/devs.h
View file

@ -131,7 +131,6 @@ extern struct platform_device exynos4_device_ohci;
extern struct platform_device exynos4_device_pcm0; extern struct platform_device exynos4_device_pcm0;
extern struct platform_device exynos4_device_pcm1; extern struct platform_device exynos4_device_pcm1;
extern struct platform_device exynos4_device_pcm2; extern struct platform_device exynos4_device_pcm2;
extern struct platform_device exynos4_device_pd[];
extern struct platform_device exynos4_device_spdif; extern struct platform_device exynos4_device_spdif;
extern struct platform_device exynos_device_drm; extern struct platform_device exynos_device_drm;

1
arch/arm/plat-samsung/include/plat/fb.h
View file

@ -43,7 +43,6 @@ struct s3c_fb_pd_win {
* @setup_gpio: Setup the external GPIO pins to the right state to transfer * @setup_gpio: Setup the external GPIO pins to the right state to transfer
* the data from the display system to the connected display * the data from the display system to the connected display
* device. * device.
* @default_win: default window layer number to be used for UI layer.
* @vidcon0: The base vidcon0 values to control the panel data format. * @vidcon0: The base vidcon0 values to control the panel data format.
* @vidcon1: The base vidcon1 values to control the panel data output. * @vidcon1: The base vidcon1 values to control the panel data output.
* @vtiming: Video timing when connected to a RGB type panel. * @vtiming: Video timing when connected to a RGB type panel.

30
arch/arm/plat-samsung/include/plat/pd.h
View file

@ -1,30 +0,0 @@
/* linux/arch/arm/plat-samsung/include/plat/pd.h
*
* Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
* http://www.samsung.com
*
* 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_SAMSUNG_PD_H
#define __ASM_PLAT_SAMSUNG_PD_H __FILE__
struct samsung_pd_info {
int (*enable)(struct device *dev);
int (*disable)(struct device *dev);
void __iomem *base;
};
enum exynos4_pd_block {
PD_MFC,
PD_G3D,
PD_LCD0,
PD_LCD1,
PD_TV,
PD_CAM,
PD_GPS
};
#endif /* __ASM_PLAT_SAMSUNG_PD_H */

95
arch/arm/plat-samsung/pd.c
View file

@ -1,95 +0,0 @@
/* linux/arch/arm/plat-samsung/pd.c
*
* Copyright (c) 2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com
*
* Samsung Power domain 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/init.h>
#include <linux/export.h>
#include <linux/platform_device.h>
#include <linux/err.h>
#include <linux/pm_runtime.h>
#include <plat/pd.h>
static int samsung_pd_probe(struct platform_device *pdev)
{
struct samsung_pd_info *pdata = pdev->dev.platform_data;
struct device *dev = &pdev->dev;
if (!pdata) {
dev_err(dev, "no device data specified\n");
return -ENOENT;
}
pm_runtime_set_active(dev);
pm_runtime_enable(dev);
dev_info(dev, "power domain registered\n");
return 0;
}
static int __devexit samsung_pd_remove(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
pm_runtime_disable(dev);
return 0;
}
static int samsung_pd_runtime_suspend(struct device *dev)
{
struct samsung_pd_info *pdata = dev->platform_data;
int ret = 0;
if (pdata->disable)
ret = pdata->disable(dev);
dev_dbg(dev, "suspended\n");
return ret;
}
static int samsung_pd_runtime_resume(struct device *dev)
{
struct samsung_pd_info *pdata = dev->platform_data;
int ret = 0;
if (pdata->enable)
ret = pdata->enable(dev);
dev_dbg(dev, "resumed\n");
return ret;
}
static const struct dev_pm_ops samsung_pd_pm_ops = {
.runtime_suspend = samsung_pd_runtime_suspend,
.runtime_resume = samsung_pd_runtime_resume,
};
static struct platform_driver samsung_pd_driver = {
.driver = {
.name = "samsung-pd",
.owner = THIS_MODULE,
.pm = &samsung_pd_pm_ops,
},
.probe = samsung_pd_probe,
.remove = __devexit_p(samsung_pd_remove),
};
static int __init samsung_pd_init(void)
{
int ret;
ret = platform_driver_register(&samsung_pd_driver);
if (ret)
printk(KERN_ERR "%s: failed to add PD driver\n", __func__);
return ret;
}
arch_initcall(samsung_pd_init);

4
arch/arm/plat-samsung/pwm.c
View file

@ -36,7 +36,6 @@ struct pwm_device {
unsigned int duty_ns; unsigned int duty_ns;
unsigned char tcon_base; unsigned char tcon_base;
unsigned char running;
unsigned char use_count; unsigned char use_count;
unsigned char pwm_id; unsigned char pwm_id;
}; };
@ -116,7 +115,6 @@ int pwm_enable(struct pwm_device *pwm)
local_irq_restore(flags); local_irq_restore(flags);
pwm->running = 1;
return 0; return 0;
} }
@ -134,8 +132,6 @@ void pwm_disable(struct pwm_device *pwm)
__raw_writel(tcon, S3C2410_TCON); __raw_writel(tcon, S3C2410_TCON);
local_irq_restore(flags); local_irq_restore(flags);
pwm->running = 0;
} }
EXPORT_SYMBOL(pwm_disable); EXPORT_SYMBOL(pwm_disable);