OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Samsung cleanup for v3.14 

- remove unused SAMSUNG_GPIOLIB_4BIT and IRQF_DISABLED
 - constify immutable PMU data table and PM clksrc register
 - make const struct for sleep_save
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJSrf0bAAoJEA0Cl+kVi2xq7vQP/RFKCsaLTISDDLLeHki8p6Ov
 Yp5FuD77fxcqKypwxqtNp9VreBGWsbqFdFAY984LvDRlH7lWkrGu/5wLw6XhsNot
 5wao28+7YAhyRyhf4QwJKUjJ9jvWv9LLEx6lpoWAbSBucReTHzi+pR5KLV73e7Vi
 1rH3/QjZ+eJceOPrInwUcMGOh6a1Gpwgg9OXpVZfJPqcsLCFwy5zkYaZWjVdYt5d
 WuoBROt7PgRo5/P7QS0arwEL7O/JCYLHYw827mBEkwTPI5EKmpaxh57nk5J74FSJ
 TeYWX7BVcmO9oA5AlM35ZZStGygBWmaRy5sQU5Zd5UbPwlugClVms9QiHDjMlXdY
 u1O3k8PM1yqygZtl58q3xdeXv4J+ihhqcmhqDIsUo4Yxed6kaZ3o0CanSMCgUNPL
 fTRsicQwj28gUbbHZz6uuBI4C6JVxLfOKWYByAwaM+aF3v+F4/uy6O8lVK0fzdPG
 hkydiWKdJcJPWp8hajY5ZXn6TyIhW2JZeASqb/FhAoEpvln8IgNVVYd52kYUNqb4
 EFIb26Cc7BsZ+Xa7FdilnE6duHK4zyL4mxHYytpJ/fU8N/8PXp+9dJuZ/ASOhbUd
 5qjRECOUEftGvDXtDklcOsnmRJ3kzOMsDCbD9AkVDwup9V1snxi7kOtCq3hpWnNN
 BJba6M+BvXrtuamZi47E
 =jrGr
 -----END PGP SIGNATURE-----

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

From Kukjin Kim:

Samsung cleanup for v3.14
- remove unused SAMSUNG_GPIOLIB_4BIT and IRQF_DISABLED
- constify immutable PMU data table and PM clksrc register
- make const struct for sleep_save

* tag 'samsung-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: EXYNOS: Constify clksrc immutable register restore tables
  ARM: SAMSUNG: Let s3c_pm_do_restore_*() take const sleep_save
  ARM: EXYNOS: Constify data tables for pmu
  ARM: SAMSUNG: remove IRQF_DISABLED
  ARM: SAMSUNG: remove unused SAMSUNG_GPIOLIB_4BIT Kconfig parameter

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2013-12-22 14:02:34 -08:00
parent 650286d257 7c394e7be4
commit bb748890d1
9 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/Kconfig
View File

@ -740,7 +740,6 @@ config ARCH_S3C64XX
select S3C_DEV_NAND
select S3C_GPIO_TRACK
select SAMSUNG_ATAGS
select SAMSUNG_GPIOLIB_4BIT
select SAMSUNG_WAKEMASK
select SAMSUNG_WDT_RESET
select USB_ARCH_HAS_OHCI

4
arch/arm/mach-exynos/pm.c
View File

@ -36,7 +36,7 @@
#include "common.h"
static struct sleep_save exynos4_set_clksrc[] = {
static const struct sleep_save exynos4_set_clksrc[] = {
{ .reg = EXYNOS4_CLKSRC_MASK_TOP , .val = 0x00000001, },
{ .reg = EXYNOS4_CLKSRC_MASK_CAM , .val = 0x11111111, },
{ .reg = EXYNOS4_CLKSRC_MASK_TV , .val = 0x00000111, },
@ -48,7 +48,7 @@ static struct sleep_save exynos4_set_clksrc[] = {
{ .reg = EXYNOS4_CLKSRC_MASK_DMC , .val = 0x00010000, },
};
static struct sleep_save exynos4210_set_clksrc[] = {
static const struct sleep_save exynos4210_set_clksrc[] = {
{ .reg = EXYNOS4210_CLKSRC_MASK_LCD1 , .val = 0x00001111, },
};

14
arch/arm/mach-exynos/pmu.c
View File

@ -17,9 +17,9 @@
#include "common.h"
static struct exynos_pmu_conf *exynos_pmu_config;
static const struct exynos_pmu_conf *exynos_pmu_config;
static struct exynos_pmu_conf exynos4210_pmu_config[] = {
static const struct exynos_pmu_conf exynos4210_pmu_config[] = {
/* { .reg = address, .val = { AFTR, LPA, SLEEP } */
{ S5P_ARM_CORE0_LOWPWR, { 0x0, 0x0, 0x2 } },
{ S5P_DIS_IRQ_CORE0, { 0x0, 0x0, 0x0 } },
@ -95,7 +95,7 @@ static struct exynos_pmu_conf exynos4210_pmu_config[] = {
{ PMU_TABLE_END,},
};
static struct exynos_pmu_conf exynos4x12_pmu_config[] = {
static const struct exynos_pmu_conf exynos4x12_pmu_config[] = {
{ S5P_ARM_CORE0_LOWPWR, { 0x0, 0x0, 0x2 } },
{ S5P_DIS_IRQ_CORE0, { 0x0, 0x0, 0x0 } },
{ S5P_DIS_IRQ_CENTRAL0, { 0x0, 0x0, 0x0 } },
@ -203,7 +203,7 @@ static struct exynos_pmu_conf exynos4x12_pmu_config[] = {
{ PMU_TABLE_END,},
};
static struct exynos_pmu_conf exynos4412_pmu_config[] = {
static const struct exynos_pmu_conf exynos4412_pmu_config[] = {
{ S5P_ARM_CORE2_LOWPWR, { 0x0, 0x0, 0x2 } },
{ S5P_DIS_IRQ_CORE2, { 0x0, 0x0, 0x0 } },
{ S5P_DIS_IRQ_CENTRAL2, { 0x0, 0x0, 0x0 } },
@ -213,7 +213,7 @@ static struct exynos_pmu_conf exynos4412_pmu_config[] = {
{ PMU_TABLE_END,},
};
static struct exynos_pmu_conf exynos5250_pmu_config[] = {
static const struct exynos_pmu_conf exynos5250_pmu_config[] = {
/* { .reg = address, .val = { AFTR, LPA, SLEEP } */
{ EXYNOS5_ARM_CORE0_SYS_PWR_REG, { 0x0, 0x0, 0x2} },
{ EXYNOS5_DIS_IRQ_ARM_CORE0_LOCAL_SYS_PWR_REG, { 0x0, 0x0, 0x0} },
@ -317,7 +317,7 @@ static struct exynos_pmu_conf exynos5250_pmu_config[] = {
{ PMU_TABLE_END,},
};
static void __iomem *exynos5_list_both_cnt_feed[] = {
static void __iomem * const exynos5_list_both_cnt_feed[] = {
EXYNOS5_ARM_CORE0_OPTION,
EXYNOS5_ARM_CORE1_OPTION,
EXYNOS5_ARM_COMMON_OPTION,
@ -331,7 +331,7 @@ static void __iomem *exynos5_list_both_cnt_feed[] = {
EXYNOS5_TOP_PWR_SYSMEM_OPTION,
};
static void __iomem *exynos5_list_diable_wfi_wfe[] = {
static void __iomem * const exynos5_list_diable_wfi_wfe[] = {
EXYNOS5_ARM_CORE1_OPTION,
EXYNOS5_FSYS_ARM_OPTION,
EXYNOS5_ISP_ARM_OPTION,

2
arch/arm/mach-s3c24xx/dma.c
View File

@ -742,7 +742,7 @@ int s3c2410_dma_request(enum dma_ch channel,
chan->irq_claimed = 1;
local_irq_restore(flags);
err = request_irq(chan->irq, s3c2410_dma_irq, IRQF_DISABLED,
err = request_irq(chan->irq, s3c2410_dma_irq, 0,
client->name, (void *)chan);
local_irq_save(flags);

3
arch/arm/mach-s3c24xx/simtec-usb.c
View File

@ -78,8 +78,7 @@ static void usb_simtec_enableoc(struct s3c2410_hcd_info *info, int on)
if (on) {
ret = request_irq(BAST_IRQ_USBOC, usb_simtec_ocirq,
IRQF_DISABLED | IRQF_TRIGGER_RISING |
IRQF_TRIGGER_FALLING,
IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
"USB Over-current", info);
if (ret != 0) {
printk(KERN_ERR "failed to request usb oc irq\n");

2
arch/arm/mach-s3c64xx/mach-smartq.c
View File

@ -106,7 +106,7 @@ static void smartq_usb_host_enableoc(struct s3c2410_hcd_info *info, int on)
if (on) {
ret = request_irq(gpio_to_irq(S3C64XX_GPL(10)),
smartq_usb_host_ocirq, IRQF_DISABLED |
smartq_usb_host_ocirq,
IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
"USB host overcurrent", info);
if (ret != 0)

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

@ -24,7 +24,6 @@ config PLAT_S5P
select S3C_GPIO_TRACK
select S5P_GPIO_DRVSTR
select SAMSUNG_CLKSRC if !COMMON_CLK
select SAMSUNG_GPIOLIB_4BIT
help
Base platform code for Samsung's S5P series SoC.
@ -115,13 +114,6 @@ config S5P_GPIO_INT
# options for gpio configuration support
config SAMSUNG_GPIOLIB_4BIT
bool
help
GPIOlib file contains the 4 bit modification functions for gpio
configuration. GPIOlib shall be compiled only for S3C64XX and S5P
series of processors.
config S5P_GPIO_DRVSTR
bool
help

4
arch/arm/plat-samsung/include/plat/pm.h
View File

@ -101,8 +101,8 @@ struct pm_uart_save {
/* helper functions to save/restore lists of registers. */
extern void s3c_pm_do_save(struct sleep_save *ptr, int count);
extern void s3c_pm_do_restore(struct sleep_save *ptr, int count);
extern void s3c_pm_do_restore_core(struct sleep_save *ptr, int count);
extern void s3c_pm_do_restore(const struct sleep_save *ptr, int count);
extern void s3c_pm_do_restore_core(const struct sleep_save *ptr, int count);
#ifdef CONFIG_SAMSUNG_PM
extern int s3c_irq_wake(struct irq_data *data, unsigned int state);

4
arch/arm/plat-samsung/pm.c
View File

@ -182,7 +182,7 @@ void s3c_pm_do_save(struct sleep_save *ptr, int count)
* restore the UARTs state yet
*/
void s3c_pm_do_restore(struct sleep_save *ptr, int count)
void s3c_pm_do_restore(const struct sleep_save *ptr, int count)
{
for (; count > 0; count--, ptr++) {
printk(KERN_DEBUG "restore %p (restore %08lx, was %08x)\n",
@ -203,7 +203,7 @@ void s3c_pm_do_restore(struct sleep_save *ptr, int count)
* peripherals, as things may be changing!
*/
void s3c_pm_do_restore_core(struct sleep_save *ptr, int count)
void s3c_pm_do_restore_core(const struct sleep_save *ptr, int count)
{
for (; count > 0; count--, ptr++)
__raw_writel(ptr->val, ptr->reg);