Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge tag 'samsung-soc-4.11' of... 

Merge tag 'samsung-soc-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/soc

Samsung mach/soc update for v4.11. Mostly cleanups:
1. Removal of unused platform data in S3C24XX and S3C64xx as follow up of
   conversion to new DMA channel request API.
2. Adding const and __ro_after_init to various data in Samsung platforms.

* tag 'samsung-soc-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux

:
  ARM: s3c64xx: Constify wake_irqs
  ARM: s3c24xx: Constify wake_irqs
  ARM: SAMSUNG: Constify array of wake irqs passed to samsung_sync_wakemask
  ARM: s3c64xx: Annotate external clock frequencies __ro_after_init
  ARM: s3c24xx: Constify few integer tables
  ARM: EXYNOS: Annotate iomem and pm_data pointers __ro_after_init
  ARM: EXYNOS: Constify list of retention registers
  ARM: s3c24xx: Drop unused struct s3c_audio_pdata entries
  ARM: s3c64xx: Drop initialization of unused struct s3c_audio_pdata fields

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents ddcb0a76 cda1a52d

arch/arm/mach-exynos/exynos.c

+2 −2
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ static struct platform_device exynos_cpuidle = { 
	.id                = -1,

};



void __iomem *sysram_base_addr;

void __iomem *sysram_ns_base_addr;

void __iomem *sysram_base_addr __ro_after_init;

void __iomem *sysram_ns_base_addr __ro_after_init;



void __init exynos_sysram_init(void)

{

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

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#define EXYNOS5420_USE_ARM_CORE_DOWN_STATE	BIT(29)

#define EXYNOS5420_USE_L2_COMMON_UP_STATE	BIT(30)



static void __iomem *ns_sram_base_addr;

static void __iomem *ns_sram_base_addr __ro_after_init;



/*

 * The common v7_exit_coherency_flush API could not be used because of the

arch/arm/mach-exynos/suspend.c

+5 −5
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ struct exynos_wkup_irq { 
struct exynos_pm_data {

	const struct exynos_wkup_irq *wkup_irq;

	unsigned int wake_disable_mask;

	unsigned int *release_ret_regs;

	const unsigned int *release_ret_regs;



	void (*pm_prepare)(void);

	void (*pm_resume_prepare)(void);
@@ -66,7 +66,7 @@ struct exynos_pm_data { 
	int (*cpu_suspend)(unsigned long);

};



static const struct exynos_pm_data *pm_data;

static const struct exynos_pm_data *pm_data __ro_after_init;



static int exynos5420_cpu_state;

static unsigned int exynos_pmu_spare3;
@@ -95,7 +95,7 @@ static const struct exynos_wkup_irq exynos5250_wkup_irq[] = { 
	{ /* sentinel */ },

};



static unsigned int exynos_release_ret_regs[] = {

static const unsigned int exynos_release_ret_regs[] = {

	S5P_PAD_RET_MAUDIO_OPTION,

	S5P_PAD_RET_GPIO_OPTION,

	S5P_PAD_RET_UART_OPTION,
@@ -106,7 +106,7 @@ static unsigned int exynos_release_ret_regs[] = { 
	REG_TABLE_END,

};



static unsigned int exynos3250_release_ret_regs[] = {

static const unsigned int exynos3250_release_ret_regs[] = {

	S5P_PAD_RET_MAUDIO_OPTION,

	S5P_PAD_RET_GPIO_OPTION,

	S5P_PAD_RET_UART_OPTION,
@@ -119,7 +119,7 @@ static unsigned int exynos3250_release_ret_regs[] = { 
	REG_TABLE_END,

};



static unsigned int exynos5420_release_ret_regs[] = {

static const unsigned int exynos5420_release_ret_regs[] = {

	EXYNOS_PAD_RET_DRAM_OPTION,

	EXYNOS_PAD_RET_MAUDIO_OPTION,

	EXYNOS_PAD_RET_JTAG_OPTION,

arch/arm/mach-s3c24xx/bast-irq.c

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
/* table of ISA irq nos to the relevant mask... zero means

 * the irq is not implemented

*/

static unsigned char bast_pc104_irqmasks[] = {

static const unsigned char bast_pc104_irqmasks[] = {

	0,   /* 0 */

	0,   /* 1 */

	0,   /* 2 */
@@ -63,7 +63,7 @@ static unsigned char bast_pc104_irqmasks[] = { 
	0,   /* 15 */

};



static unsigned char bast_pc104_irqs[] = { 3, 5, 7, 10 };

static const unsigned char bast_pc104_irqs[] = { 3, 5, 7, 10 };



static void

bast_pc104_mask(struct irq_data *data)

arch/arm/mach-s3c24xx/iotiming-s3c2410.c

+1 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ static int s3c2410_calc_bank(struct s3c_cpufreq_config *cfg, 
	return 0;

}



static unsigned int tacc_tab[] = {

static const unsigned int tacc_tab[] = {

	[0]	= 1,

	[1]	= 2,

	[2]	= 3,