Merge branch 'omap-for-v3.18/fixes-not-urgent' into omap-for-v3.18/intc-v2 (051c5440) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm/mach-omap2/board-generic.c

+13 −13

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@
		#define gic_of_init NULL
		#endif

		static struct of_device_id omap_dt_match_table[] __initdata = {
		static const struct of_device_id omap_dt_match_table[] __initconst = {
		{ .compatible = "simple-bus", },
		{ .compatible = "ti,omap-infra", },
		{ }
		@@ -43,7 +43,7 @@ static void __init omap_generic_init(void)
		}

		#ifdef CONFIG_SOC_OMAP2420
		static const char *omap242x_boards_compat[] __initconst = {
		static const char *const omap242x_boards_compat[] __initconst = {
		"ti,omap2420",
		NULL,
		};
		@@ -62,7 +62,7 @@ MACHINE_END
		#endif

		#ifdef CONFIG_SOC_OMAP2430
		static const char *omap243x_boards_compat[] __initconst = {
		static const char *const omap243x_boards_compat[] __initconst = {
		"ti,omap2430",
		NULL,
		};
		@@ -81,7 +81,7 @@ MACHINE_END
		#endif

		#ifdef CONFIG_ARCH_OMAP3
		static const char *omap3_boards_compat[] __initconst = {
		static const char *const omap3_boards_compat[] __initconst = {
		"ti,omap3430",
		"ti,omap3",
		NULL,
		@@ -100,7 +100,7 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)")
		.restart = omap3xxx_restart,
		MACHINE_END

		static const char *omap36xx_boards_compat[] __initconst = {
		static const char *const omap36xx_boards_compat[] __initconst = {
		"ti,omap36xx",
		NULL,
		};
		@@ -118,7 +118,7 @@ DT_MACHINE_START(OMAP36XX_DT, "Generic OMAP36xx (Flattened Device Tree)")
		.restart = omap3xxx_restart,
		MACHINE_END

		static const char *omap3_gp_boards_compat[] __initconst = {
		static const char *const omap3_gp_boards_compat[] __initconst = {
		"ti,omap3-beagle",
		"timll,omap3-devkit8000",
		NULL,
		@@ -137,7 +137,7 @@ DT_MACHINE_START(OMAP3_GP_DT, "Generic OMAP3-GP (Flattened Device Tree)")
		.restart = omap3xxx_restart,
		MACHINE_END

		static const char *am3517_boards_compat[] __initconst = {
		static const char *const am3517_boards_compat[] __initconst = {
		"ti,am3517",
		NULL,
		};
		@@ -157,7 +157,7 @@ MACHINE_END
		#endif

		#ifdef CONFIG_SOC_AM33XX
		static const char *am33xx_boards_compat[] __initconst = {
		static const char *const am33xx_boards_compat[] __initconst = {
		"ti,am33xx",
		NULL,
		};
		@@ -177,7 +177,7 @@ MACHINE_END
		#endif

		#ifdef CONFIG_ARCH_OMAP4
		static const char *omap4_boards_compat[] __initconst = {
		static const char *const omap4_boards_compat[] __initconst = {
		"ti,omap4460",
		"ti,omap4430",
		"ti,omap4",
		@@ -199,7 +199,7 @@ MACHINE_END
		#endif

		#ifdef CONFIG_SOC_OMAP5
		static const char *omap5_boards_compat[] __initconst = {
		static const char *const omap5_boards_compat[] __initconst = {
		"ti,omap5432",
		"ti,omap5430",
		"ti,omap5",
		@@ -221,7 +221,7 @@ MACHINE_END
		#endif

		#ifdef CONFIG_SOC_AM43XX
		static const char *am43_boards_compat[] __initconst = {
		static const char *const am43_boards_compat[] __initconst = {
		"ti,am4372",
		"ti,am43",
		NULL,
		@@ -240,7 +240,7 @@ MACHINE_END
		#endif

		#ifdef CONFIG_SOC_DRA7XX
		static const char *dra74x_boards_compat[] __initconst = {
		static const char *const dra74x_boards_compat[] __initconst = {
		"ti,dra742",
		"ti,dra7",
		NULL,
		@@ -259,7 +259,7 @@ DT_MACHINE_START(DRA74X_DT, "Generic DRA74X (Flattened Device Tree)")
		.restart = omap44xx_restart,
		MACHINE_END

		static const char *dra72x_boards_compat[] __initconst = {
		static const char *const dra72x_boards_compat[] __initconst = {
		"ti,dra722",
		NULL,
		};

arch/arm/mach-omap2/common.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -307,7 +307,7 @@ static inline void omap4_cpu_resume(void)

		#endif

		void pdata_quirks_init(struct of_device_id *);
		void pdata_quirks_init(const struct of_device_id *);
		void omap_auxdata_legacy_init(struct device *dev);
		void omap_pcs_legacy_init(int irq, void (*rearm)(void));

arch/arm/mach-omap2/gpmc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1244,7 +1244,7 @@ int gpmc_cs_program_settings(int cs, struct gpmc_settings *p)
		}

		#ifdef CONFIG_OF
		static struct of_device_id gpmc_dt_ids[] = {
		static const struct of_device_id gpmc_dt_ids[] = {
		{ .compatible = "ti,omap2420-gpmc" },
		{ .compatible = "ti,omap2430-gpmc" },
		{ .compatible = "ti,omap3430-gpmc" }, /* omap3430 & omap3630 */

arch/arm/mach-omap2/irq.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -289,7 +289,7 @@ int __init intc_of_init(struct device_node *node,
		return 0;
		}

		static struct of_device_id irq_match[] __initdata = {
		static const struct of_device_id irq_match[] __initconst = {
		{ .compatible = "ti,omap2-intc", .data = intc_of_init, },
		{ }
		};

arch/arm/mach-omap2/pdata-quirks.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -415,7 +415,7 @@ static void pdata_quirks_check(struct pdata_init *quirks)
		}
		}

		void __init pdata_quirks_init(struct of_device_id *omap_dt_match_table)
		void __init pdata_quirks_init(const struct of_device_id *omap_dt_match_table)
		{
		omap_sdrc_init(NULL, NULL);
		pdata_quirks_check(auxdata_quirks);