diff options
author | Lars Persson <lars.persson@axis.com> | 2016-02-25 04:11:56 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2016-03-12 19:15:47 -0500 |
commit | b2af8e58a0c194eee1be5912566b68f076672cc1 (patch) | |
tree | 178c1a2b8b7d3620ad9bdbfa94927a55546da6a9 | |
parent | 7ad86d612ba8fd0e9c1323082b846b6e69c1d456 (diff) |
ARM: dts: artpec: dual-license on artpec6.dtsi
Relaxed the license on the dtsi to permit use in other projects.
Signed-off-by: Lars Persson <larper@axis.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r-- | arch/arm/boot/dts/artpec6.dtsi | 40 |
1 files changed, 37 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/artpec6.dtsi b/arch/arm/boot/dts/artpec6.dtsi index f2a7e4a83670..30430162b886 100644 --- a/arch/arm/boot/dts/artpec6.dtsi +++ b/arch/arm/boot/dts/artpec6.dtsi | |||
@@ -1,9 +1,43 @@ | |||
1 | /* | 1 | /* |
2 | * Device Tree Source for the Axis ARTPEC-6 SoC | 2 | * Device Tree Source for the Axis ARTPEC-6 SoC |
3 | * | 3 | * |
4 | * This file is licensed under the terms of the GNU General Public License | 4 | * This file is dual-licensed: you can use it either under the terms |
5 | * version 2. This program is licensed "as is" without any warranty of any | 5 | * of the GPL or the X11 license, at your option. Note that this dual |
6 | * kind, whether express or implied. | 6 | * licensing only applies to this file, and not this project as a |
7 | * whole. | ||
8 | * | ||
9 | * a) This file is free software; you can redistribute it and/or | ||
10 | * modify it under the terms of the GNU General Public License as | ||
11 | * published by the Free Software Foundation; either version 2 of the | ||
12 | * License, or (at your option) any later version. | ||
13 | * | ||
14 | * This file is distributed in the hope that it will be useful, | ||
15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
17 | * GNU General Public License for more details. | ||
18 | * | ||
19 | * Or, alternatively, | ||
20 | * | ||
21 | * b) Permission is hereby granted, free of charge, to any person | ||
22 | * obtaining a copy of this software and associated documentation | ||
23 | * files (the "Software"), to deal in the Software without | ||
24 | * restriction, including without limitation the rights to use, | ||
25 | * copy, modify, merge, publish, distribute, sublicense, and/or | ||
26 | * sell copies of the Software, and to permit persons to whom the | ||
27 | * Software is furnished to do so, subject to the following | ||
28 | * conditions: | ||
29 | * | ||
30 | * The above copyright notice and this permission notice shall be | ||
31 | * included in all copies or substantial portions of the Software. | ||
32 | * | ||
33 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
34 | * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES | ||
35 | * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
36 | * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT | ||
37 | * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, | ||
38 | * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
39 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | ||
40 | * OTHER DEALINGS IN THE SOFTWARE. | ||
7 | */ | 41 | */ |
8 | 42 | ||
9 | #include <dt-bindings/interrupt-controller/arm-gic.h> | 43 | #include <dt-bindings/interrupt-controller/arm-gic.h> |