Re: [PATCH 13/13] sh: lib: convert to SPDX identifiers
On Mon, 20 Aug 2018 10:37:49 +0900, Kuninori Morimoto wrote: > > > Hi Simon, Sato-san > > > > From: Kuninori Morimoto > > > > > > This patch updates license to use SPDX-License-Identifier > > > instead of verbose license text. > > > > > > Signed-off-by: Kuninori Morimoto > > > --- > (snip) > > > -In addition to the permissions in the GNU General Public License, the > > > -Free Software Foundation gives you unlimited permission to link the > > > -compiled version of this file into combinations with other programs, > > > -and to distribute those combinations without any restriction coming > > > -from the use of this file. (The General Public License restrictions > > > -do apply in other respects; for example, they cover modification of > > > -the file, and distribution when not linked into a combine > > > -executable.) > > > > Given the above clause I wonder if the SPDX identifier should be: > > > > SPDX-License-Identifier: GPL-2.0+ WITH GCC-exception-2.0 > > Ahh, indeed. > I will post v2 patch. > Sato-san, can I post [13/13 v2] only ? or should post all patches ? > Please sent all patches. Thanks. -- Yosinori Sato
[PATCH] sh-sci: Separate sci_port on earlycon
sci0 and earlycon use same sci_port.
So earlycon dead after sci0 initialize.
This fix assign separate sci_port for earlycon.
Signed-off-by: Yoshinori Sato <ys...@users.sourceforge.jp>
---
drivers/tty/serial/sh-sci.c | 24 +++-
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 5a73620..210c95e 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -146,6 +146,8 @@ struct sci_port {
#define SCI_NPORTS CONFIG_SERIAL_SH_SCI_NR_UARTS
static struct sci_port sci_ports[SCI_NPORTS];
+#define EARLY_INDEX 256
+static struct sci_port earlycon_port;
static struct uart_driver sci_uart_driver;
static inline struct sci_port *
@@ -2510,7 +2512,6 @@ static int sci_init_single(struct platform_device *dev,
int ret;
sci_port->cfg = p;
-
port->ops = _uart_ops;
port->iotype= UPIO_MEM;
port->line = index;
@@ -2668,12 +2669,16 @@ static void serial_console_putchar(struct uart_port
*port, int ch)
static void serial_console_write(struct console *co, const char *s,
unsigned count)
{
- struct sci_port *sci_port = _ports[co->index];
- struct uart_port *port = _port->port;
+ struct sci_port *sci_port;
+ struct uart_port *port;
unsigned short bits, ctrl, ctrl_temp;
unsigned long flags;
int locked = 1;
+ sci_port = (co->index != EARLY_INDEX) ?
+ _ports[co->index] : _port;
+ port = _port->port;
+
local_irq_save(flags);
#if defined(SUPPORT_SYSRQ)
if (port->sysrq)
@@ -3036,13 +3041,14 @@ static int __init early_console_setup(struct
earlycon_device *device,
device->port.serial_in = sci_serial_in;
device->port.serial_out = sci_serial_out;
device->port.type = type;
- memcpy(_ports[0].port, >port, sizeof(struct uart_port));
- sci_ports[0].cfg = _cfg;
- sci_ports[0].cfg->type = type;
- sci_probe_regmap(sci_ports[0].cfg);
- port_cfg.scscr = sci_serial_in(_ports[0].port, SCSCR) |
+ device->con->index = EARLY_INDEX;
+ memcpy(_port.port, >port, sizeof(struct uart_port));
+ earlycon_port.cfg = _cfg;
+ earlycon_port.cfg->type = type;
+ sci_probe_regmap(earlycon_port.cfg);
+ port_cfg.scscr = sci_serial_in(_port.port, SCSCR) |
SCSCR_RE | SCSCR_TE;
- sci_serial_out(_ports[0].port, SCSCR, port_cfg.scscr);
+ sci_serial_out(_port.port, SCSCR, port_cfg.scscr);
device->con->write = serial_console_write;
return 0;
--
2.7.0
Re: [PATCH 2/6] mmc: sh_mobile_sdhi: remove obsolete irq_by_name registration
sr) {
> > > > - dev_err(>dev,
> > > > - "Principal SD-card IRQ is missing among named
> > > > interrupts\n");
> > > > + /* There must be at least one IRQ source */
> > > > + if (!i) {
> > > > ret = irq;
> > > > goto eirq;
> > > > }
> > > >
> > > > - if (multiplexed_isr) {
> > > > - while (1) {
> > > > - irq = platform_get_irq(pdev, i);
> > > > - if (irq < 0)
> > > > - break;
> > > > - i++;
> > > > - ret = devm_request_irq(>dev, irq,
> > > > tmio_mmc_irq, 0,
> > > > - dev_name(>dev), host);
> > > > - if (ret)
> > > > - goto eirq;
> > > > - }
> > > > -
> > > > - /* There must be at least one IRQ source */
> > > > - if (!i) {
> > > > - ret = irq;
> > > > - goto eirq;
> > > > - }
> > > > - }
> > > > -
> > > > dev_info(>dev, "%s base at 0x%08lx max clock rate %u
> > > > MHz\n",
> > > > mmc_hostname(host->mmc), (unsigned long)
> > > > (platform_get_resource(pdev, IORESOURCE_MEM,
> > > > 0)->start),
> > > > diff --git a/include/linux/mmc/sh_mobile_sdhi.h
> > > > b/include/linux/mmc/sh_mobile_sdhi.h
> > > > deleted file mode 100644
> > > > index 95d6f0314a7ded..00
> > > > --- a/include/linux/mmc/sh_mobile_sdhi.h
> > > > +++ /dev/null
> > > > @@ -1,10 +0,0 @@
> > > > -#ifndef LINUX_MMC_SH_MOBILE_SDHI_H
> > > > -#define LINUX_MMC_SH_MOBILE_SDHI_H
> > > > -
> > > > -#include
> > > > -
> > > > -#define SH_MOBILE_SDHI_IRQ_CARD_DETECT "card_detect"
> > > > -#define SH_MOBILE_SDHI_IRQ_SDCARD "sdcard"
> > > > -#define SH_MOBILE_SDHI_IRQ_SDIO"sdio"
> > > > -
> > > > -#endif /* LINUX_MMC_SH_MOBILE_SDHI_H */
> > > > --
> > > > 2.7.0
> > > >
> > > > --
> > > > To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
> > > > the body of a message to majord...@vger.kernel.org
> > > > More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
--
Yoshinori Sato
<ys...@users.sourceforge.jp>
[PATCH] sh-sci: SysRq support on EARLYCON
Add missing flag condition. Signed-off-by: Yoshinori Sato <ys...@users.sourceforge.jp> --- drivers/tty/serial/sh-sci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index 0130feb..5a73620 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -18,7 +18,9 @@ * License. See the file "COPYING" in the main directory of this archive * for more details. */ -#if defined(CONFIG_SERIAL_SH_SCI_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) +#if (defined(CONFIG_SERIAL_SH_SCI_CONSOLE) || \ + defined(CONFIG_SERIAL_SH_SCI_EARLYCON)) && \ + defined(CONFIG_MAGIC_SYSRQ) #define SUPPORT_SYSRQ #endif -- 2.7.0
Re: [PATCH v4] h8300: dts: Rename the serial port clock to fck
On Fri, 29 Jan 2016 18:36:25 +0900,
Geert Uytterhoeven wrote:
>
> The clock is really the device functional clock, not the interface
> clock. Rename it.
>
> Signed-off-by: Geert Uytterhoeven <geert+rene...@glider.be>
> Acked-by: Laurent Pinchart <laurent.pinch...@ideasonboard.com>
> ---
> The new clock name has been accepted in the DT bindings in v4.5-rc1.
>
> v4:
> - No changes,
>
> v3:
> - Add Acked-by,
>
> v2:
> - New.
OK.
Applid. h8300-next.
> ---
> arch/h8300/boot/dts/edosk2674.dts | 6 +++---
> arch/h8300/boot/dts/h8300h_sim.dts | 4 ++--
> arch/h8300/boot/dts/h8s_sim.dts| 4 ++--
> 3 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/arch/h8300/boot/dts/edosk2674.dts
> b/arch/h8300/boot/dts/edosk2674.dts
> index 4ce9fa874a577e55..6ae884bf66a5268c 100644
> --- a/arch/h8300/boot/dts/edosk2674.dts
> +++ b/arch/h8300/boot/dts/edosk2674.dts
> @@ -88,20 +88,20 @@
> reg = <0x78 8>;
> interrupts = <88 0>, <89 0>, <90 0>, <91 0>;
> clocks = <>;
> - clock-names = "sci_ick";
> + clock-names = "fck";
> };
> sci1: serial@80 {
> compatible = "renesas,sci";
> reg = <0x80 8>;
> interrupts = <92 0>, <93 0>, <94 0>, <95 0>;
> clocks = <>;
> - clock-names = "sci_ick";
> + clock-names = "fck";
> };
> sci2: serial@88 {
> compatible = "renesas,sci";
> reg = <0x88 8>;
> interrupts = <96 0>, <97 0>, <98 0>, <99 0>;
> clocks = <>;
> - clock-names = "sci_ick";
> + clock-names = "fck";
> };
> };
> diff --git a/arch/h8300/boot/dts/h8300h_sim.dts
> b/arch/h8300/boot/dts/h8300h_sim.dts
> index 545bfb57af9a9f2e..9c733d920f1f0dc3 100644
> --- a/arch/h8300/boot/dts/h8300h_sim.dts
> +++ b/arch/h8300/boot/dts/h8300h_sim.dts
> @@ -83,7 +83,7 @@
> reg = <0xb0 8>;
> interrupts = <52 0>, <53 0>, <54 0>, <55 0>;
> clocks = <>;
> - clock-names = "sci_ick";
> + clock-names = "fck";
> };
>
> sci1: serial@b8 {
> @@ -91,6 +91,6 @@
> reg = <0xb8 8>;
> interrupts = <56 0>, <57 0>, <58 0>, <59 0>;
> clocks = <>;
> - clock-names = "sci_ick";
> + clock-names = "fck";
> };
> };
> diff --git a/arch/h8300/boot/dts/h8s_sim.dts b/arch/h8300/boot/dts/h8s_sim.dts
> index bcedba5a3ce7e8ae..97e1f4b17ef067d5 100644
> --- a/arch/h8300/boot/dts/h8s_sim.dts
> +++ b/arch/h8300/boot/dts/h8s_sim.dts
> @@ -87,13 +87,13 @@
> reg = <0x78 8>;
> interrupts = <88 0>, <89 0>, <90 0>, <91 0>;
> clocks = <>;
> - clock-names = "sci_ick";
> + clock-names = "fck";
> };
> sci1: serial@80 {
> compatible = "renesas,sci";
> reg = <0x80 8>;
> interrupts = <92 0>, <93 0>, <94 0>, <95 0>;
> clocks = <>;
> - clock-names = "sci_ick";
> + clock-names = "fck";
> };
> };
> --
> 1.9.1
>
--
Yoshinori Sato
<ys...@users.sourceforge.jp>
