Unverified Commit 16695153 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v7.1/soc-signed' of... 

Merge tag 'omap-for-v7.1/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap into soc/arm

ARM: soc/omap updates for v7.1

* tag 'omap-for-v7.1/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap

:
  ARM: omap2: dead code cleanup in kconfig for ARCH_OMAP4
  ARM: OMAP1: Fix DEBUG_LL and earlyprintk on OMAP16XX
  ARM: omap: fix all kernel-doc warnings
  ARM: omap2: Replace scnprintf with strscpy in omap3_cpuinfo

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 9ac42035 9ceb17cc

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

include/linux/platform_data/voltage-omap.h

+2 −2
Original line number Diff line number Diff line
@@ -10,14 +10,14 @@ 


/**

 * struct omap_volt_data - Omap voltage specific data.

 * @voltage_nominal:	The possible voltage value in uV

 * @volt_nominal:	The possible voltage value in uV

 * @sr_efuse_offs:	The offset of the efuse register(from system

 *			control module base address) from where to read

 *			the n-target value for the smartreflex module.

 * @sr_errminlimit:	Error min limit value for smartreflex. This value

 *			differs at differnet opp and thus is linked

 *			with voltage.

 * @vp_errorgain:	Error gain value for the voltage processor. This

 * @vp_errgain:		Error gain value for the voltage processor. This

 *			field also differs according to the voltage/opp.

 */

struct omap_volt_data {