Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: sama5d{2,4}: use SPDX-License-Identifier

External E-Mail

The X11 license text [1] is explicitly for the X Consortium and has a
couple of extra clauses. The MIT license text [2] is actually what the
current DT files claim.

[1] https://spdx.org/licenses/X11.html
[2] https://spdx.org/licenses/MIT.html

Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: Ludovic Desroches <ludovic.desroches@microchip.com>

authored by

Alexandre Belloni and committed by
Ludovic Desroches
c848f3ba 7784a6eb

+2 -76
+1 -38
arch/arm/boot/dts/sama5d2.dtsi
··· 1 + // SPDX-License-Identifier: (GPL-2.0+ OR MIT) 1 2 /* 2 3 * sama5d2.dtsi - Device Tree Include file for SAMA5D2 family SoC 3 4 * 4 5 * Copyright (C) 2015 Atmel, 5 6 * 2015 Ludovic Desroches <ludovic.desroches@atmel.com> 6 - * 7 - * This file is dual-licensed: you can use it either under the terms 8 - * of the GPL or the X11 license, at your option. Note that this dual 9 - * licensing only applies to this file, and not this project as a 10 - * whole. 11 - * 12 - * a) This file is free software; you can redistribute it and/or 13 - * modify it under the terms of the GNU General Public License as 14 - * published by the Free Software Foundation; either version 2 of the 15 - * License, or (at your option) any later version. 16 - * 17 - * This file is distributed in the hope that it will be useful, 18 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 19 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 20 - * GNU General Public License for more details. 21 - * 22 - * Or, alternatively, 23 - * 24 - * b) Permission is hereby granted, free of charge, to any person 25 - * obtaining a copy of this software and associated documentation 26 - * files (the "Software"), to deal in the Software without 27 - * restriction, including without limitation the rights to use, 28 - * copy, modify, merge, publish, distribute, sublicense, and/or 29 - * sell copies of the Software, and to permit persons to whom the 30 - * Software is furnished to do so, subject to the following 31 - * conditions: 32 - * 33 - * The above copyright notice and this permission notice shall be 34 - * included in all copies or substantial portions of the Software. 35 - * 36 - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 37 - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 38 - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 39 - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 40 - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 41 - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 42 - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 43 - * OTHER DEALINGS IN THE SOFTWARE. 44 7 */ 45 8 46 9 #include <dt-bindings/dma/at91.h>
+1 -38
arch/arm/boot/dts/sama5d4.dtsi
··· 1 + // SPDX-License-Identifier: (GPL-2.0+ OR MIT) 1 2 /* 2 3 * sama5d4.dtsi - Device Tree Include file for SAMA5D4 family SoC 3 4 * 4 5 * Copyright (C) 2014 Atmel, 5 6 * 2014 Nicolas Ferre <nicolas.ferre@atmel.com> 6 - * 7 - * This file is dual-licensed: you can use it either under the terms 8 - * of the GPL or the X11 license, at your option. Note that this dual 9 - * licensing only applies to this file, and not this project as a 10 - * whole. 11 - * 12 - * a) This file is free software; you can redistribute it and/or 13 - * modify it under the terms of the GNU General Public License as 14 - * published by the Free Software Foundation; either version 2 of the 15 - * License, or (at your option) any later version. 16 - * 17 - * This file is distributed in the hope that it will be useful, 18 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 19 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 20 - * GNU General Public License for more details. 21 - * 22 - * Or, alternatively, 23 - * 24 - * b) Permission is hereby granted, free of charge, to any person 25 - * obtaining a copy of this software and associated documentation 26 - * files (the "Software"), to deal in the Software without 27 - * restriction, including without limitation the rights to use, 28 - * copy, modify, merge, publish, distribute, sublicense, and/or 29 - * sell copies of the Software, and to permit persons to whom the 30 - * Software is furnished to do so, subject to the following 31 - * conditions: 32 - * 33 - * The above copyright notice and this permission notice shall be 34 - * included in all copies or substantial portions of the Software. 35 - * 36 - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 37 - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 38 - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 39 - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 40 - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 41 - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 42 - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 43 - * OTHER DEALINGS IN THE SOFTWARE. 44 7 */ 45 8 46 9 #include <dt-bindings/clock/at91.h>