Skip to content

Commit c0f8476

Browse files
krzklinusw
authored andcommitted
pinctrl: use capital "OR" for multiple licenses in SPDX
Documentation/process/license-rules.rst and checkpatch expect the SPDX identifier syntax for multiple licenses to use capital "OR". Correct it to keep consistent format and avoid copy-paste issues. Correct also the placement of SPDX identifier in pinctrl-meson-axg files: WARNING: Misplaced SPDX-License-Identifier tag - use line 1 instead Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org> Link: https://lore.kernel.org/r/20230823085546.116494-1-krzysztof.kozlowski@linaro.org Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
1 parent 25990aa commit c0f8476

File tree

5 files changed

+5
-7
lines changed

5 files changed

+5
-7
lines changed

drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
12
/*
23
* Second generation of pinmux driver for Amlogic Meson-AXG SoC.
34
*
@@ -6,8 +7,6 @@
67
*
78
* Copyright (c) 2017 Amlogic, Inc. All rights reserved.
89
* Author: Xingyu Chen <xingyu.chen@amlogic.com>
9-
*
10-
* SPDX-License-Identifier: (GPL-2.0+ or MIT)
1110
*/
1211

1312
/*

drivers/pinctrl/meson/pinctrl-meson-axg-pmx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* SPDX-License-Identifier: (GPL-2.0+ or MIT) */
1+
/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
22
/*
33
* Copyright (c) 2017 Baylibre SAS.
44
* Author: Jerome Brunet <jbrunet@baylibre.com>

drivers/pinctrl/meson/pinctrl-meson-axg.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1+
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
12
/*
23
* Pin controller and GPIO driver for Amlogic Meson AXG SoC.
34
*
45
* Copyright (c) 2017 Amlogic, Inc. All rights reserved.
56
* Author: Xingyu Chen <xingyu.chen@amlogic.com>
6-
*
7-
* SPDX-License-Identifier: (GPL-2.0+ or MIT)
87
*/
98

109
#include <dt-bindings/gpio/meson-axg-gpio.h>

drivers/pinctrl/meson/pinctrl-meson-g12a.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-License-Identifier: (GPL-2.0+ or MIT)
1+
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
22
/*
33
* Pin controller and GPIO driver for Amlogic Meson G12A SoC.
44
*

drivers/pinctrl/pinctrl-mlxbf3.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-License-Identifier: GPL-2.0-only or BSD-3-Clause
1+
// SPDX-License-Identifier: GPL-2.0-only OR BSD-3-Clause
22
/* Copyright (C) 2022 NVIDIA CORPORATION & AFFILIATES */
33

44
#include <linux/bitfield.h>

0 commit comments

Comments
 (0)