* [PATCH 1/3] ARM: OMAP1: USB: tidy up logging output
@ 2017-01-02 20:57 Aaro Koskinen
2017-01-02 20:57 ` [PATCH 2/3] ARM: OMAP1: USB: make omap_otg_init() static Aaro Koskinen
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Aaro Koskinen @ 2017-01-02 20:57 UTC (permalink / raw)
To: Tony Lindgren, linux-omap, linux-arm-kernel; +Cc: Aaro Koskinen
KERN_CONT/pr_cont is now required to continue log messages, use that.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
---
arch/arm/mach-omap1/usb.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/arch/arm/mach-omap1/usb.c b/arch/arm/mach-omap1/usb.c
index 2506e59..d4aa118 100644
--- a/arch/arm/mach-omap1/usb.c
+++ b/arch/arm/mach-omap1/usb.c
@@ -95,17 +95,17 @@ omap_otg_init(struct omap_usb_config *config)
printk("USB: hmc %d", config->hmc_mode);
if (!alt_pingroup)
- printk(", usb2 alt %d wires", config->pins[2]);
+ pr_cont(", usb2 alt %d wires", config->pins[2]);
else if (config->pins[0])
- printk(", usb0 %d wires%s", config->pins[0],
+ pr_cont(", usb0 %d wires%s", config->pins[0],
is_usb0_device(config) ? " (dev)" : "");
if (config->pins[1])
- printk(", usb1 %d wires", config->pins[1]);
+ pr_cont(", usb1 %d wires", config->pins[1]);
if (!alt_pingroup && config->pins[2])
- printk(", usb2 %d wires", config->pins[2]);
+ pr_cont(", usb2 %d wires", config->pins[2]);
if (config->otg)
- printk(", Mini-AB on usb%d", config->otg - 1);
- printk("\n");
+ pr_cont(", Mini-AB on usb%d", config->otg - 1);
+ pr_cont("\n");
if (cpu_class_is_omap1()) {
u16 w;
@@ -573,13 +573,13 @@ static void __init omap_1510_usb_init(struct omap_usb_config *config)
printk("USB: hmc %d", config->hmc_mode);
if (config->pins[0])
- printk(", usb0 %d wires%s", config->pins[0],
+ pr_cont(", usb0 %d wires%s", config->pins[0],
is_usb0_device(config) ? " (dev)" : "");
if (config->pins[1])
- printk(", usb1 %d wires", config->pins[1]);
+ pr_cont(", usb1 %d wires", config->pins[1]);
if (config->pins[2])
- printk(", usb2 %d wires", config->pins[2]);
- printk("\n");
+ pr_cont(", usb2 %d wires", config->pins[2]);
+ pr_cont("\n");
/* use DPLL for 48 MHz function clock */
pr_debug("APLL %04x DPLL %04x REQ %04x\n", omap_readw(ULPD_APLL_CTRL),
--
2.9.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/3] ARM: OMAP1: USB: make omap_otg_init() static
2017-01-02 20:57 [PATCH 1/3] ARM: OMAP1: USB: tidy up logging output Aaro Koskinen
@ 2017-01-02 20:57 ` Aaro Koskinen
2017-01-02 20:57 ` [PATCH 3/3] ARM: OMAP1: USB: delete redundant CPU class checks Aaro Koskinen
2017-01-05 17:35 ` [PATCH 1/3] ARM: OMAP1: USB: tidy up logging output Tony Lindgren
2 siblings, 0 replies; 4+ messages in thread
From: Aaro Koskinen @ 2017-01-02 20:57 UTC (permalink / raw)
To: Tony Lindgren, linux-omap, linux-arm-kernel; +Cc: Aaro Koskinen
Make omap_otg_init() static.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
---
arch/arm/mach-omap1/include/mach/usb.h | 2 --
arch/arm/mach-omap1/usb.c | 4 ++--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-omap1/include/mach/usb.h b/arch/arm/mach-omap1/include/mach/usb.h
index a7c5559..eb76628 100644
--- a/arch/arm/mach-omap1/include/mach/usb.h
+++ b/arch/arm/mach-omap1/include/mach/usb.h
@@ -10,8 +10,6 @@
#include <linux/platform_data/usb-omap1.h>
-void omap_otg_init(struct omap_usb_config *config);
-
#if IS_ENABLED(CONFIG_USB)
void omap1_usb_init(struct omap_usb_config *pdata);
#else
diff --git a/arch/arm/mach-omap1/usb.c b/arch/arm/mach-omap1/usb.c
index d4aa118..0b4ed94 100644
--- a/arch/arm/mach-omap1/usb.c
+++ b/arch/arm/mach-omap1/usb.c
@@ -58,7 +58,7 @@
#ifdef CONFIG_ARCH_OMAP_OTG
-void __init
+static void __init
omap_otg_init(struct omap_usb_config *config)
{
u32 syscon;
@@ -166,7 +166,7 @@ omap_otg_init(struct omap_usb_config *config)
}
#else
-void omap_otg_init(struct omap_usb_config *config) {}
+static void omap_otg_init(struct omap_usb_config *config) {}
#endif
#if IS_ENABLED(CONFIG_USB_OMAP)
--
2.9.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 3/3] ARM: OMAP1: USB: delete redundant CPU class checks
2017-01-02 20:57 [PATCH 1/3] ARM: OMAP1: USB: tidy up logging output Aaro Koskinen
2017-01-02 20:57 ` [PATCH 2/3] ARM: OMAP1: USB: make omap_otg_init() static Aaro Koskinen
@ 2017-01-02 20:57 ` Aaro Koskinen
2017-01-05 17:35 ` [PATCH 1/3] ARM: OMAP1: USB: tidy up logging output Tony Lindgren
2 siblings, 0 replies; 4+ messages in thread
From: Aaro Koskinen @ 2017-01-02 20:57 UTC (permalink / raw)
To: Tony Lindgren, linux-omap, linux-arm-kernel; +Cc: Aaro Koskinen
Delete redundant CPU class checks. This code is only used
on OMAP1 nowadays.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
---
arch/arm/mach-omap1/usb.c | 27 ++++++++++++---------------
1 file changed, 12 insertions(+), 15 deletions(-)
diff --git a/arch/arm/mach-omap1/usb.c b/arch/arm/mach-omap1/usb.c
index 0b4ed94..455e2cf 100644
--- a/arch/arm/mach-omap1/usb.c
+++ b/arch/arm/mach-omap1/usb.c
@@ -1,5 +1,5 @@
/*
- * Platform level USB initialization for FS USB OTG controller on omap1 and 24xx
+ * Platform level USB initialization for FS USB OTG controller on omap1
*
* Copyright (C) 2004 Texas Instruments, Inc.
*
@@ -63,6 +63,7 @@ omap_otg_init(struct omap_usb_config *config)
{
u32 syscon;
int alt_pingroup = 0;
+ u16 w;
/* NOTE: no bus or clock setup (yet?) */
@@ -87,9 +88,8 @@ omap_otg_init(struct omap_usb_config *config)
if (config->otg)
syscon |= OTG_EN;
#endif
- if (cpu_class_is_omap1())
- pr_debug("USB_TRANSCEIVER_CTRL = %03x\n",
- omap_readl(USB_TRANSCEIVER_CTRL));
+ pr_debug("USB_TRANSCEIVER_CTRL = %03x\n",
+ omap_readl(USB_TRANSCEIVER_CTRL));
pr_debug("OTG_SYSCON_2 = %08x\n", omap_readl(OTG_SYSCON_2));
omap_writel(syscon, OTG_SYSCON_2);
@@ -107,19 +107,16 @@ omap_otg_init(struct omap_usb_config *config)
pr_cont(", Mini-AB on usb%d", config->otg - 1);
pr_cont("\n");
- if (cpu_class_is_omap1()) {
- u16 w;
+ /* leave USB clocks/controllers off until needed */
+ w = omap_readw(ULPD_SOFT_REQ);
+ w &= ~SOFT_USB_CLK_REQ;
+ omap_writew(w, ULPD_SOFT_REQ);
- /* leave USB clocks/controllers off until needed */
- w = omap_readw(ULPD_SOFT_REQ);
- w &= ~SOFT_USB_CLK_REQ;
- omap_writew(w, ULPD_SOFT_REQ);
+ w = omap_readw(ULPD_CLOCK_CTRL);
+ w &= ~USB_MCLK_EN;
+ w |= DIS_USB_PVCI_CLK;
+ omap_writew(w, ULPD_CLOCK_CTRL);
- w = omap_readw(ULPD_CLOCK_CTRL);
- w &= ~USB_MCLK_EN;
- w |= DIS_USB_PVCI_CLK;
- omap_writew(w, ULPD_CLOCK_CTRL);
- }
syscon = omap_readl(OTG_SYSCON_1);
syscon |= HST_IDLE_EN|DEV_IDLE_EN|OTG_IDLE_EN;
--
2.9.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 1/3] ARM: OMAP1: USB: tidy up logging output
2017-01-02 20:57 [PATCH 1/3] ARM: OMAP1: USB: tidy up logging output Aaro Koskinen
2017-01-02 20:57 ` [PATCH 2/3] ARM: OMAP1: USB: make omap_otg_init() static Aaro Koskinen
2017-01-02 20:57 ` [PATCH 3/3] ARM: OMAP1: USB: delete redundant CPU class checks Aaro Koskinen
@ 2017-01-05 17:35 ` Tony Lindgren
2 siblings, 0 replies; 4+ messages in thread
From: Tony Lindgren @ 2017-01-05 17:35 UTC (permalink / raw)
To: Aaro Koskinen; +Cc: linux-omap, linux-arm-kernel
* Aaro Koskinen <aaro.koskinen@iki.fi> [170102 12:58]:
> KERN_CONT/pr_cont is now required to continue log messages, use that.
Applying all into omap-for-v4.11/omap1 thanks.
Tony
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-01-05 17:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-02 20:57 [PATCH 1/3] ARM: OMAP1: USB: tidy up logging output Aaro Koskinen
2017-01-02 20:57 ` [PATCH 2/3] ARM: OMAP1: USB: make omap_otg_init() static Aaro Koskinen
2017-01-02 20:57 ` [PATCH 3/3] ARM: OMAP1: USB: delete redundant CPU class checks Aaro Koskinen
2017-01-05 17:35 ` [PATCH 1/3] ARM: OMAP1: USB: tidy up logging output Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).