Commit 8242c709 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'soc-arm-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull SoC ARM code updates from Arnd Bergmann:
 "These are again very minimal updates:

   - A workaround for firmware on Google Nexus 10

   - A fix for early debugging on OMAP1

   - A rework for Microchip SoC configuration

   - Cleanups on OMAP2 an R-Car-Gen2"

* tag 'soc-arm-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  ARM: omap2: dead code cleanup in kconfig for ARCH_OMAP4
  ARM: OMAP1: Fix DEBUG_LL and earlyprintk on OMAP16XX
  arm64: Kconfig: provide a top-level switch for Microchip platforms
  ARM: shmobile: rcar-gen2: Use of_phandle_args_equal() helper
  ARM: omap: fix all kernel-doc warnings
  ARM: omap2: Replace scnprintf with strscpy in omap3_cpuinfo
  ARM: samsung: exynos5250: Allow CPU1 to boot
parents 231d7030 3ef628c3

arch/arm/mach-exynos/firmware.c

+2 −2
Original line number Diff line number Diff line
@@ -61,10 +61,10 @@ static int exynos_cpu_boot(int cpu) 
	 * Exynos3250 doesn't need to send smc command for secondary CPU boot

	 * because Exynos3250 removes WFE in secure mode.

	 *

	 * On Exynos5 devices the call is ignored by trustzone firmware.

	 * On most Exynos5 devices the call is ignored by trustzone firmware.

	 */

	if (!soc_is_exynos4210() && !soc_is_exynos4212() &&

	    !soc_is_exynos4412())

	    !soc_is_exynos4412() && !of_machine_is_compatible("google,manta"))

		return 0;



	/*

arch/arm/mach-omap1/clock_data.c

+2 −2
Original line number Diff line number Diff line
@@ -700,8 +700,8 @@ int __init omap1_clk_init(void) 
	/* Make sure UART clocks are enabled early */

	if (cpu_is_omap16xx())

		omap_writel(omap_readl(MOD_CONF_CTRL_0) |

			    CONF_MOD_UART1_CLK_MODE_R |

			    CONF_MOD_UART3_CLK_MODE_R, MOD_CONF_CTRL_0);

			    (1 << CONF_MOD_UART1_CLK_MODE_R) |

			    (1 << CONF_MOD_UART3_CLK_MODE_R), MOD_CONF_CTRL_0);

#endif



	/* USB_REQ_EN will be disabled later if necessary (usb_dc_ck) */

arch/arm/mach-omap2/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ config ARCH_OMAP4 
	select PM if CPU_IDLE

	select ARM_ERRATA_754322

	select ARM_ERRATA_775420

	select OMAP_INTERCONNECT



config SOC_OMAP5

	bool "TI OMAP5"

arch/arm/mach-omap2/id.c

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/io.h>

#include <linux/random.h>

#include <linux/slab.h>

#include <linux/string.h>



#ifdef CONFIG_SOC_BUS

#include <linux/sys_soc.h>
@@ -250,7 +251,7 @@ static void __init omap3_cpuinfo(void) 
		cpu_name = "OMAP3503";

	}



	scnprintf(soc_name, sizeof(soc_name), "%s", cpu_name);

	strscpy(soc_name, cpu_name);



	/* Print verbose information */

	n += scnprintf(buf, sizeof(buf) - n, "%s %s (", soc_name, soc_rev);

arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c

+4 −12
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static struct notifier_block regulator_quirk_nb = { 
static int __init rcar_gen2_regulator_quirk(void)

{

	struct regulator_quirk *quirk, *pos, *tmp;

	struct of_phandle_args *argsa, *argsb;

	struct of_phandle_args *args;

	const struct of_device_id *id;

	struct device_node *np;

	u32 mon, addr;
@@ -171,14 +171,14 @@ static int __init rcar_gen2_regulator_quirk(void) 
			goto err_mem;

		}



		argsa = &quirk->irq_args;

		args = &quirk->irq_args;

		memcpy(&quirk->i2c_msg, id->data, sizeof(quirk->i2c_msg));



		quirk->id = id;

		quirk->np = of_node_get(np);

		quirk->i2c_msg.addr = addr;



		ret = of_irq_parse_one(np, 0, argsa);

		ret = of_irq_parse_one(np, 0, args);

		if (ret) {	/* Skip invalid entry and continue */

			of_node_put(np);

			kfree(quirk);
@@ -186,15 +186,7 @@ static int __init rcar_gen2_regulator_quirk(void) 
		}



		list_for_each_entry(pos, &quirk_list, list) {

			argsb = &pos->irq_args;



			if (argsa->args_count != argsb->args_count)

				continue;



			ret = memcmp(argsa->args, argsb->args,

				     argsa->args_count *

				     sizeof(argsa->args[0]));

			if (!ret) {

			if (of_phandle_args_equal(args, &pos->irq_args)) {

				pos->shared = true;

				quirk->shared = true;

			}