Commit c0f84760 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Linus Walleij
Browse files

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: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20230823085546.116494-1-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 25990aab

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

+1 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)

/*

 * Second generation of pinmux driver for Amlogic Meson-AXG SoC.

 *
@@ -6,8 +7,6 @@ 
 *

 * Copyright (c) 2017 Amlogic, Inc. All rights reserved.

 * Author: Xingyu Chen <xingyu.chen@amlogic.com>

 *

 * SPDX-License-Identifier: (GPL-2.0+ or MIT)

 */



/*

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

+1 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: (GPL-2.0+ or MIT) */

/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */

/*

 * Copyright (c) 2017 Baylibre SAS.

 * Author:  Jerome Brunet  <jbrunet@baylibre.com>

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

+1 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)

/*

 * Pin controller and GPIO driver for Amlogic Meson AXG SoC.

 *

 * Copyright (c) 2017 Amlogic, Inc. All rights reserved.

 * Author: Xingyu Chen <xingyu.chen@amlogic.com>

 *

 * SPDX-License-Identifier: (GPL-2.0+ or MIT)

 */



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

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

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0+ or MIT)

// SPDX-License-Identifier: (GPL-2.0+ OR MIT)

/*

 * Pin controller and GPIO driver for Amlogic Meson G12A SoC.

 *

drivers/pinctrl/pinctrl-mlxbf3.c

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only or BSD-3-Clause

// SPDX-License-Identifier: GPL-2.0-only OR BSD-3-Clause

/* Copyright (C) 2022 NVIDIA CORPORATION & AFFILIATES */



#include <linux/bitfield.h>