diff --git a/docs/license.rst b/docs/license.rst index 2f9704335..f0caa39b0 100644 --- a/docs/license.rst +++ b/docs/license.rst @@ -76,5 +76,14 @@ license text is included in those source files. BSD-3-Clause license. Any contributions to this code must be made under the terms of both licenses. +- Some source files originating from the Linux source tree, which are + disjunctively dual licensed (GPL-2.0 OR MIT), are redistributed under the + terms of the MIT license. These files are: + + - ``include/dt-bindings/interrupt-controller/arm-gic.h`` + + See the original `Linux MIT license`_. + .. _FreeBSD: http://www.freebsd.org +.. _Linux MIT license: https://raw.githubusercontent.com/torvalds/linux/master/LICENSES/preferred/MIT .. _SCC: http://www.simple-cc.org/ diff --git a/fdts/fvp-base-gicv2-psci-aarch32.dts b/fdts/fvp-base-gicv2-psci-aarch32.dts index 957aea511..3a921f436 100644 --- a/fdts/fvp-base-gicv2-psci-aarch32.dts +++ b/fdts/fvp-base-gicv2-psci-aarch32.dts @@ -11,8 +11,8 @@ #define AFF #define REG_32 -#include "fvp-defs.dtsi" #include +#include "fvp-defs.dtsi" /memreserve/ 0x80000000 0x00010000; diff --git a/fdts/fvp-base-gicv2-psci.dts b/fdts/fvp-base-gicv2-psci.dts index f0c71b4a5..e99719e19 100644 --- a/fdts/fvp-base-gicv2-psci.dts +++ b/fdts/fvp-base-gicv2-psci.dts @@ -10,8 +10,8 @@ #define AFF -#include "fvp-defs.dtsi" #include +#include "fvp-defs.dtsi" /memreserve/ 0x80000000 0x00010000; diff --git a/fdts/fvp-base-gicv3-psci-common.dtsi b/fdts/fvp-base-gicv3-psci-common.dtsi index 0ef92733d..b6753de8e 100644 --- a/fdts/fvp-base-gicv3-psci-common.dtsi +++ b/fdts/fvp-base-gicv3-psci-common.dtsi @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include +#include #define LEVEL 0 #define EDGE 2 diff --git a/fdts/fvp-foundation-gicv2-psci.dts b/fdts/fvp-foundation-gicv2-psci.dts index 7dd9afdb8..5a82c4601 100644 --- a/fdts/fvp-foundation-gicv2-psci.dts +++ b/fdts/fvp-foundation-gicv2-psci.dts @@ -11,8 +11,8 @@ #define AFF #define CLUSTER_COUNT 1 -#include "fvp-defs.dtsi" #include +#include "fvp-defs.dtsi" /memreserve/ 0x80000000 0x00010000; diff --git a/fdts/fvp-foundation-gicv3-psci.dts b/fdts/fvp-foundation-gicv3-psci.dts index 0b265ad5e..e1249d458 100644 --- a/fdts/fvp-foundation-gicv3-psci.dts +++ b/fdts/fvp-foundation-gicv3-psci.dts @@ -11,8 +11,8 @@ #define AFF #define CLUSTER_COUNT 1 -#include "fvp-defs.dtsi" #include +#include "fvp-defs.dtsi" /memreserve/ 0x80000000 0x00010000; diff --git a/include/dt-bindings/interrupt-controller/arm-gic.h b/include/dt-bindings/interrupt-controller/arm-gic.h index 024a6c602..fbe07da98 100644 --- a/include/dt-bindings/interrupt-controller/arm-gic.h +++ b/include/dt-bindings/interrupt-controller/arm-gic.h @@ -1,5 +1,8 @@ -/* SPDX-License-Identifier: GPL-2.0 or BSD-3-Clause */ /* + * Copyright (c) 2019-2021, ARM Limited and Contributors. All rights reserved. + * + * SPDX-License-Identifier: MIT + * * This header provides constants for the ARM GIC. */ diff --git a/licenses/LICENSE.MIT b/licenses/LICENSE.MIT new file mode 100644 index 000000000..8aa26455d --- /dev/null +++ b/licenses/LICENSE.MIT @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) [year] [fullname] + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE.