diff options
author | Gregory CLEMENT <gregory.clement@bootlin.com> | 2018-03-15 10:21:38 -0400 |
---|---|---|
committer | Gregory CLEMENT <gregory.clement@bootlin.com> | 2018-03-27 09:20:45 -0400 |
commit | 0fdd2cd6741f470e32753b010b0329f973a9d983 (patch) | |
tree | 214a3043bc624e6c413c5ad211bc05462776c5c2 | |
parent | 696241a4ae3ca7999206426e73c435f8b6c7feef (diff) |
arm: dts: armada-385-turris-omnia: use SPDX-License-Identifier
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
Cc: Uwe Kleine-König <uwe@kleine-koenig.org>
Acked-by: Uwe Kleine-König <uwe@kleine-koenig.org>
Acked-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
-rw-r--r-- | arch/arm/boot/dts/armada-385-turris-omnia.dts | 35 |
1 files changed, 1 insertions, 34 deletions
diff --git a/arch/arm/boot/dts/armada-385-turris-omnia.dts b/arch/arm/boot/dts/armada-385-turris-omnia.dts index 06831e1e3f80..768b6c5d2129 100644 --- a/arch/arm/boot/dts/armada-385-turris-omnia.dts +++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts | |||
@@ -1,43 +1,10 @@ | |||
1 | // SPDX-License-Identifier: (GPL-2.0 OR MIT) | ||
1 | /* | 2 | /* |
2 | * Device Tree file for the Turris Omnia | 3 | * Device Tree file for the Turris Omnia |
3 | * | 4 | * |
4 | * Copyright (C) 2016 Uwe Kleine-König <uwe@kleine-koenig.org> | 5 | * Copyright (C) 2016 Uwe Kleine-König <uwe@kleine-koenig.org> |
5 | * Copyright (C) 2016 Tomas Hlavacek <tmshlvkc@gmail.com> | 6 | * Copyright (C) 2016 Tomas Hlavacek <tmshlvkc@gmail.com> |
6 | * | 7 | * |
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 licensed under the terms of the GNU General Public | ||
13 | * License version 2. This program is licensed "as is" without | ||
14 | * any warranty of any kind, whether express or implied. | ||
15 | * | ||
16 | * Or, alternatively, | ||
17 | * | ||
18 | * b) Permission is hereby granted, free of charge, to any person | ||
19 | * obtaining a copy of this software and associated documentation | ||
20 | * files (the "Software"), to deal in the Software without | ||
21 | * restriction, including without limitation the rights to use, | ||
22 | * copy, modify, merge, publish, distribute, sublicense, and/or | ||
23 | * sell copies of the Software, and to permit persons to whom the | ||
24 | * Software is furnished to do so, subject to the following | ||
25 | * conditions: | ||
26 | * | ||
27 | * The above copyright notice and this permission notice shall be | ||
28 | * included in all copies or substantial portions of the Software. | ||
29 | * | ||
30 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
31 | * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES | ||
32 | * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
33 | * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT | ||
34 | * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, | ||
35 | * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
36 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | ||
37 | * OTHER DEALINGS IN THE SOFTWARE. | ||
38 | */ | ||
39 | |||
40 | /* | ||
41 | * Schematic available at https://www.turris.cz/doc/_media/rtrom01-schema.pdf | 8 | * Schematic available at https://www.turris.cz/doc/_media/rtrom01-schema.pdf |
42 | */ | 9 | */ |
43 | 10 | ||