[PATCH v2 13/13] sh: lib: convert to SPDX identifiers
From: Kuninori Morimoto This patch updates license to use SPDX-License-Identifier instead of verbose license text. Signed-off-by: Kuninori Morimoto --- arch/sh/lib/ashiftrt.S | 29 - arch/sh/lib/ashlsi3.S| 29 - arch/sh/lib/ashrsi3.S| 29 - arch/sh/lib/checksum.S | 9 +++-- arch/sh/lib/io.c | 5 + arch/sh/lib/libgcc.h | 2 ++ arch/sh/lib/lshrsi3.S| 29 - arch/sh/lib/mcount.S | 7 ++- arch/sh/lib/movmem.S | 29 - arch/sh/lib/udiv_qrnnd.S | 29 - arch/sh/lib/udivsi3.S| 29 - arch/sh/lib/udivsi3_i4i-Os.S | 29 - arch/sh/lib/udivsi3_i4i.S| 29 - 13 files changed, 44 insertions(+), 240 deletions(-) diff --git a/arch/sh/lib/ashiftrt.S b/arch/sh/lib/ashiftrt.S index 45ce865..0f7145e 100644 --- a/arch/sh/lib/ashiftrt.S +++ b/arch/sh/lib/ashiftrt.S @@ -1,30 +1,9 @@ -/* Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +/* SPDX-License-Identifier: GPL-2.0+ WITH GCC-exception-2.0 + + Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - -This file is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 2, or (at your option) any -later version. - -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.) - -This file is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; see the file COPYING. If not, write to -the Free Software Foundation, 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301, USA. */ +*/ !! libgcc routines for the Renesas / SuperH SH CPUs. !! Contributed by Steve Chamberlain. diff --git a/arch/sh/lib/ashlsi3.S b/arch/sh/lib/ashlsi3.S index 70a6434..4df4401 100644 --- a/arch/sh/lib/ashlsi3.S +++ b/arch/sh/lib/ashlsi3.S @@ -1,30 +1,9 @@ -/* Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +/* SPDX-License-Identifier: GPL-2.0+ WITH GCC-exception-2.0 + + Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - -This file is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 2, or (at your option) any -later version. - -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.) - -This file is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; see the file COPYING. If not, write to -the Free Software Foundation, 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301, USA. */ +*/ !! libgcc routines for the Renesas / SuperH SH CPUs. !! Contributed by Steve Chamberlain. diff --git a/arch/sh/lib/ashrsi3.S b/arch/sh/lib/ashrsi3.S index 602599d..bf3c4e03 100644 --- a/arch/sh/lib/ashrsi3.S +++ b/arch/sh/lib/ashrsi3.S @@ -1,30 +1,9 @@ -/* Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +/* SPDX-License-Identifier: GPL-2.0+ WITH GCC-exception-2.0 + + Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - -This file is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either v
[PATCH v2 11/13] sh: cpu: convert to SPDX identifiers
From: Kuninori Morimoto This patch updates license to use SPDX-License-Identifier instead of verbose license text. Signed-off-by: Kuninori Morimoto Reviewed-by: Simon Horman --- arch/sh/kernel/cpu/clock.c| 5 + arch/sh/kernel/cpu/init.c | 5 + arch/sh/kernel/cpu/irq/Makefile | 1 + arch/sh/kernel/cpu/irq/intc-sh5.c | 5 + arch/sh/kernel/cpu/irq/ipr.c | 5 + arch/sh/kernel/cpu/pfc.c | 10 +- 6 files changed, 6 insertions(+), 25 deletions(-) diff --git a/arch/sh/kernel/cpu/clock.c b/arch/sh/kernel/cpu/clock.c index fca9b1e7..6fb3441 100644 --- a/arch/sh/kernel/cpu/clock.c +++ b/arch/sh/kernel/cpu/clock.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/kernel/cpu/clock.c - SuperH clock framework * @@ -9,10 +10,6 @@ * Written by Tuukka Tikkanen * * Modified for omap shared clock framework by Tony Lindgren - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/kernel/cpu/init.c b/arch/sh/kernel/cpu/init.c index c4f01c5..ce7291e 100644 --- a/arch/sh/kernel/cpu/init.c +++ b/arch/sh/kernel/cpu/init.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/kernel/cpu/init.c * @@ -5,10 +6,6 @@ * * Copyright (C) 2002 - 2009 Paul Mundt * Copyright (C) 2003 Richard Curnow - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/kernel/cpu/irq/Makefile b/arch/sh/kernel/cpu/irq/Makefile index 3f8e794..8b91cb9 100644 --- a/arch/sh/kernel/cpu/irq/Makefile +++ b/arch/sh/kernel/cpu/irq/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 # # Makefile for the Linux/SuperH CPU-specific IRQ handlers. # diff --git a/arch/sh/kernel/cpu/irq/intc-sh5.c b/arch/sh/kernel/cpu/irq/intc-sh5.c index 9e056a3..744f903 100644 --- a/arch/sh/kernel/cpu/irq/intc-sh5.c +++ b/arch/sh/kernel/cpu/irq/intc-sh5.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/kernel/cpu/irq/intc-sh5.c * @@ -9,10 +10,6 @@ * Per-interrupt selective. IRLM=0 (Fixed priority) is not * supported being useless without a cascaded interrupt * controller. - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/kernel/cpu/irq/ipr.c b/arch/sh/kernel/cpu/irq/ipr.c index 5de6dff5..d41bce7 100644 --- a/arch/sh/kernel/cpu/irq/ipr.c +++ b/arch/sh/kernel/cpu/irq/ipr.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Interrupt handling for IPR-based IRQ. * @@ -11,10 +12,6 @@ * On-chip supporting modules for SH7709/SH7709A/SH7729. * Hitachi SolutionEngine external I/O: * MS7709SE01, MS7709ASE01, and MS7750SE01 - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/kernel/cpu/pfc.c b/arch/sh/kernel/cpu/pfc.c index d766564..062056e 100644 --- a/arch/sh/kernel/cpu/pfc.c +++ b/arch/sh/kernel/cpu/pfc.c @@ -1,16 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * SH Pin Function Control Initialization * * Copyright (C) 2012 Renesas Solutions Corp. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include -- 2.7.4
[PATCH v2 12/13] sh: kernel: convert to SPDX identifiers
From: Kuninori Morimoto This patch updates license to use SPDX-License-Identifier instead of verbose license text. Signed-off-by: Kuninori Morimoto Reviewed-by: Simon Horman --- arch/sh/kernel/debugtraps.S| 7 ++- arch/sh/kernel/disassemble.c | 5 + arch/sh/kernel/dma-coherent.c | 5 + arch/sh/kernel/dumpstack.c | 5 + arch/sh/kernel/dwarf.c | 5 + arch/sh/kernel/entry-common.S | 8 ++-- arch/sh/kernel/head_32.S | 7 ++- arch/sh/kernel/head_64.S | 7 ++- arch/sh/kernel/hw_breakpoint.c | 5 + arch/sh/kernel/idle.c | 5 + arch/sh/kernel/io.c| 5 + arch/sh/kernel/io_trapped.c| 5 + arch/sh/kernel/iomap.c | 5 + arch/sh/kernel/ioport.c| 5 + arch/sh/kernel/irq_32.c| 5 + arch/sh/kernel/irq_64.c| 5 + arch/sh/kernel/kgdb.c | 5 + arch/sh/kernel/kprobes.c | 5 + arch/sh/kernel/machine_kexec.c | 4 +--- arch/sh/kernel/machvec.c | 5 + arch/sh/kernel/module.c| 15 +-- arch/sh/kernel/nmi_debug.c | 5 + arch/sh/kernel/perf_callchain.c| 5 + arch/sh/kernel/perf_event.c| 5 + arch/sh/kernel/process_32.c| 5 + arch/sh/kernel/process_64.c| 5 + arch/sh/kernel/ptrace_32.c | 5 + arch/sh/kernel/ptrace_64.c | 5 + arch/sh/kernel/relocate_kernel.S | 6 ++ arch/sh/kernel/return_address.c| 5 + arch/sh/kernel/sh_bios.c | 5 + arch/sh/kernel/sh_ksyms_64.c | 5 + arch/sh/kernel/signal_64.c | 5 + arch/sh/kernel/smp.c | 5 + arch/sh/kernel/stacktrace.c| 5 + arch/sh/kernel/swsusp.c| 5 + arch/sh/kernel/syscalls_32.S | 8 ++-- arch/sh/kernel/syscalls_64.S | 7 ++- arch/sh/kernel/time.c | 5 + arch/sh/kernel/topology.c | 5 + arch/sh/kernel/traps_32.c | 5 + arch/sh/kernel/traps_64.c | 5 + arch/sh/kernel/unwinder.c | 1 + arch/sh/kernel/vsyscall/vsyscall.c | 5 + 44 files changed, 51 insertions(+), 189 deletions(-) diff --git a/arch/sh/kernel/debugtraps.S b/arch/sh/kernel/debugtraps.S index 7a1b46f..ad07527 100644 --- a/arch/sh/kernel/debugtraps.S +++ b/arch/sh/kernel/debugtraps.S @@ -1,13 +1,10 @@ -/* +/* SPDX-License-Identifier: GPL-2.0 + * * arch/sh/kernel/debugtraps.S * * Debug trap jump tables for SuperH * * Copyright (C) 2006 - 2008 Paul Mundt - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/kernel/disassemble.c b/arch/sh/kernel/disassemble.c index 015fee5..defebf1 100644 --- a/arch/sh/kernel/disassemble.c +++ b/arch/sh/kernel/disassemble.c @@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Disassemble SuperH instructions. * * Copyright (C) 1999 kaz Kojima * Copyright (C) 2008 Paul Mundt - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/kernel/dma-coherent.c b/arch/sh/kernel/dma-coherent.c index a0021ee..b175146 100644 --- a/arch/sh/kernel/dma-coherent.c +++ b/arch/sh/kernel/dma-coherent.c @@ -1,9 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) 2004 - 2007 Paul Mundt - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/kernel/dumpstack.c b/arch/sh/kernel/dumpstack.c index b564b1e..93c6c0e 100644 --- a/arch/sh/kernel/dumpstack.c +++ b/arch/sh/kernel/dumpstack.c @@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) 1991, 1992 Linus Torvalds * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs * Copyright (C) 2009 Matt Fleming * Copyright (C) 2002 - 2012 Paul Mundt - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/kernel/dwarf.c b/arch/sh/kernel/dwarf.c index bb511e2..9e1d26c 100644 --- a/arch/sh/kernel/dwarf.c +++ b/arch/sh/kernel/dwarf.c @@ -1,10 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) 2009 Matt Fleming * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * * This is an implementation of a DWA
[PATCH v2 10/13] sh: shmobile: convert to SPDX identifiers
From: Kuninori Morimoto This patch updates license to use SPDX-License-Identifier instead of verbose license text. Signed-off-by: Kuninori Morimoto Reviewed-by: Simon Horman --- arch/sh/kernel/cpu/shmobile/Makefile | 1 + arch/sh/kernel/cpu/shmobile/cpuidle.c | 5 + arch/sh/kernel/cpu/shmobile/pm.c | 5 + arch/sh/kernel/cpu/shmobile/sleep.S | 7 ++- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/arch/sh/kernel/cpu/shmobile/Makefile b/arch/sh/kernel/cpu/shmobile/Makefile index e8a5111..7581d5f 100644 --- a/arch/sh/kernel/cpu/shmobile/Makefile +++ b/arch/sh/kernel/cpu/shmobile/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 # # Makefile for the Linux/SuperH SH-Mobile backends. # diff --git a/arch/sh/kernel/cpu/shmobile/cpuidle.c b/arch/sh/kernel/cpu/shmobile/cpuidle.c index c32e660..dbd2cde 100644 --- a/arch/sh/kernel/cpu/shmobile/cpuidle.c +++ b/arch/sh/kernel/cpu/shmobile/cpuidle.c @@ -1,13 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/kernel/cpu/shmobile/cpuidle.c * * Cpuidle support code for SuperH Mobile * * Copyright (C) 2009 Magnus Damm - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/kernel/cpu/shmobile/pm.c b/arch/sh/kernel/cpu/shmobile/pm.c index fba2be5..ca9945f 100644 --- a/arch/sh/kernel/cpu/shmobile/pm.c +++ b/arch/sh/kernel/cpu/shmobile/pm.c @@ -1,13 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/kernel/cpu/shmobile/pm.c * * Power management support code for SuperH Mobile * * Copyright (C) 2009 Magnus Damm - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/kernel/cpu/shmobile/sleep.S b/arch/sh/kernel/cpu/shmobile/sleep.S index e6aac65..f928c03 100644 --- a/arch/sh/kernel/cpu/shmobile/sleep.S +++ b/arch/sh/kernel/cpu/shmobile/sleep.S @@ -1,13 +1,10 @@ -/* +/* SPDX-License-Identifier: GPL-2.0 + * * arch/sh/kernel/cpu/sh4a/sleep-sh_mobile.S * * Sleep mode and Standby modes support for SuperH Mobile * * Copyright (C) 2009 Magnus Damm - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include -- 2.7.4
[PATCH v2 09/13] sh: sh5: convert to SPDX identifiers
From: Kuninori Morimoto This patch updates license to use SPDX-License-Identifier instead of verbose license text. Signed-off-by: Kuninori Morimoto Reviewed-by: Simon Horman --- arch/sh/kernel/cpu/sh5/clock-sh5.c | 5 + arch/sh/kernel/cpu/sh5/entry.S | 7 ++- arch/sh/kernel/cpu/sh5/fpu.c | 5 + arch/sh/kernel/cpu/sh5/probe.c | 5 + arch/sh/kernel/cpu/sh5/setup-sh5.c | 5 + arch/sh/kernel/cpu/sh5/switchto.S | 7 ++- arch/sh/kernel/cpu/sh5/unwind.c| 5 + 7 files changed, 9 insertions(+), 30 deletions(-) diff --git a/arch/sh/kernel/cpu/sh5/clock-sh5.c b/arch/sh/kernel/cpu/sh5/clock-sh5.c index c48b93d..43763c2 100644 --- a/arch/sh/kernel/cpu/sh5/clock-sh5.c +++ b/arch/sh/kernel/cpu/sh5/clock-sh5.c @@ -1,13 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/kernel/cpu/sh5/clock-sh5.c * * SH-5 support for the clock framework * * Copyright (C) 2008 Paul Mundt - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/kernel/cpu/sh5/entry.S b/arch/sh/kernel/cpu/sh5/entry.S index 0c8d037..de68ffd 100644 --- a/arch/sh/kernel/cpu/sh5/entry.S +++ b/arch/sh/kernel/cpu/sh5/entry.S @@ -1,13 +1,10 @@ -/* +/* SPDX-License-Identifier: GPL-2.0 + * * arch/sh/kernel/cpu/sh5/entry.S * * Copyright (C) 2000, 2001 Paolo Alberelli * Copyright (C) 2004 - 2008 Paul Mundt * Copyright (C) 2003, 2004 Richard Curnow - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/kernel/cpu/sh5/fpu.c b/arch/sh/kernel/cpu/sh5/fpu.c index 9f8713a..9218d9e 100644 --- a/arch/sh/kernel/cpu/sh5/fpu.c +++ b/arch/sh/kernel/cpu/sh5/fpu.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/kernel/cpu/sh5/fpu.c * @@ -7,10 +8,6 @@ * * Started from SH4 version: * Copyright (C) 1999, 2000 Kaz Kojima & Niibe Yutaka - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/kernel/cpu/sh5/probe.c b/arch/sh/kernel/cpu/sh5/probe.c index eca427c..9472501 100644 --- a/arch/sh/kernel/cpu/sh5/probe.c +++ b/arch/sh/kernel/cpu/sh5/probe.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/kernel/cpu/sh5/probe.c * @@ -5,10 +6,6 @@ * * Copyright (C) 2000, 2001 Paolo Alberelli * Copyright (C) 2003 - 2007 Paul Mundt - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/kernel/cpu/sh5/setup-sh5.c b/arch/sh/kernel/cpu/sh5/setup-sh5.c index 084a9cc..41c1673 100644 --- a/arch/sh/kernel/cpu/sh5/setup-sh5.c +++ b/arch/sh/kernel/cpu/sh5/setup-sh5.c @@ -1,11 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * SH5-101/SH5-103 CPU Setup * * Copyright (C) 2009 Paul Mundt - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/kernel/cpu/sh5/switchto.S b/arch/sh/kernel/cpu/sh5/switchto.S index 45c351b0..d1beff7 100644 --- a/arch/sh/kernel/cpu/sh5/switchto.S +++ b/arch/sh/kernel/cpu/sh5/switchto.S @@ -1,13 +1,10 @@ -/* +/* SPDX-License-Identifier: GPL-2.0 + * * arch/sh/kernel/cpu/sh5/switchto.S * * sh64 context switch * * Copyright (C) 2004 Richard Curnow - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ .section .text..SHmedia32,"ax" diff --git a/arch/sh/kernel/cpu/sh5/unwind.c b/arch/sh/kernel/cpu/sh5/unwind.c index 3a4fed4..3cb0cd9 100644 --- a/arch/sh/kernel/cpu/sh5/unwind.c +++ b/arch/sh/kernel/cpu/sh5/unwind.c @@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/kernel/cpu/sh5/unwind.c * * Copyright (C) 2004 Paul Mundt * Copyright (C) 2004 Richard Curnow - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include -- 2.7.4
[PATCH v2 06/13] sh: sh3: convert to SPDX identifiers
From: Kuninori Morimoto This patch updates license to use SPDX-License-Identifier instead of verbose license text. Signed-off-by: Kuninori Morimoto Reviewed-by: Simon Horman --- arch/sh/kernel/cpu/sh3/clock-sh3.c | 5 + arch/sh/kernel/cpu/sh3/clock-sh7705.c | 5 + arch/sh/kernel/cpu/sh3/clock-sh7706.c | 5 + arch/sh/kernel/cpu/sh3/clock-sh7709.c | 5 + arch/sh/kernel/cpu/sh3/clock-sh7710.c | 5 + arch/sh/kernel/cpu/sh3/clock-sh7712.c | 5 + arch/sh/kernel/cpu/sh3/entry.S | 7 ++- arch/sh/kernel/cpu/sh3/ex.S| 9 +++-- arch/sh/kernel/cpu/sh3/pinmux-sh7720.c | 5 + arch/sh/kernel/cpu/sh3/probe.c | 5 + arch/sh/kernel/cpu/sh3/setup-sh3.c | 5 + arch/sh/kernel/cpu/sh3/setup-sh7705.c | 5 + arch/sh/kernel/cpu/sh3/setup-sh770x.c | 5 + arch/sh/kernel/cpu/sh3/setup-sh7710.c | 5 + arch/sh/kernel/cpu/sh3/setup-sh7720.c | 5 + arch/sh/kernel/cpu/sh3/swsusp.S| 7 ++- 16 files changed, 20 insertions(+), 68 deletions(-) diff --git a/arch/sh/kernel/cpu/sh3/clock-sh3.c b/arch/sh/kernel/cpu/sh3/clock-sh3.c index 90faa44..d776572 100644 --- a/arch/sh/kernel/cpu/sh3/clock-sh3.c +++ b/arch/sh/kernel/cpu/sh3/clock-sh3.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/kernel/cpu/sh3/clock-sh3.c * @@ -11,10 +12,6 @@ * Copyright (C) 2000 Philipp Rumpf * Copyright (C) 2002, 2003, 2004 Paul Mundt * Copyright (C) 2002 M. R. Brown - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/kernel/cpu/sh3/clock-sh7705.c b/arch/sh/kernel/cpu/sh3/clock-sh7705.c index a8da4a9..4947114 100644 --- a/arch/sh/kernel/cpu/sh3/clock-sh7705.c +++ b/arch/sh/kernel/cpu/sh3/clock-sh7705.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/kernel/cpu/sh3/clock-sh7705.c * @@ -11,10 +12,6 @@ * Copyright (C) 2000 Philipp Rumpf * Copyright (C) 2002, 2003, 2004 Paul Mundt * Copyright (C) 2002 M. R. Brown - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/kernel/cpu/sh3/clock-sh7706.c b/arch/sh/kernel/cpu/sh3/clock-sh7706.c index a4088e5..1785502 100644 --- a/arch/sh/kernel/cpu/sh3/clock-sh7706.c +++ b/arch/sh/kernel/cpu/sh3/clock-sh7706.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/kernel/cpu/sh3/clock-sh7706.c * @@ -7,10 +8,6 @@ * * Based on arch/sh/kernel/cpu/sh3/clock-sh7709.c * Copyright (C) 2005 Andriy Skulysh - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/kernel/cpu/sh3/clock-sh7709.c b/arch/sh/kernel/cpu/sh3/clock-sh7709.c index 54a6d4b..54701bb 100644 --- a/arch/sh/kernel/cpu/sh3/clock-sh7709.c +++ b/arch/sh/kernel/cpu/sh3/clock-sh7709.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/kernel/cpu/sh3/clock-sh7709.c * @@ -7,10 +8,6 @@ * * Based on arch/sh/kernel/cpu/sh3/clock-sh7705.c * Copyright (C) 2005 Paul Mundt - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/kernel/cpu/sh3/clock-sh7710.c b/arch/sh/kernel/cpu/sh3/clock-sh7710.c index ce601b2..e60d0bc 100644 --- a/arch/sh/kernel/cpu/sh3/clock-sh7710.c +++ b/arch/sh/kernel/cpu/sh3/clock-sh7710.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/kernel/cpu/sh3/clock-sh7710.c * @@ -11,10 +12,6 @@ * Copyright (C) 2000 Philipp Rumpf * Copyright (C) 2002, 2003, 2004 Paul Mundt * Copyright (C) 2002 M. R. Brown - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/kernel/cpu/sh3/clock-sh7712.c b/arch/sh/kernel/cpu/sh3/clock-sh7712.c index 21438a9..5af553f 100644 --- a/arch/sh/kernel/cpu/sh3/clock-sh7712.c +++ b/arch/sh/kernel/cpu/sh3/clock-sh7712.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/kernel/cpu/sh3/clock-sh7712.c * @@ -7,10 +8,6 @@ * * Based on arch/sh/kernel/cpu/sh3/clock-sh3.c * Copyright (C) 2005 Paul Mundt - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/kernel/cpu/sh3/entry.S b/arch/sh/kernel/cpu/sh3/entry.S index 2
[PATCH v2 07/13] sh: sh4: convert to SPDX identifiers
From: Kuninori Morimoto
This patch updates license to use SPDX-License-Identifier
instead of verbose license text,
excepting ${LINUX}/arch/sh/kernel/cpu/sh4/softfloat.c
which is not GPL license
Signed-off-by: Kuninori Morimoto
Reviewed-by: Simon Horman
---
arch/sh/kernel/cpu/sh4/clock-sh4-202.c | 5 +
arch/sh/kernel/cpu/sh4/clock-sh4.c | 5 +
arch/sh/kernel/cpu/sh4/fpu.c | 5 +
arch/sh/kernel/cpu/sh4/perf_event.c| 5 +
arch/sh/kernel/cpu/sh4/probe.c | 5 +
arch/sh/kernel/cpu/sh4/setup-sh4-202.c | 5 +
arch/sh/kernel/cpu/sh4/setup-sh7750.c | 5 +
arch/sh/kernel/cpu/sh4/setup-sh7760.c | 5 +
arch/sh/kernel/cpu/sh4/sq.c| 5 +
9 files changed, 9 insertions(+), 36 deletions(-)
diff --git a/arch/sh/kernel/cpu/sh4/clock-sh4-202.c
b/arch/sh/kernel/cpu/sh4/clock-sh4-202.c
index 4b5bab5..c1cdef7 100644
--- a/arch/sh/kernel/cpu/sh4/clock-sh4-202.c
+++ b/arch/sh/kernel/cpu/sh4/clock-sh4-202.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* arch/sh/kernel/cpu/sh4/clock-sh4-202.c
*
* Additional SH4-202 support for the clock framework
*
* Copyright (C) 2005 Paul Mundt
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
*/
#include
#include
diff --git a/arch/sh/kernel/cpu/sh4/clock-sh4.c
b/arch/sh/kernel/cpu/sh4/clock-sh4.c
index 99e5ec8..ee3c553 100644
--- a/arch/sh/kernel/cpu/sh4/clock-sh4.c
+++ b/arch/sh/kernel/cpu/sh4/clock-sh4.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* arch/sh/kernel/cpu/sh4/clock-sh4.c
*
@@ -11,10 +12,6 @@
* Copyright (C) 2000 Philipp Rumpf
* Copyright (C) 2002, 2003, 2004 Paul Mundt
* Copyright (C) 2002 M. R. Brown
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
*/
#include
#include
diff --git a/arch/sh/kernel/cpu/sh4/fpu.c b/arch/sh/kernel/cpu/sh4/fpu.c
index 95fd2dcb..1ff56e5 100644
--- a/arch/sh/kernel/cpu/sh4/fpu.c
+++ b/arch/sh/kernel/cpu/sh4/fpu.c
@@ -1,10 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* Save/restore floating point context for signal handlers.
*
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
- *
* Copyright (C) 1999, 2000 Kaz Kojima & Niibe Yutaka
* Copyright (C) 2006 ST Microelectronics Ltd. (denorm support)
*
diff --git a/arch/sh/kernel/cpu/sh4/perf_event.c
b/arch/sh/kernel/cpu/sh4/perf_event.c
index fa4f724..db5847b 100644
--- a/arch/sh/kernel/cpu/sh4/perf_event.c
+++ b/arch/sh/kernel/cpu/sh4/perf_event.c
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* Performance events support for SH7750-style performance counters
*
* Copyright (C) 2009 Paul Mundt
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
*/
#include
#include
diff --git a/arch/sh/kernel/cpu/sh4/probe.c b/arch/sh/kernel/cpu/sh4/probe.c
index a521bcf..ef4dd62 100644
--- a/arch/sh/kernel/cpu/sh4/probe.c
+++ b/arch/sh/kernel/cpu/sh4/probe.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* arch/sh/kernel/cpu/sh4/probe.c
*
@@ -5,10 +6,6 @@
*
* Copyright (C) 2001 - 2007 Paul Mundt
* Copyright (C) 2003 Richard Curnow
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
*/
#include
#include
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh4-202.c
b/arch/sh/kernel/cpu/sh4/setup-sh4-202.c
index 2623f82..a40ef35 100644
--- a/arch/sh/kernel/cpu/sh4/setup-sh4-202.c
+++ b/arch/sh/kernel/cpu/sh4/setup-sh4-202.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* SH4-202 Setup
*
* Copyright (C) 2006 Paul Mundt
* Copyright (C) 2009 Magnus Damm
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
*/
#include
#include
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7750.c
b/arch/sh/kernel/cpu/sh4/setup-sh7750.c
index 57d3068..b37bda6 100644
--- a/arch/sh/kernel/cpu/sh4/setup-sh7750.c
+++ b/arch/sh/kernel/cpu/sh4/setup-sh7750.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* SH7091/SH7750/SH7750S/SH7750R/SH7751/SH7751R Setup
*
* Copyright (C) 2006 Paul Mundt
* Copyright (C) 2006 Jamie Lenehan
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
*/
#include
#include
diff --git a
[PATCH v2 08/13] sh: sh4a: convert to SPDX identifiers
From: Kuninori Morimoto This patch updates license to use SPDX-License-Identifier instead of verbose license text. Signed-off-by: Kuninori Morimoto Reviewed-by: Simon Horman --- arch/sh/kernel/cpu/sh4a/clock-sh7343.c | 14 +- arch/sh/kernel/cpu/sh4a/clock-sh7366.c | 14 +- arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 14 +- arch/sh/kernel/cpu/sh4a/clock-sh7723.c | 14 +- arch/sh/kernel/cpu/sh4a/clock-sh7724.c | 14 +- arch/sh/kernel/cpu/sh4a/clock-sh7734.c | 5 + arch/sh/kernel/cpu/sh4a/clock-sh7757.c | 5 + arch/sh/kernel/cpu/sh4a/clock-sh7763.c | 5 + arch/sh/kernel/cpu/sh4a/clock-sh7770.c | 5 + arch/sh/kernel/cpu/sh4a/clock-sh7780.c | 5 + arch/sh/kernel/cpu/sh4a/clock-sh7785.c | 5 + arch/sh/kernel/cpu/sh4a/clock-sh7786.c | 5 + arch/sh/kernel/cpu/sh4a/clock-shx3.c| 5 + arch/sh/kernel/cpu/sh4a/intc-shx3.c | 5 + arch/sh/kernel/cpu/sh4a/perf_event.c| 5 + arch/sh/kernel/cpu/sh4a/pinmux-sh7723.c | 5 + arch/sh/kernel/cpu/sh4a/pinmux-sh7724.c | 5 + arch/sh/kernel/cpu/sh4a/pinmux-sh7734.c | 5 + arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c | 5 + arch/sh/kernel/cpu/sh4a/pinmux-sh7785.c | 5 + arch/sh/kernel/cpu/sh4a/pinmux-sh7786.c | 5 + arch/sh/kernel/cpu/sh4a/pinmux-shx3.c | 5 + arch/sh/kernel/cpu/sh4a/setup-sh7343.c | 5 + arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 5 + arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 5 + arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 5 + arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 5 + arch/sh/kernel/cpu/sh4a/setup-sh7734.c | 7 ++- arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 5 + arch/sh/kernel/cpu/sh4a/setup-sh7763.c | 5 + arch/sh/kernel/cpu/sh4a/setup-sh7770.c | 5 + arch/sh/kernel/cpu/sh4a/setup-sh7780.c | 5 + arch/sh/kernel/cpu/sh4a/setup-sh7785.c | 5 + arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 5 + arch/sh/kernel/cpu/sh4a/setup-shx3.c| 5 + arch/sh/kernel/cpu/sh4a/smp-shx3.c | 5 + arch/sh/kernel/cpu/sh4a/ubc.c | 5 + 37 files changed, 38 insertions(+), 194 deletions(-) diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7343.c b/arch/sh/kernel/cpu/sh4a/clock-sh7343.c index a907ee2..32cb5d1 100644 --- a/arch/sh/kernel/cpu/sh4a/clock-sh7343.c +++ b/arch/sh/kernel/cpu/sh4a/clock-sh7343.c @@ -1,22 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/kernel/cpu/sh4a/clock-sh7343.c * * SH7343 clock framework support * * Copyright (C) 2009 Magnus Damm - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include #include diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7366.c b/arch/sh/kernel/cpu/sh4a/clock-sh7366.c index ac98541..aa3444b 100644 --- a/arch/sh/kernel/cpu/sh4a/clock-sh7366.c +++ b/arch/sh/kernel/cpu/sh4a/clock-sh7366.c @@ -1,22 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/kernel/cpu/sh4a/clock-sh7366.c * * SH7366 clock framework support * * Copyright (C) 2009 Magnus Damm - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include #include diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7722.c b/arch/sh/kernel/cpu/sh4a/clock-sh7722.c index d85091e..38b0577 100644 --- a/arch/sh/kernel/cpu/sh4a/clock-sh7722.c +++ b/arch/sh/kernel/cpu/sh4a/clock-sh7722.c @@ -1,22 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/kernel/cpu/sh4a/clock-sh7722.c * * SH7722 clock framework support * * Copyright (C) 2009 Magnus Damm - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundati
[PATCH v2 04/13] sh: sh2: convert to SPDX identifiers
From: Kuninori Morimoto This patch updates license to use SPDX-License-Identifier instead of verbose license text. Signed-off-by: Kuninori Morimoto Reviewed-by: Simon Horman --- arch/sh/kernel/cpu/sh2/Makefile | 1 + arch/sh/kernel/cpu/sh2/clock-sh7619.c | 5 + arch/sh/kernel/cpu/sh2/entry.S| 7 ++- arch/sh/kernel/cpu/sh2/ex.S | 7 ++- arch/sh/kernel/cpu/sh2/probe.c| 5 + arch/sh/kernel/cpu/sh2/setup-sh7619.c | 5 + arch/sh/kernel/cpu/sh2/smp-j2.c | 5 + 7 files changed, 9 insertions(+), 26 deletions(-) diff --git a/arch/sh/kernel/cpu/sh2/Makefile b/arch/sh/kernel/cpu/sh2/Makefile index 904c428..214c3a5 100644 --- a/arch/sh/kernel/cpu/sh2/Makefile +++ b/arch/sh/kernel/cpu/sh2/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 # # Makefile for the Linux/SuperH SH-2 backends. # diff --git a/arch/sh/kernel/cpu/sh2/clock-sh7619.c b/arch/sh/kernel/cpu/sh2/clock-sh7619.c index e80252a..d66d194c 100644 --- a/arch/sh/kernel/cpu/sh2/clock-sh7619.c +++ b/arch/sh/kernel/cpu/sh2/clock-sh7619.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/kernel/cpu/sh2/clock-sh7619.c * @@ -7,10 +8,6 @@ * * Based on clock-sh4.c * Copyright (C) 2005 Paul Mundt - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/kernel/cpu/sh2/entry.S b/arch/sh/kernel/cpu/sh2/entry.S index 1ee0a6e..0a1c2bf 100644 --- a/arch/sh/kernel/cpu/sh2/entry.S +++ b/arch/sh/kernel/cpu/sh2/entry.S @@ -1,14 +1,11 @@ -/* +/* SPDX-License-Identifier: GPL-2.0 + * * arch/sh/kernel/cpu/sh2/entry.S * * The SH-2 exception entry * * Copyright (C) 2005-2008 Yoshinori Sato * Copyright (C) 2005 AXE,Inc. - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include diff --git a/arch/sh/kernel/cpu/sh2/ex.S b/arch/sh/kernel/cpu/sh2/ex.S index 85b0bf8..dd0cc88 100644 --- a/arch/sh/kernel/cpu/sh2/ex.S +++ b/arch/sh/kernel/cpu/sh2/ex.S @@ -1,13 +1,10 @@ -/* +/* SPDX-License-Identifier: GPL-2.0 + * * arch/sh/kernel/cpu/sh2/ex.S * * The SH-2 exception vector table * * Copyright (C) 2005 Yoshinori Sato - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include diff --git a/arch/sh/kernel/cpu/sh2/probe.c b/arch/sh/kernel/cpu/sh2/probe.c index a5bd036..d342ea0 100644 --- a/arch/sh/kernel/cpu/sh2/probe.c +++ b/arch/sh/kernel/cpu/sh2/probe.c @@ -1,13 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/kernel/cpu/sh2/probe.c * * CPU Subtype Probing for SH-2. * * Copyright (C) 2002 Paul Mundt - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/kernel/cpu/sh2/setup-sh7619.c b/arch/sh/kernel/cpu/sh2/setup-sh7619.c index d08db08..f5b6841 100644 --- a/arch/sh/kernel/cpu/sh2/setup-sh7619.c +++ b/arch/sh/kernel/cpu/sh2/setup-sh7619.c @@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * SH7619 Setup * * Copyright (C) 2006 Yoshinori Sato * Copyright (C) 2009 Paul Mundt - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/kernel/cpu/sh2/smp-j2.c b/arch/sh/kernel/cpu/sh2/smp-j2.c index 6ccd7e4..ae44dc2 100644 --- a/arch/sh/kernel/cpu/sh2/smp-j2.c +++ b/arch/sh/kernel/cpu/sh2/smp-j2.c @@ -1,11 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * SMP support for J2 processor * * Copyright (C) 2015-2016 Smart Energy Instruments, Inc. - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include -- 2.7.4
[PATCH v2 05/13] sh: sh2a: convert to SPDX identifiers
From: Kuninori Morimoto This patch updates license to use SPDX-License-Identifier instead of verbose license text. Signed-off-by: Kuninori Morimoto Reviewed-by: Simon Horman --- arch/sh/kernel/cpu/sh2a/clock-sh7201.c | 5 + arch/sh/kernel/cpu/sh2a/clock-sh7203.c | 5 + arch/sh/kernel/cpu/sh2a/clock-sh7206.c | 5 + arch/sh/kernel/cpu/sh2a/clock-sh7264.c | 5 + arch/sh/kernel/cpu/sh2a/clock-sh7269.c | 5 + arch/sh/kernel/cpu/sh2a/entry.S | 7 ++- arch/sh/kernel/cpu/sh2a/ex.S| 7 ++- arch/sh/kernel/cpu/sh2a/fpu.c | 5 + arch/sh/kernel/cpu/sh2a/opcode_helper.c | 5 + arch/sh/kernel/cpu/sh2a/pinmux-sh7203.c | 5 + arch/sh/kernel/cpu/sh2a/pinmux-sh7264.c | 5 + arch/sh/kernel/cpu/sh2a/pinmux-sh7269.c | 5 + arch/sh/kernel/cpu/sh2a/probe.c | 5 + arch/sh/kernel/cpu/sh2a/setup-mxg.c | 5 + arch/sh/kernel/cpu/sh2a/setup-sh7201.c | 5 + arch/sh/kernel/cpu/sh2a/setup-sh7203.c | 5 + arch/sh/kernel/cpu/sh2a/setup-sh7206.c | 5 + arch/sh/kernel/cpu/sh2a/setup-sh7264.c | 5 + arch/sh/kernel/cpu/sh2a/setup-sh7269.c | 5 + 19 files changed, 21 insertions(+), 78 deletions(-) diff --git a/arch/sh/kernel/cpu/sh2a/clock-sh7201.c b/arch/sh/kernel/cpu/sh2a/clock-sh7201.c index 532a36c..5a5daaa 100644 --- a/arch/sh/kernel/cpu/sh2a/clock-sh7201.c +++ b/arch/sh/kernel/cpu/sh2a/clock-sh7201.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/kernel/cpu/sh2a/clock-sh7201.c * @@ -7,10 +8,6 @@ * * Based on clock-sh4.c * Copyright (C) 2005 Paul Mundt - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/kernel/cpu/sh2a/clock-sh7203.c b/arch/sh/kernel/cpu/sh2a/clock-sh7203.c index 529f719..c620539 100644 --- a/arch/sh/kernel/cpu/sh2a/clock-sh7203.c +++ b/arch/sh/kernel/cpu/sh2a/clock-sh7203.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/kernel/cpu/sh2a/clock-sh7203.c * @@ -10,10 +11,6 @@ * * Based on clock-sh4.c * Copyright (C) 2005 Paul Mundt - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/kernel/cpu/sh2a/clock-sh7206.c b/arch/sh/kernel/cpu/sh2a/clock-sh7206.c index 1777898..d286d7b 100644 --- a/arch/sh/kernel/cpu/sh2a/clock-sh7206.c +++ b/arch/sh/kernel/cpu/sh2a/clock-sh7206.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/kernel/cpu/sh2a/clock-sh7206.c * @@ -7,10 +8,6 @@ * * Based on clock-sh4.c * Copyright (C) 2005 Paul Mundt - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/kernel/cpu/sh2a/clock-sh7264.c b/arch/sh/kernel/cpu/sh2a/clock-sh7264.c index 7e06e39..d9acc1e 100644 --- a/arch/sh/kernel/cpu/sh2a/clock-sh7264.c +++ b/arch/sh/kernel/cpu/sh2a/clock-sh7264.c @@ -1,13 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/kernel/cpu/sh2a/clock-sh7264.c * * SH7264 clock framework support * * Copyright (C) 2012 Phil Edworthy - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/kernel/cpu/sh2a/clock-sh7269.c b/arch/sh/kernel/cpu/sh2a/clock-sh7269.c index 663a97b..c17ab0d 100644 --- a/arch/sh/kernel/cpu/sh2a/clock-sh7269.c +++ b/arch/sh/kernel/cpu/sh2a/clock-sh7269.c @@ -1,13 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/kernel/cpu/sh2a/clock-sh7269.c * * SH7269 clock framework support * * Copyright (C) 2012 Phil Edworthy - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include #include diff --git a/arch/sh/kernel/cpu/sh2a/entry.S b/arch/sh/kernel/cpu/sh2a/entry.S index da77a8e..9f11fc8 100644 --- a/arch/sh/kernel/cpu/sh2a/entry.S +++ b/arch/sh/kernel/cpu/sh2a/entry.S @@ -1,14 +1,11 @@ -/* +/* SPDX-License-Identifier: GPL-2.0 + * * arch/sh/kernel/cpu/sh2a/entry.S * * The SH-2A exception entry * * Copyright (C) 2008 Yoshinori Sato * Based on arch/sh/kernel/cpu/sh2/entry.S - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. */ #include diff --git a/arch/sh/kernel/cpu/sh2a/ex.S b/arch/sh/kernel/cpu/sh2a/ex.S index 4568066..ed91996 100644 --- a/arch/sh/kernel/cpu/sh2a/ex.S +++ b/arch/sh/ke
[PATCH v2 02/13] sh: drivers: convert to SPDX identifiers
From: Kuninori Morimoto
This patch updates license to use SPDX-License-Identifier
instead of verbose license text.
As original license mentioned, it is GPL-2.0 in SPDX.
Then, MODULE_LICENSE() should be "GPL v2" instead of "GPL".
See ${LINUX}/include/linux/module.h
"GPL" [GNU Public License v2 or later]
"GPL v2"[GNU Public License v2]
Signed-off-by: Kuninori Morimoto
Reviewed-by: Simon Horman
---
arch/sh/drivers/dma/Makefile | 1 +
arch/sh/drivers/dma/dma-api.c| 7 ++-
arch/sh/drivers/dma/dma-g2.c | 7 ++-
arch/sh/drivers/dma/dma-pvr2.c | 7 ++-
arch/sh/drivers/dma/dma-sh.c | 7 ++-
arch/sh/drivers/dma/dma-sysfs.c | 5 +
arch/sh/drivers/dma/dmabrg.c | 3 +--
arch/sh/drivers/heartbeat.c | 5 +
arch/sh/drivers/pci/fixups-dreamcast.c | 5 +
arch/sh/drivers/pci/fixups-landisk.c | 4 +---
arch/sh/drivers/pci/fixups-r7780rp.c | 5 +
arch/sh/drivers/pci/fixups-rts7751r2d.c | 5 +
arch/sh/drivers/pci/fixups-sdk7780.c | 5 +
arch/sh/drivers/pci/fixups-sdk7786.c | 5 +
arch/sh/drivers/pci/fixups-snapgear.c| 4 +---
arch/sh/drivers/pci/fixups-titan.c | 4 +---
arch/sh/drivers/pci/ops-dreamcast.c | 5 +
arch/sh/drivers/pci/ops-sh4.c| 5 +
arch/sh/drivers/pci/ops-sh5.c| 4 +---
arch/sh/drivers/pci/ops-sh7786.c | 5 +
arch/sh/drivers/pci/pci-dreamcast.c | 5 +
arch/sh/drivers/pci/pci-sh5.c| 4 +---
arch/sh/drivers/pci/pci-sh5.h| 6 ++
arch/sh/drivers/pci/pci-sh7751.c | 5 +
arch/sh/drivers/pci/pci-sh7751.h | 7 ++-
arch/sh/drivers/pci/pci-sh7780.c | 5 +
arch/sh/drivers/pci/pci-sh7780.h | 7 ++-
arch/sh/drivers/pci/pci.c| 5 +
arch/sh/drivers/pci/pcie-sh7786.c| 5 +
arch/sh/drivers/pci/pcie-sh7786.h| 7 ++-
arch/sh/drivers/push-switch.c| 5 +
arch/sh/drivers/superhyway/Makefile | 1 +
arch/sh/drivers/superhyway/ops-sh4-202.c | 5 +
33 files changed, 41 insertions(+), 124 deletions(-)
diff --git a/arch/sh/drivers/dma/Makefile b/arch/sh/drivers/dma/Makefile
index d88c948..d2fdd56 100644
--- a/arch/sh/drivers/dma/Makefile
+++ b/arch/sh/drivers/dma/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
#
# Makefile for the SuperH DMA specific kernel interface routines under Linux.
#
diff --git a/arch/sh/drivers/dma/dma-api.c b/arch/sh/drivers/dma/dma-api.c
index b05be59..ab91704 100644
--- a/arch/sh/drivers/dma/dma-api.c
+++ b/arch/sh/drivers/dma/dma-api.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* arch/sh/drivers/dma/dma-api.c
*
* SuperH-specific DMA management API
*
* Copyright (C) 2003, 2004, 2005 Paul Mundt
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
*/
#include
#include
@@ -417,4 +414,4 @@ subsys_initcall(dma_api_init);
MODULE_AUTHOR("Paul Mundt ");
MODULE_DESCRIPTION("DMA API for SuperH");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
diff --git a/arch/sh/drivers/dma/dma-g2.c b/arch/sh/drivers/dma/dma-g2.c
index e1ab6eb..52a8ae5 100644
--- a/arch/sh/drivers/dma/dma-g2.c
+++ b/arch/sh/drivers/dma/dma-g2.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* arch/sh/drivers/dma/dma-g2.c
*
* G2 bus DMA support
*
* Copyright (C) 2003 - 2006 Paul Mundt
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
*/
#include
#include
@@ -197,4 +194,4 @@ module_exit(g2_dma_exit);
MODULE_AUTHOR("Paul Mundt ");
MODULE_DESCRIPTION("G2 bus DMA driver");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
diff --git a/arch/sh/drivers/dma/dma-pvr2.c b/arch/sh/drivers/dma/dma-pvr2.c
index 706a343..b5dbd1f 100644
--- a/arch/sh/drivers/dma/dma-pvr2.c
+++ b/arch/sh/drivers/dma/dma-pvr2.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* arch/sh/drivers/dma/dma-pvr2.c
*
* NEC PowerVR 2 (Dreamcast) DMA support
*
* Copyright (C) 2003, 2004 Paul Mundt
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
*/
#include
#include
@@ -105,4 +102,4 @@ module_exit(pvr2_dma_exit);
MODULE_AUTHOR("Paul Mundt ");
MODULE_DESCRIPTION("NEC PowerVR 2 DMA driver");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
diff --git a/arch/sh/drivers/dma/dma-sh.c b/arch/sh/drivers/dma/dma-sh.c
index afde2a7..96c626c 100644
--- a/arch/sh/drivers/dma/dma-sh.c
+++ b/arch/sh/drivers/dma/dma-sh.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* arch/sh/drivers/dma/dm
[PATCH v2 03/13] sh: include: convert to SPDX identifiers
From: Kuninori Morimoto This patch updates license to use SPDX-License-Identifier instead of verbose license text. Signed-off-by: Kuninori Morimoto Reviewed-by: Simon Horman --- arch/sh/include/asm/Kbuild | 1 + arch/sh/include/asm/addrspace.h | 5 + arch/sh/include/asm/asm-offsets.h| 1 + arch/sh/include/asm/bl_bit_64.h | 7 ++- arch/sh/include/asm/cache_insns_64.h | 7 ++- arch/sh/include/asm/checksum_32.h| 5 + arch/sh/include/asm/cmpxchg-xchg.h | 4 +--- arch/sh/include/asm/device.h | 5 ++--- arch/sh/include/asm/dma-register.h | 7 ++- arch/sh/include/asm/dma.h| 7 ++- arch/sh/include/asm/dwarf.h | 8 ++-- arch/sh/include/asm/fb.h | 1 + arch/sh/include/asm/fixmap.h | 7 ++- arch/sh/include/asm/flat.h | 7 ++- arch/sh/include/asm/freq.h | 8 ++-- arch/sh/include/asm/gpio.h | 7 ++- arch/sh/include/asm/machvec.h| 6 ++ arch/sh/include/asm/mmu_context_64.h | 5 + arch/sh/include/asm/pgtable.h| 7 ++- arch/sh/include/asm/pgtable_64.h | 5 + arch/sh/include/asm/processor_64.h | 5 + arch/sh/include/asm/sfp-machine.h| 20 arch/sh/include/asm/shmparam.h | 7 ++- arch/sh/include/asm/siu.h| 7 ++- arch/sh/include/asm/spinlock-cas.h | 7 ++- arch/sh/include/asm/spinlock-llsc.h | 7 ++- arch/sh/include/asm/spinlock.h | 7 ++- arch/sh/include/asm/string_32.h | 1 + arch/sh/include/asm/switch_to.h | 7 ++- arch/sh/include/asm/switch_to_64.h | 7 ++- arch/sh/include/asm/tlb_64.h | 7 ++- arch/sh/include/asm/traps_64.h | 7 ++- arch/sh/include/asm/uaccess_64.h | 5 + arch/sh/include/asm/vga.h| 1 + arch/sh/include/asm/watchdog.h | 8 ++-- arch/sh/include/cpu-common/cpu/addrspace.h | 7 ++- arch/sh/include/cpu-common/cpu/mmu_context.h | 7 ++- arch/sh/include/cpu-common/cpu/pfc.h | 12 ++-- arch/sh/include/cpu-common/cpu/timer.h | 1 + arch/sh/include/cpu-sh2/cpu/cache.h | 7 ++- arch/sh/include/cpu-sh2/cpu/freq.h | 7 ++- arch/sh/include/cpu-sh2/cpu/watchdog.h | 7 ++- arch/sh/include/cpu-sh2a/cpu/cache.h | 7 ++- arch/sh/include/cpu-sh2a/cpu/freq.h | 7 ++- arch/sh/include/cpu-sh2a/cpu/watchdog.h | 1 + arch/sh/include/cpu-sh3/cpu/cache.h | 7 ++- arch/sh/include/cpu-sh3/cpu/dma-register.h | 7 ++- arch/sh/include/cpu-sh3/cpu/freq.h | 7 ++- arch/sh/include/cpu-sh3/cpu/gpio.h | 7 ++- arch/sh/include/cpu-sh3/cpu/mmu_context.h| 7 ++- arch/sh/include/cpu-sh3/cpu/watchdog.h | 7 ++- arch/sh/include/cpu-sh4/cpu/addrspace.h | 5 + arch/sh/include/cpu-sh4/cpu/cache.h | 7 ++- arch/sh/include/cpu-sh4/cpu/dma-register.h | 7 ++- arch/sh/include/cpu-sh4/cpu/fpu.h| 6 ++ arch/sh/include/cpu-sh4/cpu/freq.h | 7 ++- arch/sh/include/cpu-sh4/cpu/mmu_context.h| 7 ++- arch/sh/include/cpu-sh4/cpu/sh7786.h | 7 ++- arch/sh/include/cpu-sh4/cpu/sq.h | 7 ++- arch/sh/include/cpu-sh4/cpu/watchdog.h | 7 ++- arch/sh/include/cpu-sh5/cpu/cache.h | 5 + arch/sh/include/cpu-sh5/cpu/irq.h| 5 + arch/sh/include/cpu-sh5/cpu/registers.h | 5 + arch/sh/include/mach-common/mach/hp6xx.h | 12 arch/sh/include/mach-common/mach/lboxre2.h | 6 +- arch/sh/include/mach-common/mach/magicpanelr2.h | 7 ++- arch/sh/include/mach-common/mach/mangle-port.h | 7 ++- arch/sh/include/mach-common/mach/microdev.h | 6 ++ arch/sh/include/mach-common/mach/sdk7780.h | 5 + arch/sh/include/mach-common/mach/secureedge5410.h| 6 ++ arch/sh/include/mach-common/mach/sh7763rdp.h | 6 +- arch/sh/include/mach-dreamcast/mach/dma.h| 7 ++- arch/sh/include/mach-dreamcast/mach/pc
[PATCH v2 01/13] sh: boards: convert to SPDX identifiers
From: Kuninori Morimoto This patch updates license to use SPDX-License-Identifier instead of verbose license text. Signed-off-by: Kuninori Morimoto Reviewed-by: Simon Horman --- arch/sh/boards/board-apsh4a3a.c | 5 + arch/sh/boards/board-apsh4ad0a.c| 5 + arch/sh/boards/board-edosk7760.c| 15 +-- arch/sh/boards/board-espt.c | 5 + arch/sh/boards/board-magicpanelr2.c | 5 + arch/sh/boards/board-sh7757lcr.c| 5 + arch/sh/boards/board-sh7785lcr.c| 5 + arch/sh/boards/board-titan.c| 5 + arch/sh/boards/board-urquell.c | 5 + arch/sh/boards/mach-ap325rxa/Makefile | 1 + arch/sh/boards/mach-ap325rxa/sdram.S| 7 ++- arch/sh/boards/mach-cayman/Makefile | 1 + arch/sh/boards/mach-cayman/irq.c| 5 + arch/sh/boards/mach-cayman/panic.c | 5 + arch/sh/boards/mach-cayman/setup.c | 5 + arch/sh/boards/mach-dreamcast/Makefile | 1 + arch/sh/boards/mach-dreamcast/irq.c | 2 +- arch/sh/boards/mach-dreamcast/rtc.c | 4 +--- arch/sh/boards/mach-dreamcast/setup.c | 3 +-- arch/sh/boards/mach-ecovec24/Makefile | 3 ++- arch/sh/boards/mach-ecovec24/sdram.S| 7 ++- arch/sh/boards/mach-ecovec24/setup.c| 5 + arch/sh/boards/mach-highlander/irq-r7780mp.c| 5 + arch/sh/boards/mach-highlander/irq-r7780rp.c| 5 + arch/sh/boards/mach-highlander/irq-r7785rp.c| 5 + arch/sh/boards/mach-highlander/pinmux-r7785rp.c | 5 + arch/sh/boards/mach-highlander/psw.c| 5 + arch/sh/boards/mach-highlander/setup.c | 5 + arch/sh/boards/mach-hp6xx/Makefile | 1 + arch/sh/boards/mach-hp6xx/hp6xx_apm.c | 4 +--- arch/sh/boards/mach-hp6xx/pm.c | 4 +--- arch/sh/boards/mach-hp6xx/pm_wakeup.S | 8 ++-- arch/sh/boards/mach-hp6xx/setup.c | 4 +--- arch/sh/boards/mach-kfr2r09/Makefile| 1 + arch/sh/boards/mach-kfr2r09/lcd_wqvga.c | 5 + arch/sh/boards/mach-kfr2r09/sdram.S | 7 ++- arch/sh/boards/mach-landisk/Makefile| 1 + arch/sh/boards/mach-landisk/gio.c | 6 +- arch/sh/boards/mach-landisk/irq.c | 5 + arch/sh/boards/mach-landisk/psw.c | 5 + arch/sh/boards/mach-landisk/setup.c | 5 + arch/sh/boards/mach-lboxre2/Makefile| 1 + arch/sh/boards/mach-lboxre2/irq.c | 6 +- arch/sh/boards/mach-lboxre2/setup.c | 6 +- arch/sh/boards/mach-microdev/Makefile | 1 + arch/sh/boards/mach-microdev/fdc37c93xapm.c | 5 + arch/sh/boards/mach-microdev/io.c | 4 +--- arch/sh/boards/mach-microdev/irq.c | 4 +--- arch/sh/boards/mach-microdev/setup.c| 4 +--- arch/sh/boards/mach-migor/Makefile | 1 + arch/sh/boards/mach-migor/lcd_qvga.c| 5 + arch/sh/boards/mach-migor/sdram.S | 7 ++- arch/sh/boards/mach-r2d/Makefile| 1 + arch/sh/boards/mach-r2d/setup.c | 5 + arch/sh/boards/mach-rsk/Makefile| 1 + arch/sh/boards/mach-rsk/devices-rsk7203.c | 5 + arch/sh/boards/mach-rsk/devices-rsk7264.c | 5 + arch/sh/boards/mach-rsk/devices-rsk7269.c | 5 + arch/sh/boards/mach-rsk/setup.c | 5 + arch/sh/boards/mach-sdk7780/Makefile| 1 + arch/sh/boards/mach-sdk7780/irq.c | 5 + arch/sh/boards/mach-sdk7780/setup.c | 5 + arch/sh/boards/mach-sdk7786/Makefile| 1 + arch/sh/boards/mach-sdk7786/fpga.c | 5 + arch/sh/boards/mach-sdk7786/gpio.c | 5 + arch/sh/boards/mach-sdk7786/irq.c | 5 + arch/sh/boards/mach-sdk7786/nmi.c | 5 + arch/sh/boards/mach-sdk7786/setup.c | 5 + arch/sh/boards/mach-sdk7786/sram.c | 5 + arch/sh/boards/mach-se/7206/Makefile| 1 + arch/sh/boards/mach-se/7343/Makefile| 1 + arch/sh/boards/mach-se/7343/irq.c | 5 + arch/sh/boards/mach-se/770x/Makefile| 1 + arch/sh/boards/mach-se/7721/Makefile| 1 + arch/sh/boards/mach-se/7721/irq.c | 5 + arch/sh/boards/mach-se/7721/setup.c | 6 +- arch/sh/boards/mach-se/7722/Makefile| 1 + arch/sh/boards/mach-se/7722/irq.c | 5 + arch/sh/boards/mach-se/7722/setup.c | 6 +- arch/sh/boards/mach-se/7724/Makefile| 1 + arch/sh/boards/mach-se/7724/irq.c | 5 + arch/sh/boards/ma
[PATCH v2 00/13] sh: convert to SPDX
Hi Yoshinori These patches v2 patches of SPDX license for sh. v1 -> v2 - add Simon's Reviewed-by for [01/13] to [12/13] - [13/13] uses "WITH GCC-exception-2.0" Kuninori Morimoto (13): sh: boards: convert to SPDX identifiers sh: drivers: convert to SPDX identifiers sh: include: convert to SPDX identifiers sh: sh2: convert to SPDX identifiers sh: sh2a: convert to SPDX identifiers sh: sh3: convert to SPDX identifiers sh: sh4: convert to SPDX identifiers sh: sh4a: convert to SPDX identifiers sh: sh5: convert to SPDX identifiers sh: shmobile: convert to SPDX identifiers sh: cpu: convert to SPDX identifiers sh: kernel: convert to SPDX identifiers sh: lib: convert to SPDX identifiers arch/sh/boards/board-apsh4a3a.c| 5 +--- arch/sh/boards/board-apsh4ad0a.c | 5 +--- arch/sh/boards/board-edosk7760.c | 15 +-- arch/sh/boards/board-espt.c| 5 +--- arch/sh/boards/board-magicpanelr2.c| 5 +--- arch/sh/boards/board-sh7757lcr.c | 5 +--- arch/sh/boards/board-sh7785lcr.c | 5 +--- arch/sh/boards/board-titan.c | 5 +--- arch/sh/boards/board-urquell.c | 5 +--- arch/sh/boards/mach-ap325rxa/Makefile | 1 + arch/sh/boards/mach-ap325rxa/sdram.S | 7 ++ arch/sh/boards/mach-cayman/Makefile| 1 + arch/sh/boards/mach-cayman/irq.c | 5 +--- arch/sh/boards/mach-cayman/panic.c | 5 +--- arch/sh/boards/mach-cayman/setup.c | 5 +--- arch/sh/boards/mach-dreamcast/Makefile | 1 + arch/sh/boards/mach-dreamcast/irq.c| 2 +- arch/sh/boards/mach-dreamcast/rtc.c| 4 +-- arch/sh/boards/mach-dreamcast/setup.c | 3 +-- arch/sh/boards/mach-ecovec24/Makefile | 3 ++- arch/sh/boards/mach-ecovec24/sdram.S | 7 ++ arch/sh/boards/mach-ecovec24/setup.c | 5 +--- arch/sh/boards/mach-highlander/irq-r7780mp.c | 5 +--- arch/sh/boards/mach-highlander/irq-r7780rp.c | 5 +--- arch/sh/boards/mach-highlander/irq-r7785rp.c | 5 +--- arch/sh/boards/mach-highlander/pinmux-r7785rp.c| 5 +--- arch/sh/boards/mach-highlander/psw.c | 5 +--- arch/sh/boards/mach-highlander/setup.c | 5 +--- arch/sh/boards/mach-hp6xx/Makefile | 1 + arch/sh/boards/mach-hp6xx/hp6xx_apm.c | 4 +-- arch/sh/boards/mach-hp6xx/pm.c | 4 +-- arch/sh/boards/mach-hp6xx/pm_wakeup.S | 8 ++ arch/sh/boards/mach-hp6xx/setup.c | 4 +-- arch/sh/boards/mach-kfr2r09/Makefile | 1 + arch/sh/boards/mach-kfr2r09/lcd_wqvga.c| 5 +--- arch/sh/boards/mach-kfr2r09/sdram.S| 7 ++ arch/sh/boards/mach-landisk/Makefile | 1 + arch/sh/boards/mach-landisk/gio.c | 6 + arch/sh/boards/mach-landisk/irq.c | 5 +--- arch/sh/boards/mach-landisk/psw.c | 5 +--- arch/sh/boards/mach-landisk/setup.c| 5 +--- arch/sh/boards/mach-lboxre2/Makefile | 1 + arch/sh/boards/mach-lboxre2/irq.c | 6 + arch/sh/boards/mach-lboxre2/setup.c| 6 + arch/sh/boards/mach-microdev/Makefile | 1 + arch/sh/boards/mach-microdev/fdc37c93xapm.c| 5 +--- arch/sh/boards/mach-microdev/io.c | 4 +-- arch/sh/boards/mach-microdev/irq.c | 4 +-- arch/sh/boards/mach-microdev/setup.c | 4 +-- arch/sh/boards/mach-migor/Makefile | 1 + arch/sh/boards/mach-migor/lcd_qvga.c | 5 +--- arch/sh/boards/mach-migor/sdram.S | 7 ++ arch/sh/boards/mach-r2d/Makefile | 1 + arch/sh/boards/mach-r2d/setup.c| 5 +--- arch/sh/boards/mach-rsk/Makefile | 1 + arch/sh/boards/mach-rsk/devices-rsk7203.c | 5 +--- arch/sh/boards/mach-rsk/devices-rsk7264.c | 5 +--- arch/sh/boards/mach-rsk/devices-rsk7269.c | 5 +--- arch/sh/boards/mach-rsk/setup.c| 5 +--- arch/sh/boards/mach-sdk7780/Makefile | 1 + arch/sh/boards/mach-sdk7780/irq.c | 5 +--- arch/sh/boards/mach-sdk7780/setup.c| 5 +--- arch/sh/boards/mach-sdk7786/Makefile | 1 + arch/sh/boards/mach-sdk7786/fpga.c | 5 +--- arch/sh/boards/mach-sdk7786/gpio.c | 5 +--- arch/sh/boards/mach-sdk7786/irq.c | 5 +--- arch/sh/boards/mach-sdk7786/nmi.c | 5 +--- arch/sh/boards/mach-sdk7786/setup.c| 5 +--- arch/sh/boards/mach-sdk7786/sram.c | 5 +--- arch/sh/boards/mach-se/720
Re: [PATCH v2] mmc: renesas_sdhi_internal_dmac: mask DMAC interrupts
On 08/22/2018 10:37 PM, Wolfram Sang wrote:
>> I have encountered an interrupt storm during the eMMC chip probing (and
>> the chip finally didn't get detected). It turned out that U-Boot left
>> the SDHI DMA interrupts enabled while the Linux driver didn't use those.
>> Masking those interrupts in renesas_sdhi_internal_dmac_request_dma() gets
>> rid of both issues...
>>
>> Signed-off-by: Sergei Shtylyov
>
> Reviewed-by: Wolfram Sang
Fixes: 2a68ea7896e3 ("mmc: renesas-sdhi: add support for R-Car Gen3 SDHI DMAC")
MBR, Sergei
Re: [PATCH] mmc: renesas_sdhi_internal_dmac: fix #define RST_RESERVED_BITS
On 08/22/2018 10:45 PM, Wolfram Sang wrote:
The DM_CM_RST register actually has bits 0-31 defaulting to 1s and bits
32-63 defaulting to 0s -- fix off-by-one in #define RST_RESERVED_BITS.
Signed-off-by: Sergei Shtylyov
>>>
>>> Reviewed-by: Wolfram Sang
>>>
>>> Suggesting stable.
>>
>>Stable looks at the Fixes: tags now. Should I add that?
>
> Yes, that would be great IMHO.
Fixes: 2a68ea7896e3 ("mmc: renesas-sdhi: add support for R-Car Gen3 SDHI DMAC")
Hopefully, Ulf uses patchwork. :-)
MBR, Sergei
Re: [PATCH] mmc: renesas_sdhi_internal_dmac: fix #define RST_RESERVED_BITS
On Wed, Aug 22, 2018 at 10:41:56PM +0300, Sergei Shtylyov wrote: > On 08/22/2018 10:38 PM, Wolfram Sang wrote: > > >> The DM_CM_RST register actually has bits 0-31 defaulting to 1s and bits > >> 32-63 defaulting to 0s -- fix off-by-one in #define RST_RESERVED_BITS. > >> > >> Signed-off-by: Sergei Shtylyov > > > > Reviewed-by: Wolfram Sang > > > > Suggesting stable. > >Stable looks at the Fixes: tags now. Should I add that? Yes, that would be great IMHO. signature.asc Description: PGP signature
Re: [PATCH] mmc: renesas_sdhi_internal_dmac: fix #define RST_RESERVED_BITS
On 08/22/2018 10:38 PM, Wolfram Sang wrote: >> The DM_CM_RST register actually has bits 0-31 defaulting to 1s and bits >> 32-63 defaulting to 0s -- fix off-by-one in #define RST_RESERVED_BITS. >> >> Signed-off-by: Sergei Shtylyov > > Reviewed-by: Wolfram Sang > > Suggesting stable. Stable looks at the Fixes: tags now. Should I add that? MBR, Sergei
Re: [PATCH] mmc: renesas_sdhi_internal_dmac: fix #define RST_RESERVED_BITS
On Wed, Aug 22, 2018 at 09:28:01PM +0300, Sergei Shtylyov wrote: > The DM_CM_RST register actually has bits 0-31 defaulting to 1s and bits > 32-63 defaulting to 0s -- fix off-by-one in #define RST_RESERVED_BITS. > > Signed-off-by: Sergei Shtylyov Reviewed-by: Wolfram Sang Suggesting stable. signature.asc Description: PGP signature
Re: [PATCH v2] mmc: renesas_sdhi_internal_dmac: mask DMAC interrupts
On Wed, Aug 22, 2018 at 09:22:26PM +0300, Sergei Shtylyov wrote: > I have encountered an interrupt storm during the eMMC chip probing (and > the chip finally didn't get detected). It turned out that U-Boot left > the SDHI DMA interrupts enabled while the Linux driver didn't use those. > Masking those interrupts in renesas_sdhi_internal_dmac_request_dma() gets > rid of both issues... > > Signed-off-by: Sergei Shtylyov Reviewed-by: Wolfram Sang signature.asc Description: PGP signature
Re: [PATCH v3 2/2] arm64: dts: renesas: condor/v3hsk: add DU/LVDS/HDMI support
Hello!
On 08/13/2018 06:19 PM, Laurent Pinchart wrote:
>> Define the Condor/V3HSK board dependent parts of the DU and LVDS device
>> nodes. Also add the device nodes for Thine THC63LVD1024 LVDS decoder and
>> Analog Devices ADV7511W HDMI transmitter...
>>
>> Based on the original (and large) patch by Vladimir Barinov.
>>
>> Signed-off-by: Vladimir Barinov
>> Signed-off-by: Sergei Shtylyov
>>
>> ---
>> Changes in version 2:
>> - added the V3HSK DT update, reworded the description, renamed the patch;
>> - added a space between the HDMI node name and a brace.
>>
>> arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 106
>> arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts | 120
>> 2 files changed, 226 insertions(+)
>
> I would have split that in two patchees.
>
>>
>> Index: renesas/arch/arm64/boot/dts/renesas/r8a77980-condor.dts
>> ===
>> --- renesas.orig/arch/arm64/boot/dts/renesas/r8a77980-condor.dts
>> +++ renesas/arch/arm64/boot/dts/renesas/r8a77980-condor.dts
[...]
>> Index: renesas/arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts
>> ===
>> --- renesas.orig/arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts
>> +++ renesas/arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts
>> @@ -27,6 +27,63 @@
>> /* first 128MB is reserved for secure area. */
>> reg = <0 0x4800 0 0x7800>;
>> };
>> +
>> +hdmi-out {
>> +compatible = "hdmi-connector";
>> +type = "a";
>> +
>> +port {
>> +hdmi_con: endpoint {
>> +remote-endpoint = <&adv7511_out>;
>> +};
>> +};
>> +};
>> +
>> +lvds-decoder {
>> +compatible = "thine,thc63lvd1024";
>> +vcc-supply = <&vcc3v3_d5>;
>> +
>> +ports {
>> +#address-cells = <1>;
>> +#size-cells = <0>;
>> +
>> +port@0 {
>> +reg = <0>;
>> +thc63lvd1024_in: endpoint {
>> +remote-endpoint = <&lvds0_out>;
>> +};
>> +};
>> +
>> +port@2 {
>> +reg = <2>;
>> +thc63lvd1024_out: endpoint {
>> +remote-endpoint = <&adv7511_in>;
>> +};
>> +};
>> +};
>> +};
>> +
>> +vcc1v8_d4: regulator-0 {
>> +compatible = "regulator-fixed";
>> +regulator-name = "VCC1V8_D4";
>> +regulator-min-microvolt = <180>;
>> +regulator-max-microvolt = <180>;
>> +regulator-boot-on;
>> +regulator-always-on;
>> +};
>> +
>> +vcc3v3_d5: regulator-1 {
>> +compatible = "regulator-fixed";
>> +regulator-name = "VCC3V3_D5";
>> +regulator-min-microvolt = <330>;
>> +regulator-max-microvolt = <330>;
>> +regulator-boot-on;
>> +regulator-always-on;
>> +};
>> +};
>> +
>> +&du {
>> +status = "okay";
>
> No dot clock for the DU ?
You're right, there's OSC1 providing 148.5 MHz. Fixed.
> Apart from that,
>
> Reviewed-by: Laurent Pinchart
Thanks.
MBR, Sergei
[PATCH] mmc: renesas_sdhi_internal_dmac: fix #define RST_RESERVED_BITS
The DM_CM_RST register actually has bits 0-31 defaulting to 1s and bits 32-63 defaulting to 0s -- fix off-by-one in #define RST_RESERVED_BITS. Signed-off-by: Sergei Shtylyov --- The patch is against Ulf Hansson's 'mmc.git' repo's 'fixes' branch. drivers/mmc/host/renesas_sdhi_internal_dmac.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: mmc/drivers/mmc/host/renesas_sdhi_internal_dmac.c === --- mmc.orig/drivers/mmc/host/renesas_sdhi_internal_dmac.c +++ mmc/drivers/mmc/host/renesas_sdhi_internal_dmac.c @@ -45,7 +45,7 @@ /* DM_CM_RST */ #define RST_DTRANRST1 BIT(9) #define RST_DTRANRST0 BIT(8) -#define RST_RESERVED_BITS GENMASK_ULL(32, 0) +#define RST_RESERVED_BITS GENMASK_ULL(31, 0) /* DM_CM_INFO1 and DM_CM_INFO1_MASK */ #define INFO1_CLEAR0
[PATCH v2] mmc: renesas_sdhi_internal_dmac: mask DMAC interrupts
I have encountered an interrupt storm during the eMMC chip probing (and
the chip finally didn't get detected). It turned out that U-Boot left
the SDHI DMA interrupts enabled while the Linux driver didn't use those.
Masking those interrupts in renesas_sdhi_internal_dmac_request_dma() gets
rid of both issues...
Signed-off-by: Sergei Shtylyov
---
The patch is against Ulf Hansson's 'mmc.git' repo's 'fixes' branch.
Changes in version 2:
- fixed #define INFO{1|2}_RESERVED_BITS, rename them to INFO{1|2}_MASK_CLEAR,
and moved them higher;
- shortened the comment before masking the DMAC interrupts;
- fixed up the excess whitespace in the patch dsescription.
drivers/mmc/host/renesas_sdhi_internal_dmac.c |8
1 file changed, 8 insertions(+)
Index: renesas/drivers/mmc/host/renesas_sdhi_internal_dmac.c
===
--- renesas.orig/drivers/mmc/host/renesas_sdhi_internal_dmac.c
+++ renesas/drivers/mmc/host/renesas_sdhi_internal_dmac.c
@@ -49,10 +49,12 @@
/* DM_CM_INFO1 and DM_CM_INFO1_MASK */
#define INFO1_CLEAR0
+#define INFO1_MASK_CLEAR GENMASK_ULL(31, 0)
#define INFO1_DTRANEND1BIT(17)
#define INFO1_DTRANEND0BIT(16)
/* DM_CM_INFO2 and DM_CM_INFO2_MASK */
+#define INFO2_MASK_CLEAR GENMASK_ULL(31, 0)
#define INFO2_DTRANERR1BIT(17)
#define INFO2_DTRANERR0BIT(16)
@@ -236,6 +238,12 @@ renesas_sdhi_internal_dmac_request_dma(s
{
struct renesas_sdhi *priv = host_to_priv(host);
+ /* Disable DMAC interrupts, we don't use them */
+ renesas_sdhi_internal_dmac_dm_write(host, DM_CM_INFO1_MASK,
+ INFO1_MASK_CLEAR);
+ renesas_sdhi_internal_dmac_dm_write(host, DM_CM_INFO2_MASK,
+ INFO2_MASK_CLEAR);
+
/* Each value is set to non-zero to assume "enabling" each DMA */
host->chan_rx = host->chan_tx = (void *)0xdeadbeaf;
Re: [PATCH 2/2] arm64: dts: renesas: v3msk: add eMMC support
On 08/22/2018 02:31 PM, Simon Horman wrote: >> Add the eMMC chip support for the V3M Started Kit board. >> >> Based on the original (and large) patches by Vladimir Barinov. >> >> Signed-off-by: Vladimir Barinov >> Signed-off-by: Sergei Shtylyov > > Thanks, > > This looks fine to me but I will wait to see if there are other reviews > before applying. > > Reviewed-by: Simon Horman > > I am, however, curious to know about HS200. > Is it supported on the v3msk? If so, do you have any plans to enable it? As I've already said, the eMMC chip only receives 3.3V on all its voltage inputs. MBR, Sergei
Re: [PATCH/RFT] arm64: dts: renesas: r8a77965: Add OPPs table for cpu devices
On Tue, Aug 14, 2018 at 11:12:41PM +0900, Yoshihiro Kaneko wrote:
> From: Dien Pham
>
> This patch adds OPPs table for CA57{0,1} cpu devices
>
> Signed-off-by: Dien Pham
> Signed-off-by: Takeshi Kihara
> Signed-off-by: Yoshihiro Kaneko
Tested on r8a77965/Salvator-XS
I see that CPUFreq is activated, that sysfs reports 3 possible
CPU speeds; 1.5, 1.0 and 0.50GHz. That current CPU frequency can be manipulated
by setting the maximum CPU frequency in sysfs. And that the frequency
of Z clock changes accordingly.
Tested-by: Simon Horman
Re: [LTSI-dev] [GIT PULL LTSI-4.14] Renesas SoCs and Drivers to v4.18-rc8
Hi Simon,
On Fri, Aug 17, 2018 at 12:53 PM Simon Horman wrote:
> please find the details of the corrected tag below:
>
> The following changes since commit 2ae6c0413b4768f9d8fc6f718a732f9dae014b67:
>
> Linux 4.14.61 (2018-08-06 16:20:52 +0200)
>
> are available in the git repository at:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas-backport.git
> backport/v4.14.61/snapshot-to-v4.18-rc8+fixes-flattened
>
> for you to fetch changes up to cc88cfdc0571385f098e82db47f5a16b6f44726e:
>
> i2c: rcar: use the new get_bus_free callback (2018-08-09 17:22:00 +0200)
>
>
> LTSI-v4.14 Backports for Renesas SoCs (to v4.18-rc8)
>
> Base:
> * v4.14.61
> * Similar backport of components for Renesas SoCs to v4.17
Thanks for your submission!
I subjected this to the same testing I do for each renesas-drivers release.
I have detected no regressions, only increased functionality.
Note that the description of commit 2e36d0f21ab5e4f1 ("usb: xhci: Add DbC
support in xHCI driver") contains 2 cherry-picked lines:
(cherry picked from commit dfba2174dc421ecad8dc50741054a305cd3ba681)
Signed-off-by: Simon Horman
(cherry picked from commit 53529a76f6e18b4a08c11c59303d9401bb2aa3b6)
Signed-off-by: Simon Horman
The first one points to a valid upstream commit.
The second one points to a backport of that commit in your backport
repository.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Re: [PATCH] dt-bindings: mmc: tmio_mmc: document Renesas R8A77970 bindings
On Tue, Aug 21, 2018 at 10:14:12PM +0300, Sergei Shtylyov wrote: > Document the R-Car V3M (R8A77970) SoC in the R-Car SDHI bindings -- it's > the usual R-Car gen3 compatible controller with the internal DMA engine. > > Signed-off-by: Sergei Shtylyov Reviewed-by: Simon Horman
Re: [PATCH] mmc: renesas_sdhi_internal_dmac: add R8A77970 to whitelist
On Sat, Aug 18, 2018 at 09:08:26PM +0300, Sergei Shtylyov wrote: > I've successfully tested eMMC on the V3H Starter Kit board. R8A77970 SoC > has a single SDHI core anyway, so can't be a subject to the known RX DMA > errata... > > Signed-off-by: Sergei Shtylyov Reviewed-by: Simon Horman
Re: [PATCH 2/2] arm64: dts: renesas: v3msk: add eMMC support
On Tue, Aug 21, 2018 at 10:50:31PM +0300, Sergei Shtylyov wrote: > Add the eMMC chip support for the V3M Started Kit board. > > Based on the original (and large) patches by Vladimir Barinov. > > Signed-off-by: Vladimir Barinov > Signed-off-by: Sergei Shtylyov Thanks, This looks fine to me but I will wait to see if there are other reviews before applying. Reviewed-by: Simon Horman I am, however, curious to know about HS200. Is it supported on the v3msk? If so, do you have any plans to enable it?
Re: [PATCH /2] arm64: dts: renesas: r8a77970: add MMC support
On Tue, Aug 21, 2018 at 10:49:26PM +0300, Sergei Shtylyov wrote: > Define the generic R8A77970 part of the MMC0 (SDHI2) device node. > > Based on the original (and large) patches by Vladimir Barinov. > > Signed-off-by: Vladimir Barinov > Signed-off-by: Sergei Shtylyov Thanks, This looks fine to me but I will wait to see if there are other reviews before applying. Reviewed-by: Simon Horman
Re: [PATCH] arm64: dts: renesas: enable SDR104 on R-Car Gen3
On Tue, Aug 21, 2018 at 09:03:56PM +0200, Wolfram Sang wrote: > Successfully tested on H3 ES1.0 and ES2.0, M3-W ES1.0, and M3-N ES1.0. > Even previously stubborn cards work fine. Transfer rates were >60MB/s. > > Signed-off-by: Wolfram Sang > --- > > The problems I reported last week were simply me booting the wrong kernel on > H3 > ES1.0 :( :) Thanks, This looks fine to me but I will wait to see if there are other reviews before applying. Reviewed-by: Simon Horman
Re: [PATCH v2 4/7] arm64: dts: renesas: r8a77965: m3nulcb: Initial device tree
On Sun, Aug 12, 2018 at 03:31:46PM +0200, Eugeniu Rosca wrote: > Allow the bare M3-N-based ULCB board to boot. > > Signed-off-by: Eugeniu Rosca > Reviewed-by: Jacopo Mondi Thanks Eugeniu, applied for v4.20.
Re: [PATCH v2 7/7] arm64: dts: renesas: r8a77965: m3nulcb-kf: Initial device tree
On Sun, Aug 12, 2018 at 03:31:49PM +0200, Eugeniu Rosca wrote: > This is based on the existing KF device tree sources: > $ ls -1 arch/arm64/boot/dts/renesas/*-kf.dts > arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dts > arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dts > arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dts > > Signed-off-by: Eugeniu Rosca Thanks, This looks fine to me but I will wait to see if there are other reviews before applying. Reviewed-by: Simon Horman
Re: [PATCH v2 6/7] arm64: dts: renesas: r8a77965: Add HSCIF0 device node
On Sun, Aug 12, 2018 at 03:31:48PM +0200, Eugeniu Rosca wrote:
> Fix below DTC error:
> Error: arch/arm64/boot/dts/renesas/ulcb-kf.dtsi:36.1-8 Label or path hscif0
> not found
>
> The DTC error occurs *after* the addition of r8a77965-m3nulcb-kf.dts.
> Fix it beforehand.
>
> Inspired from v4.12-rc1 commits:
> - commit 68cd16107260 ("arm64: dts: r8a7796 dtsi: Add all HSCIF nodes")
> - commit 6d50bb893504 ("arm64: dts: r8a7796: Enable HSCIF DMA")
> - commit bec0948e810f ("arm64: dts: r8a7796: Add reset control properties")
>
> Signed-off-by: Eugeniu Rosca
> ---
> Changes in v2:
> - Slightly improved the commit description.
> - Note that this commit could be replaced by
>
> https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git/commit/?h=b8e3c8e17611
That commit has been accepted for upstream so it should be used.
> ---
> arch/arm64/boot/dts/renesas/r8a77965.dtsi | 18 ++
> 1 file changed, 18 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/renesas/r8a77965.dtsi
> b/arch/arm64/boot/dts/renesas/r8a77965.dtsi
> index 4da479d3c226..d04a8b671cc2 100644
> --- a/arch/arm64/boot/dts/renesas/r8a77965.dtsi
> +++ b/arch/arm64/boot/dts/renesas/r8a77965.dtsi
> @@ -451,6 +451,24 @@
> status = "disabled";
> };
>
> + hscif0: serial@e654 {
> + compatible = "renesas,hscif-r8a77965",
> + "renesas,rcar-gen3-hscif",
> + "renesas,hscif";
> + reg = <0 0xe654 0 0x60>;
> + interrupts = ;
> + clocks = <&cpg CPG_MOD 520>,
> + <&cpg CPG_CORE R8A77965_CLK_S3D1>,
> + <&scif_clk>;
> + clock-names = "fck", "brg_int", "scif_clk";
> + dmas = <&dmac1 0x31>, <&dmac1 0x30>,
> +<&dmac2 0x31>, <&dmac2 0x30>;
> + dma-names = "tx", "rx", "tx", "rx";
> + power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
> + resets = <&cpg 520>;
> + status = "disabled";
> + };
> +
> hsusb: usb@e659 {
> compatible = "renesas,usbhs-r8a7796",
>"renesas,rcar-gen3-usbhs";
> --
> 2.18.0
>
Re: [PATCH v2 5/7] arm64: dts: renesas: r8a77965: Add CAN{0,1} placeholder nodes
On Fri, Aug 17, 2018 at 02:53:37PM +0100, Kieran Bingham wrote:
> Hi Eugeniu,
>
> Thank you for the patch,
>
> On 12/08/18 14:31, Eugeniu Rosca wrote:
> > According to R-Car Gen3 HW manual rev1.00, R-Car M3-N has two CAN
> > interfaces, similar to H3, M3-W and other SoCs from the same family.
> >
> > Add CAN placeholder nodes to avoid below DTC errors:
> > Error: arch/arm64/boot/dts/renesas/ulcb-kf.dtsi:19.1-6 Label or path can0
> > not found
> > Error: arch/arm64/boot/dts/renesas/ulcb-kf.dtsi:25.1-6 Label or path can1
> > not found
> >
> > These errors occur *after* the addition of r8a77965-m3nulcb-kf.dts.
> > Fix them beforehand.
> >
> > CAN support is inspired from below commits:
> > - v4.7 commit 308b7e4ba62e ("arm64: dts: r8a7795: Add CAN support")
> > - v4.11 commit 909c16252415 ("arm64: dts: r8a7796: Add CAN support")
> > - v4.12 commit bec0948e810f ("arm64: dts: r8a7796: Add reset control
> > properties")
> >
> > Signed-off-by: Eugeniu Rosca
>
> Reviewed-by: Kieran Bingham
Thanks Eugeniu and Kieran,
I have applied this for v4.20.
> > ---
> > Changes in v2:
> > - [Kieran Bingham] Improved commit description:
> >- Referenced the newer HW manual rev1.00 instead of rev0.55E.
> >- Kept the "true story" behind the patch. Just made it more clear.
> > - [Geert Uytterhoeven] Replaced CAN0 and CAN1 nodes with placeholders
> >(no CAN testing was done to validate the DTS configuration).
> > ---
> > arch/arm64/boot/dts/renesas/r8a77965.dtsi | 16
> > 1 file changed, 16 insertions(+)
> >
> > diff --git a/arch/arm64/boot/dts/renesas/r8a77965.dtsi
> > b/arch/arm64/boot/dts/renesas/r8a77965.dtsi
> > index 486aecacb22a..4da479d3c226 100644
> > --- a/arch/arm64/boot/dts/renesas/r8a77965.dtsi
> > +++ b/arch/arm64/boot/dts/renesas/r8a77965.dtsi
> > @@ -656,6 +656,22 @@
> > status = "disabled";
> > };
> >
> > + can0: can@e6c3 {
> > + compatible = "renesas,can-r8a77965",
> > +"renesas,rcar-gen3-can";
> > + reg = <0 0xe6c3 0 0x1000>;
> > + /* placeholder */
> > + status = "disabled";
> > + };
>
> This is probably more detail than is needed for a placeholder, but it
> looks correct so I think this is fine.
Agreed.
>
> --
> Kieran
>
>
>
> > +
> > + can1: can@e6c38000 {
> > + compatible = "renesas,can-r8a77965",
> > +"renesas,rcar-gen3-can";
> > + reg = <0 0xe6c38000 0 0x1000>;
> > + /* placeholder */
> > + status = "disabled";
> > + };
> > +
> > pwm0: pwm@e6e3 {
> > compatible = "renesas,pwm-r8a77965", "renesas,pwm-rcar";
> > reg = <0 0xe6e3 0 8>;
> >
>
Re: [PATCH] arm64: dts: renesas: r8a77965: Attach the SYS-DMAC to the IPMMU
On Mon, Aug 20, 2018 at 11:17:56PM +0900, Magnus Damm wrote: > From: Magnus Damm > > For R-Car M3-N hook up SYS-DMAC0, SYS-DMAC1 and SYS-DMAC2 to > IPMMU-DS0 and IPMMU-DS1 in same way as for R-Car M3-W. > This follows the R-Car Gen3 Rev.1.00 (April 2018) datasheet. > > Signed-off-by: Magnus Damm Thanks Magnus, applied for v4.20.
Re: [PATCH] arm: dts: Include R-Car Gen1 product name in DTSI files
On Mon, Aug 20, 2018 at 11:04:44PM +0900, Magnus Damm wrote: > From: Magnus Damm > > Browsing the DTS for all the R-Car SoCs with similar part numbers > still makes my head hurt, so to improve the user friendliness of > the 32-bit ARM DTS code base include R-Car Gen1 product names for > each DTSI file. > > Signed-off-by: Magnus Damm Thanks Magnus, Thanks a lot for this. Similar changes you already made have already proved useful. I've applied this for v4.20.
Re: [PATCH] arm64: dts: renesas: salvator-common: Add GPIO keys support
Hi Laurent,
thanks for your patch.
On Sun, Aug 19, 2018 at 10:44:55PM +0300, Laurent Pinchart wrote:
> The Salvator-X and XS boards have a 4 lines DIP switch and 3 push
> buttons connected to SoC GPIOs, meant to be used as general-purpose test
> keys. Add a corresponding node in DT, mapping (semi-randomly) the DIP
Arbitrary may be a better word choice than random.
> switch to keys 1-4 and the push buttons to keys A-C.
>
> Signed-off-by: Laurent Pinchart
> ---
> arch/arm64/boot/dts/renesas/salvator-common.dtsi | 63
>
> 1 file changed, 63 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/renesas/salvator-common.dtsi
> b/arch/arm64/boot/dts/renesas/salvator-common.dtsi
> index 7d3d866a0063..77d626baa9f3 100644
> --- a/arch/arm64/boot/dts/renesas/salvator-common.dtsi
> +++ b/arch/arm64/boot/dts/renesas/salvator-common.dtsi
> @@ -29,6 +29,7 @@
> */
>
> #include
> +#include
>
> / {
> aliases {
> @@ -86,6 +87,63 @@
> };
> };
>
> + keys {
> + compatible = "gpio-keys";
> +
> + pinctrl-0 = <&keys_pins>;
> + pinctrl-names = "default";
> +
> + key-1 {
> + gpios = <&gpio5 17 GPIO_ACTIVE_LOW>;
> + linux,code = ;
> + label = "SW4-1";
> + wakeup-source;
> + debounce-interval = <20>;
> + };
> + key-2 {
> + gpios = <&gpio5 20 GPIO_ACTIVE_LOW>;
> + linux,code = ;
> + label = "SW4-2";
> + wakeup-source;
> + debounce-interval = <20>;
> + };
> + key-3 {
> + gpios = <&gpio5 22 GPIO_ACTIVE_LOW>;
> + linux,code = ;
> + label = "SW4-3";
> + wakeup-source;
> + debounce-interval = <20>;
> + };
> + key-4 {
> + gpios = <&gpio5 23 GPIO_ACTIVE_LOW>;
> + linux,code = ;
> + label = "SW4-4";
> + wakeup-source;
> + debounce-interval = <20>;
> + };
> + key-a {
> + gpios = <&gpio6 11 GPIO_ACTIVE_LOW>;
> + linux,code = ;
> + label = "TSW0";
What does the 'T' in 'TSW' stand for? Toggle?
> + wakeup-source;
> + debounce-interval = <20>;
> + };
> + key-b {
> + gpios = <&gpio6 12 GPIO_ACTIVE_LOW>;
> + linux,code = ;
> + label = "TSW1";
> + wakeup-source;
> + debounce-interval = <20>;
> + };
> + key-c {
> + gpios = <&gpio6 13 GPIO_ACTIVE_LOW>;
> + linux,code = ;
> + label = "TSW2";
> + wakeup-source;
> + debounce-interval = <20>;
> + };
> + };
> +
> reg_1p8v: regulator0 {
> compatible = "regulator-fixed";
> regulator-name = "fixed-1.8V";
> @@ -567,6 +625,11 @@
> function = "intc_ex";
> };
>
> + keys_pins: keys {
> + pins = "GP_5_17", "GP_5_20", "GP_5_22";
I am curious to know why only some of the pins used above appear here.
> + bias-pull-up;
> + };
> +
> pwm1_pins: pwm1 {
> groups = "pwm1_a";
> function = "pwm1";
> --
> Regards,
>
> Laurent Pinchart
>
Re: [PATCH] arm64: dts: renesas: r8a77980: add CSI2/VIN support
On Fri, Aug 17, 2018 at 02:13:55PM +0300, Sergei Shtylyov wrote:
> On 08/17/2018 11:51 AM, Simon Horman wrote:
>
> Describe the CSI2 and VIN (and their interconnections) in the R8A77980
> device tree.
>
> Signed-off-by: Sergei Shtylyov
>
> ---
> This patch is against the 'renesas-devel-20180802v2-v4.18-rc7' branch of
> Simon Horman's 'renesas.git' repo.
>
> The R8A77980 CSI2/VIN DT binding updates have been posted earlier
> today...
>
> arch/arm64/boot/dts/renesas/r8a77980.dtsi | 374
> ++
> 1 file changed, 374 insertions(+)
>
> Index: renesas/arch/arm64/boot/dts/renesas/r8a77980.dtsi
> ===
> --- renesas.orig/arch/arm64/boot/dts/renesas/r8a77980.dtsi
> +++ renesas/arch/arm64/boot/dts/renesas/r8a77980.dtsi
> [...]
> +csi41: csi2@feab {
> +compatible = "renesas,r8a77980-csi2";
> +reg = <0 0xfeab 0 0x1>;
> +interrupts = ;
> >>>
> >>> The use of GIC_SPI 246 for both csi40 and csi41 seems suspicious.
> >>> Is this intentional?
> >>
> >> No, must be copy/paste artefact... Sorry about that, it should be 241
> >> instead.
> >>
> +clocks = <&cpg CPG_MOD 716>;
> >>>
> >>> Should this clock be 715 rather than 716?
> >>
> >>Yes, sure.
> >>
> >>I'm seeing this patch merged despite your remarks. Please either fix it
> >> up or
> >> pull it out!
> >
> > Oops, that was not intended.
> >
> > I have fixed up the patch as you suggested.
> > The result is as follows:
>
>Still buggy... :-)
>
> > From c703c196b847c654b392f027d3fa995e378792ac Mon Sep 17 00:00:00 2001
> > From: Sergei Shtylyov
> > Date: Mon, 6 Aug 2018 22:55:00 +0300
> > Subject: [PATCH] arm64: dts: renesas: r8a77980: add CSI2/VIN support
> >
> > Describe the CSI2 and VIN (and their interconnections) in the R8A77980
> > device tree.
> >
> > Signed-off-by: Sergei Shtylyov
> > Signed-off-by: Simon Horman
> > ---
> > arch/arm64/boot/dts/renesas/r8a77980.dtsi | 374
> > ++
> > 1 file changed, 374 insertions(+)
> >
> > diff --git a/arch/arm64/boot/dts/renesas/r8a77980.dtsi
> > b/arch/arm64/boot/dts/renesas/r8a77980.dtsi
> > index 4bc99d6763ce..71636fd1a819 100644
> > --- a/arch/arm64/boot/dts/renesas/r8a77980.dtsi
> > +++ b/arch/arm64/boot/dts/renesas/r8a77980.dtsi
> [...]
> > @@ -769,6 +1065,84 @@
> > resets = <&cpg 603>;
> > };
> >
> > + csi40: csi2@feaa {
> > + compatible = "renesas,r8a77980-csi2";
> > + reg = <0 0xfeaa 0 0x1>;
> > + interrupts = ;
> > + clocks = <&cpg CPG_MOD 716>;
> > + power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;
> > + resets = <&cpg 716>;
> > + status = "disabled";
> > +
> > + ports {
> > + #address-cells = <1>;
> > + #size-cells = <0>;
> > +
> > + port@1 {
> > + #address-cells = <1>;
> > + #size-cells = <0>;
> > +
> > + reg = <1>;
> > +
> > + csi40vin0: endpoint@0 {
> > + reg = <0>;
> > + remote-endpoint = <&vin0csi40>;
> > + };
> > + csi40vin1: endpoint@1 {
> > + reg = <1>;
> > + remote-endpoint = <&vin1csi40>;
> > + };
> > + csi40vin2: endpoint@2 {
> > + reg = <2>;
> > + remote-endpoint = <&vin2csi40>;
> > + };
> > + csi40vin3: endpoint@3 {
> > + reg = <3>;
> > + remote-endpoint = <&vin3csi40>;
> > + };
> > + };
> > + };
> > + };
> > +
> > + csi41: csi2@feab {
> > + compatible = "renesas,r8a77980-csi2";
> > + reg = <0 0xfeab 0 0x1>;
> > + interrupts = ;
> > + clocks = <&cpg CPG_MOD 715>;
> > + power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;
> > + resets = <&cpg 716>;
>
>You forgot to fix up this prop...
Thanks, I now have the following in my tree:
From f3e8d4c1e3c3a826310a220d7373ac7c07
Re: [PATCH v3 2/2] arm64: dts: renesas: condor/v3hsk: add DU/LVDS/HDMI support
On Mon, Aug 13, 2018 at 06:19:20PM +0300, Laurent Pinchart wrote:
> Hi Sergei,
>
> Thank you for the patch.
>
> On Wednesday, 13 June 2018 23:12:40 EEST Sergei Shtylyov wrote:
> > Define the Condor/V3HSK board dependent parts of the DU and LVDS device
> > nodes. Also add the device nodes for Thine THC63LVD1024 LVDS decoder and
> > Analog Devices ADV7511W HDMI transmitter...
> >
> > Based on the original (and large) patch by Vladimir Barinov.
> >
> > Signed-off-by: Vladimir Barinov
> > Signed-off-by: Sergei Shtylyov
> >
> > ---
> > Changes in version 2:
> > - added the V3HSK DT update, reworded the description, renamed the patch;
> > - added a space between the HDMI node name and a brace.
> >
> > arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 106
> > arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts | 120
> > 2 files changed, 226 insertions(+)
>
> I would have split that in two patchees.
I take your point but I think one is fine.
Sergei, will you address the other review items?
>
> >
> > Index: renesas/arch/arm64/boot/dts/renesas/r8a77980-condor.dts
> > ===
> > --- renesas.orig/arch/arm64/boot/dts/renesas/r8a77980-condor.dts
> > +++ renesas/arch/arm64/boot/dts/renesas/r8a77980-condor.dts
> > @@ -45,6 +45,56 @@
> > regulator-boot-on;
> > regulator-always-on;
> > };
> > +
> > + d1_8v: regulator-2 {
>
> Nitpicking, the naming for the regulator and clock nodes seems a bit weird.
> That shouldn't block this patch, but the issue should still be discussed with
> DT maintainers. A clear rule should be enacted on how to name top level nodes
> for which no register value makes sense.
>
> > + compatible = "regulator-fixed";
> > + regulator-name = "D1.8V";
> > + regulator-min-microvolt = <180>;
> > + regulator-max-microvolt = <180>;
> > + regulator-boot-on;
> > + regulator-always-on;
> > + };
> > +
> > + hdmi-out {
> > + compatible = "hdmi-connector";
> > + type = "a";
> > +
> > + port {
> > + hdmi_con: endpoint {
> > + remote-endpoint = <&adv7511_out>;
> > + };
> > + };
> > + };
> > +
> > + lvds-decoder {
> > + compatible = "thine,thc63lvd1024";
> > + vcc-supply = <&d3_3v>;
> > +
> > + ports {
> > + #address-cells = <1>;
> > + #size-cells = <0>;
> > +
> > + port@0 {
> > + reg = <0>;
> > + thc63lvd1024_in: endpoint {
> > + remote-endpoint = <&lvds0_out>;
> > + };
> > + };
> > +
> > + port@2 {
> > + reg = <2>;
> > + thc63lvd1024_out: endpoint {
> > + remote-endpoint = <&adv7511_in>;
> > + };
> > + };
> > + };
> > + };
> > +
> > + x1_clk: x1-clock {
> > + compatible = "fixed-clock";
> > + #clock-cells = <0>;
> > + clock-frequency = <14850>;
> > + };
> > };
> >
> > &avb {
> > @@ -74,6 +124,13 @@
> > };
> > };
> >
> > +&du {
> > + clocks = <&cpg CPG_MOD 724>,
> > +<&x1_clk>;
> > + clock-names = "du.0", "dclkin.0";
> > + status = "okay";
> > +};
> > +
> > &extal_clk {
> > clock-frequency = <1666>;
> > };
> > @@ -102,6 +159,55 @@
> > gpio-controller;
> > #gpio-cells = <2>;
> > };
> > +
> > + hdmi@39 {
> > + compatible = "adi,adv7511w";
> > + reg = <0x39>;
> > + interrupt-parent = <&gpio1>;
> > + interrupts = <20 IRQ_TYPE_LEVEL_LOW>;
> > + avdd-supply = <&d1_8v>;
> > + dvdd-supply = <&d1_8v>;
> > + pvdd-supply = <&d1_8v>;
> > + bgvdd-supply = <&d1_8v>;
> > + dvdd-3v-supply = <&d3_3v>;
> > +
> > + adi,input-depth = <8>;
> > + adi,input-colorspace = "rgb";
> > + adi,input-clock = "1x";
> > + adi,input-style = <1>;
> > + adi,input-justification = "evenly";
> > +
> > + ports {
> > + #address-cells = <1>;
> > + #size-cells = <0>;
> > +
> > + port@0 {
> > + reg = <0>;
> > + adv7511_in: endpoint {
> > + remote-endpoint = <&thc63lvd1024_out>;
> > + };
> > + };
> > +
> > + port@1 {
> > + reg = <1>;
> > + adv7511_out: endpoint {
> > + remote-endpoint = <&hdmi_con>;
> > + };
> >
Re: [PATCH v2] arm64: dts: renesas: Initial r8a774a1 SoC device tree
On Mon, Aug 13, 2018 at 01:41:48PM +0100, Biju Das wrote: > Basic support for the RZ/G2M SoC. > > Signed-off-by: Biju Das > Reviewed-by: Fabrizio Castro Thanks Biju, applied for v4.20.
Re: [PATCH] dt-bindings: mmc: tmio_mmc: document Renesas R8A77970 bindings
On 21 August 2018 at 21:14, Sergei Shtylyov wrote: > Document the R-Car V3M (R8A77970) SoC in the R-Car SDHI bindings -- it's > the usual R-Car gen3 compatible controller with the internal DMA engine. > > Signed-off-by: Sergei Shtylyov Thanks, queued for v4.20! Kind regards Uffe > > --- > This patch is against the 'next' branch of Ulf Hansson's 'mmc.git' repo. > > Documentation/devicetree/bindings/mmc/tmio_mmc.txt |1 + > 1 file changed, 1 insertion(+) > > Index: mmc/Documentation/devicetree/bindings/mmc/tmio_mmc.txt > === > --- mmc.orig/Documentation/devicetree/bindings/mmc/tmio_mmc.txt > +++ mmc/Documentation/devicetree/bindings/mmc/tmio_mmc.txt > @@ -27,6 +27,7 @@ Required properties: > "renesas,sdhi-r8a7795" - SDHI IP on R8A7795 SoC > "renesas,sdhi-r8a7796" - SDHI IP on R8A7796 SoC > "renesas,sdhi-r8a77965" - SDHI IP on R8A77965 SoC > + "renesas,sdhi-r8a77970" - SDHI IP on R8A77970 SoC > "renesas,sdhi-r8a77980" - SDHI IP on R8A77980 SoC > "renesas,sdhi-r8a77990" - SDHI IP on R8A77990 SoC > "renesas,sdhi-r8a77995" - SDHI IP on R8A77995 SoC
Re: [PATCH] mmc: renesas_sdhi_internal_dmac: add R8A77970 to whitelist
On 20 August 2018 at 21:44, Sergei Shtylyov wrote: > On 08/20/2018 07:42 PM, Wolfram Sang wrote: > >>> I've successfully tested eMMC on the V3H Starter Kit board. R8A77970 SoC >>> has a single SDHI core anyway, so can't be a subject to the known RX DMA >>> errata... >>> >>> Signed-off-by: Sergei Shtylyov >> >> Nit: some strange double spaces and '...' in the commit message: >> >> Reviewed-by: Wolfram Sang > >Should I repost? Or you'd squash the fouble spaces and ellipsis while > applying? No need to repost, I have amended the change. > >BTW, will this patch go into the next or fixes branch? (I remember Ulf > wanted to > stick the analogous R8A77980 patch into fixes.) Don't recall, but decided to queue this for v4.20. Please tell if you want me to do otherwise. Kind regards Uffe
Re: [PATCH 0/2] Fix some typos in Renesas R-Car gen3 SDHI driver
On 17 August 2018 at 22:16, Sergei Shtylyov wrote: > Hello! > > Here's a set of 2 patches against the 'next' branch of Ulf Hannsson's > 'mmc.git' repo. > They fix some typos I noticed... > > [1/2] mmc: renesas_sdhi_internal_dmac: fix typo in DM_CM_DTRAN_MODE.BUS_WIDTH > field name > [2/2] mmc: renesas_sdhi_internal_dmac: fix comment typo > > MBR. Sergei Thanks, squashed and queued for v4.20! Kind regards Uffe
Re: [PATCH 0/2] Add SDHI support to r8a774a1
On 14 August 2018 at 14:34, Fabrizio Castro wrote: > Dear All, > > this series aims at documenting SDHI support for RZ/G2M (a.k.a. R8A774A1). > > Cheers, > Fab > > Fabrizio Castro (2): > mmc: renesas_sdhi_internal_dmac: Whitelist r8a774a1 > mmc: renesas_sdhi: Add r8a774a1 support > > Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 4 +++- > drivers/mmc/host/renesas_sdhi_internal_dmac.c | 1 + > 2 files changed, 4 insertions(+), 1 deletion(-) > > -- > 2.7.4 > Thanks, queued for v4.20! Kind regards Uffe
Re: [PATCH v2 0/7] mmc: tmio: refactor TMIO core a bit and add UniPhier SD/eMMC controller support
On 21 August 2018 at 04:57, Masahiro Yamada wrote: > Hi Wolfram, > > > 2018-08-21 4:07 GMT+09:00 Wolfram Sang : >> >> So, today I did test these patches successfully on a Gen3 board (M3-N) >> and reviewed half of the patches. I will continue tomorrow with >> reviewing and testing more boards. >> >> In a nutshell, things look good so far. >> > > > Thanks for the review! > > But, this version is not applicable to Linus' tree > due to commit db924bba47c80. > > Resolving the conflict is not trivial. > > > I will rebase and send v3, > but I do not understand the quirks > Renesas is adding to the TMIO core code. Thanks for the heads up, I am waiting for your v3 then. Kind regards Uffe
RE: [PATCH V2 4/5] PCI: rcar: Support runtime PM, link state L1 handling
Hi Lorenzo, On 21 August 2018 16:32, Lorenzo Pieralisi wrote: > On Tue, Aug 21, 2018 at 08:58:38AM +, Phil Edworthy wrote: > > On 20 August 2018 15:48 Lorenzo Pieralisi wrote: > > > On Mon, Aug 20, 2018 at 01:44:48PM +, Phil Edworthy wrote: > > > > > > [...] > > > > > > > However, both before and after this patch, the RP does not > > > > transition > > > > L1 when the endpoints change to L1. > > > > This patch only transitions the RP to L1 during accessing a card's > > > > config registers, if the RP is not in L1 link state and has > > > > received > > > > PM_ENTER_L1 DLLP (e.g. resume). After this, the hardware will > > > > handle the transition out of L1. > > > > > > > > The relevant part of the rcar manual says: "After a recovery to > > > > L0, if the device is in the Non-D0 state and PM_Enter_L1 DLLP is > > > > transmitted from the downstream device, software should confirm > > > > that hardware is in the L0 state (PMSR.PMSTATE = L0) and initiate > > > > the L1 transition sequence again (write 1 to PMCTLR.L1IATN). In > > > > this case, the sequence > > > > is: L0 ??? L1 ??? L0 recovery ??? L1 again." > > > > > > Can you map these FSM steps to this patch code please ? I would like > > > to understand what Link state maps to which command written and > when. > > I don't think I can because we are not initially entering L1. Looking > > at this again, I think this section of the manual only helps in > > indicating how to detect we should have gone into L1 and how to poke > > the HW to initiate the transition to L1. > > > > On system suspend, the EP sends PM_Enter_L1 DLLP and enters L1 state. > > I am still struggling to understand what "EP enters L1 state" means. A link in > L1 means both ends of the link are in electrical idle, it is a two-way > handshake, see PCI express specifications 5.3.2.1 "Entry into the L1 state". Sorry, I'm no PCIe expert and the rcar HW documentation doesn't provide enough detail. I guess (that's all I can do with this) the following: a) the EP sends the PM_Enter_L1 DLLP, b) the RP sends a PM_Request_Ack DLLP. c) The EP physical layer is then inactive. However, the rcar RP doesn't complete L1 transition, so the RP physical layer is still active. Hence the EP thinks it is in L1, but the RP is not. > > The rcar RP cannot enter L1 by HW alone, so is still in L0. > > See above. > > > The only way out of this from the PCIe spec FSM is for both EP and RP > > to enter the Recovery state. > > The patch simply detects that we should have gone into L1, and so > > initiates that state change, and the HW will then handle the > > transition from L1 to Recovery and then on to L0. > > That I can understand, I reckon it is to "reset" the RP link state machine to > a > "sane" state. Bjorn's comment added back: > I think there's still a potential issue if the endpoint goes to a > non-D0 state, the link is stuck in this transitional state (endpoint > thinks it's L1, RP thinks it's L0), and the *endpoint* wants to exit > L1, e.g., so it can send a PME message for a wakeup. I don't know > what happens then. > > > > I don't think the potential issue that Bjorn talked about can > > > > happen because the RP does go into L1. I could be wrong though... > > > > > > I do not understand this paragraph, mind elaborating on it ? > > As rcar RP only supports D0 and D3hot/cold, (the manual says it > > supports D3cold, but I cannot see how if it doesn't support L2 or L3 > > states), if you force the link to D3, we can only be in L1 state. > > D3 is a device state, not a link state. I still do not understand this > statement. > > The link between RP and EP can enter L1 when all functions in the EP are in a > device state != D0 but, as I mentioned above, it is still unclear what happens > in this platform since I do not get what state in the PCI spec 5.3.2.1 state > machine the RP Link state machine is in. > > If we programme the device into any D-state and the device wants to send a > PME message _before_ we reset the RP state machine with the procedure > described in this thread, what happens ? Or, more explicitly, what are in > _HW_ the states of upstream and downstream link state machines when the > EP is put in, say, D1 ? rcar only supports D0 and D3, and L0/L0s/L1 so it's a bit simpler (I assume devices can only be put into D states that are supported by the RP). If I read the PCIe spec 5.3.2 correctly, for rcar, if the device is put into D3, the interconnect state must be L1. Hence my comment... Re-reading Bjorn's comment, I believe he is discussing a different case. I really don't know what will happen in this case. Can you suggest a test to get a device to go from D3 to D0? Would suspend using a NIC with WOL be enough? Or something simpler? > That's in short our question. I would be happy to get to the bottom of this > since it is an interesting issue we are facing, we need HW details, I can > apply > Marek's patch but I would be happier if I get the whole picture first. Su
