Commit bb748890 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-cleanup' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents 650286d2 7c394e7b

arch/arm/Kconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -740,7 +740,6 @@ config ARCH_S3C64XX 
	select S3C_DEV_NAND

	select S3C_DEV_NAND

	select S3C_GPIO_TRACK

	select S3C_GPIO_TRACK

	select SAMSUNG_ATAGS

	select SAMSUNG_ATAGS

	select SAMSUNG_GPIOLIB_4BIT

	select SAMSUNG_WAKEMASK

	select SAMSUNG_WAKEMASK

	select SAMSUNG_WDT_RESET

	select SAMSUNG_WDT_RESET

	select USB_ARCH_HAS_OHCI

	select USB_ARCH_HAS_OHCI

arch/arm/mach-exynos/pm.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ 




#include "common.h"

#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_TOP		, .val = 0x00000001, },

	{ .reg = EXYNOS4_CLKSRC_MASK_CAM		, .val = 0x11111111, },

	{ .reg = EXYNOS4_CLKSRC_MASK_CAM		, .val = 0x11111111, },

	{ .reg = EXYNOS4_CLKSRC_MASK_TV			, .val = 0x00000111, },

	{ .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, },

	{ .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, },

	{ .reg = EXYNOS4210_CLKSRC_MASK_LCD1		, .val = 0x00001111, },

};

};

arch/arm/mach-exynos/pmu.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -17,9 +17,9 @@ 




#include "common.h"

#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 } */

	/* { .reg = address, .val = { AFTR, LPA, SLEEP } */

	{ S5P_ARM_CORE0_LOWPWR,			{ 0x0, 0x0, 0x2 } },

	{ S5P_ARM_CORE0_LOWPWR,			{ 0x0, 0x0, 0x2 } },

	{ S5P_DIS_IRQ_CORE0,			{ 0x0, 0x0, 0x0 } },

	{ S5P_DIS_IRQ_CORE0,			{ 0x0, 0x0, 0x0 } },
@@ -95,7 +95,7 @@ static struct exynos_pmu_conf exynos4210_pmu_config[] = { 
	{ PMU_TABLE_END,},

	{ 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_ARM_CORE0_LOWPWR,			{ 0x0, 0x0, 0x2 } },

	{ S5P_DIS_IRQ_CORE0,			{ 0x0, 0x0, 0x0 } },

	{ S5P_DIS_IRQ_CORE0,			{ 0x0, 0x0, 0x0 } },

	{ S5P_DIS_IRQ_CENTRAL0,			{ 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,},

	{ 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_ARM_CORE2_LOWPWR,			{ 0x0, 0x0, 0x2 } },

	{ S5P_DIS_IRQ_CORE2,			{ 0x0, 0x0, 0x0 } },

	{ S5P_DIS_IRQ_CORE2,			{ 0x0, 0x0, 0x0 } },

	{ S5P_DIS_IRQ_CENTRAL2,			{ 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,},

	{ 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 } */

	/* { .reg = address, .val = { AFTR, LPA, SLEEP } */

	{ EXYNOS5_ARM_CORE0_SYS_PWR_REG,		{ 0x0, 0x0, 0x2} },

	{ EXYNOS5_ARM_CORE0_SYS_PWR_REG,		{ 0x0, 0x0, 0x2} },

	{ EXYNOS5_DIS_IRQ_ARM_CORE0_LOCAL_SYS_PWR_REG,	{ 0x0, 0x0, 0x0} },

	{ 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,},

	{ 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_CORE0_OPTION,

	EXYNOS5_ARM_CORE1_OPTION,

	EXYNOS5_ARM_CORE1_OPTION,

	EXYNOS5_ARM_COMMON_OPTION,

	EXYNOS5_ARM_COMMON_OPTION,
@@ -331,7 +331,7 @@ static void __iomem *exynos5_list_both_cnt_feed[] = { 
	EXYNOS5_TOP_PWR_SYSMEM_OPTION,

	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_ARM_CORE1_OPTION,

	EXYNOS5_FSYS_ARM_OPTION,

	EXYNOS5_FSYS_ARM_OPTION,

	EXYNOS5_ISP_ARM_OPTION,

	EXYNOS5_ISP_ARM_OPTION,

arch/arm/mach-s3c24xx/dma.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -742,7 +742,7 @@ int s3c2410_dma_request(enum dma_ch channel, 
		chan->irq_claimed = 1;

		chan->irq_claimed = 1;

		local_irq_restore(flags);

		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);

				  client->name, (void *)chan);





		local_irq_save(flags);

		local_irq_save(flags);

arch/arm/mach-s3c24xx/simtec-usb.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -78,8 +78,7 @@ static void usb_simtec_enableoc(struct s3c2410_hcd_info *info, int on) 




	if (on) {

	if (on) {

		ret = request_irq(BAST_IRQ_USBOC, usb_simtec_ocirq,

		ret = request_irq(BAST_IRQ_USBOC, usb_simtec_ocirq,

				  IRQF_DISABLED | IRQF_TRIGGER_RISING |

				  IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,

				   IRQF_TRIGGER_FALLING,

				  "USB Over-current", info);

				  "USB Over-current", info);

		if (ret != 0) {

		if (ret != 0) {

			printk(KERN_ERR "failed to request usb oc irq\n");

			printk(KERN_ERR "failed to request usb oc irq\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE