Commit 54cb981c authored by Arnd Bergmann's avatar Arnd Bergmann

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.comSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 8f7913c0 937e8722
...@@ -632,7 +632,7 @@ static int __init omap_pm_init(void) ...@@ -632,7 +632,7 @@ static int __init omap_pm_init(void)
error = sysfs_create_file(power_kobj, &sleep_while_idle_attr.attr); error = sysfs_create_file(power_kobj, &sleep_while_idle_attr.attr);
if (error) 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()) { if (cpu_is_omap16xx()) {
/* configure LOW_PWR pin */ /* configure LOW_PWR pin */
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#define OMAP1_SRAM_PA 0x20000000 #define OMAP1_SRAM_PA 0x20000000
#define SRAM_BOOTLOADER_SZ 0x80 #define SRAM_BOOTLOADER_SZ 0x80
#define ROUND_DOWN(value,boundary) ((value) & (~((boundary)-1))) #define ROUND_DOWN(value, boundary) ((value) & (~((boundary) - 1)))
static void __iomem *omap_sram_base; static void __iomem *omap_sram_base;
static unsigned long omap_sram_start; static unsigned long omap_sram_start;
......
...@@ -374,6 +374,7 @@ static void irq_restore_context(void) ...@@ -374,6 +374,7 @@ static void irq_restore_context(void)
static void irq_save_secure_context(void) static void irq_save_secure_context(void)
{ {
u32 ret; u32 ret;
ret = omap_secure_dispatcher(OMAP4_HAL_SAVEGIC_INDEX, ret = omap_secure_dispatcher(OMAP4_HAL_SAVEGIC_INDEX,
FLAG_START_CRITICAL, FLAG_START_CRITICAL,
0, 0, 0, 0, 0); 0, 0, 0, 0, 0);
......
...@@ -1851,7 +1851,7 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__dss_rfbi = { ...@@ -1851,7 +1851,7 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__dss_rfbi = {
.fw = { .fw = {
.omap2 = { .omap2 = {
.l4_fw_region = OMAP3_L4_CORE_FW_DSS_RFBI_REGION, .l4_fw_region = OMAP3_L4_CORE_FW_DSS_RFBI_REGION,
.l4_prot_group = OMAP3_L4_CORE_FW_DSS_PROT_GROUP , .l4_prot_group = OMAP3_L4_CORE_FW_DSS_PROT_GROUP,
.flags = OMAP_FIREWALL_L4, .flags = OMAP_FIREWALL_L4,
}, },
}, },
...@@ -2172,7 +2172,7 @@ static struct omap_hwmod am35xx_emac_hwmod = { ...@@ -2172,7 +2172,7 @@ static struct omap_hwmod am35xx_emac_hwmod = {
/* /*
* According to Mark Greer, the MPU will not return from WFI * According to Mark Greer, the MPU will not return from WFI
* when the EMAC signals an interrupt. * 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), .flags = (HWMOD_NO_IDLEST | HWMOD_BLOCK_WFI),
}; };
...@@ -2346,13 +2346,12 @@ static struct omap_hwmod_ocp_if *omap36xx_sham_hwmod_ocp_ifs[] __initdata = { ...@@ -2346,13 +2346,12 @@ static struct omap_hwmod_ocp_if *omap36xx_sham_hwmod_ocp_ifs[] __initdata = {
NULL NULL
}; };
/* /*
* Apparently the SHA/MD5 and AES accelerator IP blocks are * Apparently the SHA/MD5 and AES accelerator IP blocks are
* only present on some AM35xx chips, and no one knows which * only present on some AM35xx chips, and no one knows which
* ones. See * ones.
* http://www.spinics.net/lists/arm-kernel/msg215466.html So * See https://lore.kernel.org/all/20130108203853.GB1876@animalcreek.com/
* if you need these IP blocks on an AM35xx, try uncommenting * So if you need these IP blocks on an AM35xx, try uncommenting
* the following lines. * the following lines.
*/ */
static struct omap_hwmod_ocp_if *am35xx_sham_hwmod_ocp_ifs[] __initdata = { static struct omap_hwmod_ocp_if *am35xx_sham_hwmod_ocp_ifs[] __initdata = {
......
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* /*
* linux/arch/arm/mach-omap2/sdrc2xxx.c
*
* SDRAM timing related functions for OMAP2xxx * SDRAM timing related functions for OMAP2xxx
* *
* Copyright (C) 2005, 2008 Texas Instruments Inc. * Copyright (C) 2005, 2008 Texas Instruments Inc.
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
#define GP_DEVICE 0x300 #define GP_DEVICE 0x300
#define ROUND_DOWN(value,boundary) ((value) & (~((boundary)-1))) #define ROUND_DOWN(value, boundary) ((value) & (~((boundary) - 1)))
static unsigned long omap_sram_start; static unsigned long omap_sram_start;
static unsigned long omap_sram_size; static unsigned long omap_sram_size;
...@@ -118,7 +118,7 @@ static void omap_sram_reset(void) ...@@ -118,7 +118,7 @@ static void omap_sram_reset(void)
*/ */
static int is_sram_locked(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 */ /* RAMFW: R/W access to all initiators for all qualifier sets */
if (cpu_is_omap242x()) { if (cpu_is_omap242x()) {
writel_relaxed(0xFF, OMAP24XX_VA_REQINFOPERM0); /* all q-vects */ writel_relaxed(0xFF, OMAP24XX_VA_REQINFOPERM0); /* all q-vects */
......
...@@ -26,5 +26,6 @@ void ti81xx_restart(enum reboot_mode mode, const char *cmd) ...@@ -26,5 +26,6 @@ void ti81xx_restart(enum reboot_mode mode, const char *cmd)
{ {
omap2_prm_set_mod_reg_bits(TI81XX_GLOBAL_RST_COLD, 0, omap2_prm_set_mod_reg_bits(TI81XX_GLOBAL_RST_COLD, 0,
TI81XX_PRM_DEVICE_RSTCTRL); TI81XX_PRM_DEVICE_RSTCTRL);
while (1); while (1)
;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment