Unverified Commit 54cb981c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v6.5/cleanup-signed' of... 

Merge tag 'omap-for-v6.5/cleanup-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into soc/arm

Clean-up for omaps for v6.5

Two patches for checkpatch warnings, and one change to use pr_err instead
of printk.

* tag 'omap-for-v6.5/cleanup-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: omap2: Fix checkpatch issues
  arm: omap1: replace printk() with pr_err macro
  ARM: omap: Fix checkpatch issues

Link: https://lore.kernel.org/r/pull-1685946511-835910@atomide.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 8f7913c0 937e8722

arch/arm/mach-omap1/pm.c

+1 −1
Original line number Diff line number Diff line
@@ -632,7 +632,7 @@ static int __init omap_pm_init(void) 


	error = sysfs_create_file(power_kobj, &sleep_while_idle_attr.attr);

	if (error)

		printk(KERN_ERR "sysfs_create_file failed: %d\n", error);

		pr_err("sysfs_create_file failed: %d\n", error);



	if (cpu_is_omap16xx()) {

		/* configure LOW_PWR pin */

arch/arm/mach-omap2/omap-wakeupgen.c

+1 −0
Original line number Diff line number Diff line
@@ -374,6 +374,7 @@ static void irq_restore_context(void) 
static void irq_save_secure_context(void)

{

	u32 ret;



	ret = omap_secure_dispatcher(OMAP4_HAL_SAVEGIC_INDEX,

				FLAG_START_CRITICAL,

				0, 0, 0, 0, 0);

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

+5 −6
Original line number Diff line number Diff line
@@ -2172,7 +2172,7 @@ static struct omap_hwmod am35xx_emac_hwmod = { 
	/*

	 * According to Mark Greer, the MPU will not return from WFI

	 * when the EMAC signals an interrupt.

	 * http://www.spinics.net/lists/arm-kernel/msg174734.html

	 * https://lore.kernel.org/all/1336770778-23044-3-git-send-email-mgreer@animalcreek.com/

	 */

	.flags		= (HWMOD_NO_IDLEST | HWMOD_BLOCK_WFI),

};
@@ -2346,13 +2346,12 @@ static struct omap_hwmod_ocp_if *omap36xx_sham_hwmod_ocp_ifs[] __initdata = { 
	NULL

};





/*

 * Apparently the SHA/MD5 and AES accelerator IP blocks are

 * only present on some AM35xx chips, and no one knows which

 * ones.  See

 * http://www.spinics.net/lists/arm-kernel/msg215466.html So

 * if you need these IP blocks on an AM35xx, try uncommenting

 * ones.

 * See https://lore.kernel.org/all/20130108203853.GB1876@animalcreek.com/

 * So if you need these IP blocks on an AM35xx, try uncommenting

 * the following lines.

 */

static struct omap_hwmod_ocp_if *am35xx_sham_hwmod_ocp_ifs[] __initdata = {

arch/arm/mach-omap2/sdrc2xxx.c

+0 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * linux/arch/arm/mach-omap2/sdrc2xxx.c

 *

 * SDRAM timing related functions for OMAP2xxx

 *

 * Copyright (C) 2005, 2008 Texas Instruments Inc.

arch/arm/mach-omap2/sram.c

+2 −2
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static void omap_sram_reset(void) 
 */

static int is_sram_locked(void)

{

	if (OMAP2_DEVICE_TYPE_GP == omap_type()) {

	if (omap_type() == OMAP2_DEVICE_TYPE_GP) {

		/* RAMFW: R/W access to all initiators for all qualifier sets */

		if (cpu_is_omap242x()) {

			writel_relaxed(0xFF, OMAP24XX_VA_REQINFOPERM0); /* all q-vects */