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

ARM: dts: berlin*-dts: use SPDX-License-Identifier for berlin based board

Follow the recent trend for the license description, and also fix the
wrongly stated X11 to MIT.

As already pointed on the DT ML, 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: Jisheng Zhang <Jisheng.Zhang@synaptics.com>

+3 -96
+1 -32
arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts
··· 1 + // SPDX-License-Identifier: (GPL-2.0 OR MIT) 1 2 /* 2 3 * Device Tree file for Sony NSZ-GS7 3 4 * 4 5 * Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> 5 - * 6 - * This file is dual-licensed: you can use it either under the terms 7 - * of the GPL or the X11 license, at your option. Note that this dual 8 - * licensing only applies to this file, and not this project as a 9 - * whole. 10 - * 11 - * a) This file is licensed under the terms of the GNU General Public 12 - * License version 2. This program is licensed "as is" without any 13 - * warranty of any kind, whether express or implied. 14 - * 15 - * Or, alternatively, 16 - * 17 - * b) Permission is hereby granted, free of charge, to any person 18 - * obtaining a copy of this software and associated documentation 19 - * files (the "Software"), to deal in the Software without 20 - * restriction, including without limitation the rights to use, 21 - * copy, modify, merge, publish, distribute, sublicense, and/or 22 - * sell copies of the Software, and to permit persons to whom the 23 - * Software is furnished to do so, subject to the following 24 - * conditions: 25 - * 26 - * The above copyright notice and this permission notice shall be 27 - * included in all copies or substantial portions of the Software. 28 - * 29 - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 30 - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 31 - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 32 - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 33 - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 34 - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 35 - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 36 - * OTHER DEALINGS IN THE SOFTWARE. 37 6 */ 38 7 39 8 /dts-v1/;
+1 -32
arch/arm/boot/dts/berlin2cd-google-chromecast.dts
··· 1 + // SPDX-License-Identifier: (GPL-2.0 OR MIT) 1 2 /* 2 3 * Device Tree file for Google Chromecast 3 4 * 4 5 * Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> 5 - * 6 - * This file is dual-licensed: you can use it either under the terms 7 - * of the GPL or the X11 license, at your option. Note that this dual 8 - * licensing only applies to this file, and not this project as a 9 - * whole. 10 - * 11 - * a) This file is licensed under the terms of the GNU General Public 12 - * License version 2. This program is licensed "as is" without any 13 - * warranty of any kind, whether express or implied. 14 - * 15 - * Or, alternatively, 16 - * 17 - * b) Permission is hereby granted, free of charge, to any person 18 - * obtaining a copy of this software and associated documentation 19 - * files (the "Software"), to deal in the Software without 20 - * restriction, including without limitation the rights to use, 21 - * copy, modify, merge, publish, distribute, sublicense, and/or 22 - * sell copies of the Software, and to permit persons to whom the 23 - * Software is furnished to do so, subject to the following 24 - * conditions: 25 - * 26 - * The above copyright notice and this permission notice shall be 27 - * included in all copies or substantial portions of the Software. 28 - * 29 - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 30 - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 31 - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 32 - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 33 - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 34 - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 35 - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 36 - * OTHER DEALINGS IN THE SOFTWARE. 37 6 */ 38 7 39 8 /dts-v1/;
+1 -32
arch/arm/boot/dts/berlin2q-marvell-dmp.dts
··· 1 + // SPDX-License-Identifier: (GPL-2.0 OR MIT) 1 2 /* 2 3 * Copyright (C) 2014 Antoine Ténart <antoine.tenart@free-electrons.com> 3 - * 4 - * This file is dual-licensed: you can use it either under the terms 5 - * of the GPL or the X11 license, at your option. Note that this dual 6 - * licensing only applies to this file, and not this project as a 7 - * whole. 8 - * 9 - * a) This file is licensed under the terms of the GNU General Public 10 - * License version 2. This program is licensed "as is" without any 11 - * warranty of any kind, whether express or implied. 12 - * 13 - * Or, alternatively, 14 - * 15 - * b) Permission is hereby granted, free of charge, to any person 16 - * obtaining a copy of this software and associated documentation 17 - * files (the "Software"), to deal in the Software without 18 - * restriction, including without limitation the rights to use, 19 - * copy, modify, merge, publish, distribute, sublicense, and/or 20 - * sell copies of the Software, and to permit persons to whom the 21 - * Software is furnished to do so, subject to the following 22 - * conditions: 23 - * 24 - * The above copyright notice and this permission notice shall be 25 - * included in all copies or substantial portions of the Software. 26 - * 27 - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 28 - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 29 - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 30 - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 31 - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 32 - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 33 - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 34 - * OTHER DEALINGS IN THE SOFTWARE. 35 4 */ 36 5 37 6 /dts-v1/;