diff mbox

[1/5] ARM: sun4i: Relicense the A10 DTSI under GPLv2/X11

Message ID 1409682069-7164-1-git-send-email-maxime.ripard@free-electrons.com
State New
Headers show

Commit Message

Maxime Ripard Sept. 2, 2014, 6:21 p.m. UTC
The current GPL only licensing on the DTSI makes it very impractical for other
software components licensed under another license.

In order to make it easier for them to reuse our device trees, relicense our
DTSI first under a GPL/X11 dual-license. Hopefully, the DTS will follow soon.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Carlo Caione <carlo.caione@gmail.com>
Cc: Chen-Yu Tsai <wens@csie.org>
Cc: David Lanzendörfer <david.lanzendoerfer@o2s.ch>
Cc: Emilio López <emilio@elopez.com.ar>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Oliver Schinagl <oliver@schinagl.nl>
Cc: Roman Byshko <rbyshko@gmail.com>
Cc: Stefan Roese <sr@denx.de>
---
 arch/arm/boot/dts/sun4i-a10.dtsi | 46 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 41 insertions(+), 5 deletions(-)

Comments

Hans de Goede Sept. 2, 2014, 8:06 p.m. UTC | #1
Hi,



On 09/02/2014 08:21 PM, Maxime Ripard wrote:
> The current GPL only licensing on the DTSI makes it very impractical for other
> software components licensed under another license.
>
> In order to make it easier for them to reuse our device trees, relicense our
> DTSI first under a GPL/X11 dual-license. Hopefully, the DTS will follow soon.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Carlo Caione <carlo.caione@gmail.com>
> Cc: Chen-Yu Tsai <wens@csie.org>
> Cc: David Lanzendörfer <david.lanzendoerfer@o2s.ch>
> Cc: Emilio López <emilio@elopez.com.ar>
> Cc: Hans de Goede <hdegoede@redhat.com>
> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> Cc: Oliver Schinagl <oliver@schinagl.nl>
> Cc: Roman Byshko <rbyshko@gmail.com>
> Cc: Stefan Roese <sr@denx.de>

Series is:

Acked-by: Hans de Goede <hdegoede@redhat.com>

Regards,

Hans

> ---
>   arch/arm/boot/dts/sun4i-a10.dtsi | 46 +++++++++++++++++++++++++++++++++++-----
>   1 file changed, 41 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
> index 380f914b226d..d12d36c470bc 100644
> --- a/arch/arm/boot/dts/sun4i-a10.dtsi
> +++ b/arch/arm/boot/dts/sun4i-a10.dtsi
> @@ -2,12 +2,48 @@
>    * Copyright 2012 Stefan Roese
>    * Stefan Roese <sr@denx.de>
>    *
> - * The code contained herein is licensed under the GNU General Public
> - * License. You may obtain a copy of the GNU General Public License
> - * Version 2 or later at the following locations:
> + * This file is dual-licensed: you can use it either under the terms
> + * of the GPL or the X11 license, at your option. Note that this dual
> + * licensing only applies to this file, and not this project as a
> + * whole.
>    *
> - * http://www.opensource.org/licenses/gpl-license.html
> - * http://www.gnu.org/copyleft/gpl.html
> + *  a) This library is free software; you can redistribute it and/or
> + *     modify it under the terms of the GNU General Public License as
> + *     published by the Free Software Foundation; either version 2 of the
> + *     License, or (at your option) any later version.
> + *
> + *     This library is distributed in the hope that it will be useful,
> + *     but WITHOUT ANY WARRANTY; without even the implied warranty of
> + *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + *     GNU General Public License for more details.
> + *
> + *     You should have received a copy of the GNU General Public
> + *     License along with this library; if not, write to the Free
> + *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
> + *     MA 02110-1301 USA
> + *
> + * Or, alternatively,
> + *
> + *  b) 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.
>    */
>
>   /include/ "skeleton.dtsi"
>
Olliver Schinagl Sept. 2, 2014, 8:12 p.m. UTC | #2
Hey all,


On 09/02/2014 10:06 PM, Hans de Goede wrote:
> Hi,
>
>
>
> On 09/02/2014 08:21 PM, Maxime Ripard wrote:
>> The current GPL only licensing on the DTSI makes it very impractical for other
>> software components licensed under another license.
>>
>> In order to make it easier for them to reuse our device trees, relicense our
>> DTSI first under a GPL/X11 dual-license. Hopefully, the DTS will follow soon.
>>
>> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
>> Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
>> Cc: Arnd Bergmann <arnd@arndb.de>
>> Cc: Carlo Caione <carlo.caione@gmail.com>
>> Cc: Chen-Yu Tsai <wens@csie.org>
>> Cc: David Lanzendörfer <david.lanzendoerfer@o2s.ch>
>> Cc: Emilio López <emilio@elopez.com.ar>
>> Cc: Hans de Goede <hdegoede@redhat.com>
>> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
>> Cc: Oliver Schinagl <oliver@schinagl.nl>
>> Cc: Roman Byshko <rbyshko@gmail.com>
>> Cc: Stefan Roese <sr@denx.de>
> Series is:
>
> Acked-by: Hans de Goede <hdegoede@redhat.com>
and
Acked-by: Olliver Schinagl <oliver@schinagl.nl>
>
> Regards,
>
> Hans
>
>> ---
>>    arch/arm/boot/dts/sun4i-a10.dtsi | 46 +++++++++++++++++++++++++++++++++++-----
>>    1 file changed, 41 insertions(+), 5 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
>> index 380f914b226d..d12d36c470bc 100644
>> --- a/arch/arm/boot/dts/sun4i-a10.dtsi
>> +++ b/arch/arm/boot/dts/sun4i-a10.dtsi
>> @@ -2,12 +2,48 @@
>>     * Copyright 2012 Stefan Roese
>>     * Stefan Roese <sr@denx.de>
>>     *
>> - * The code contained herein is licensed under the GNU General Public
>> - * License. You may obtain a copy of the GNU General Public License
>> - * Version 2 or later at the following locations:
>> + * This file is dual-licensed: you can use it either under the terms
>> + * of the GPL or the X11 license, at your option. Note that this dual
>> + * licensing only applies to this file, and not this project as a
>> + * whole.
>>     *
>> - * http://www.opensource.org/licenses/gpl-license.html
>> - * http://www.gnu.org/copyleft/gpl.html
>> + *  a) This library is free software; you can redistribute it and/or
>> + *     modify it under the terms of the GNU General Public License as
>> + *     published by the Free Software Foundation; either version 2 of the
>> + *     License, or (at your option) any later version.
>> + *
>> + *     This library is distributed in the hope that it will be useful,
>> + *     but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>> + *     GNU General Public License for more details.
>> + *
>> + *     You should have received a copy of the GNU General Public
>> + *     License along with this library; if not, write to the Free
>> + *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
>> + *     MA 02110-1301 USA
>> + *
>> + * Or, alternatively,
>> + *
>> + *  b) 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.
>>     */
>>
>>    /include/ "skeleton.dtsi"
>>
Chen-Yu Tsai Sept. 3, 2014, 1:50 a.m. UTC | #3
On Wed, Sep 3, 2014 at 4:12 AM, Olliver Schinagl <oliver@schinagl.nl> wrote:
> Hey all,
>
>
>
> On 09/02/2014 10:06 PM, Hans de Goede wrote:
>>
>> Hi,
>>
>>
>>
>> On 09/02/2014 08:21 PM, Maxime Ripard wrote:
>>>
>>> The current GPL only licensing on the DTSI makes it very impractical for
>>> other
>>> software components licensed under another license.
>>>
>>> In order to make it easier for them to reuse our device trees, relicense
>>> our
>>> DTSI first under a GPL/X11 dual-license. Hopefully, the DTS will follow
>>> soon.
>>>
>>> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
>>> Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
>>> Cc: Arnd Bergmann <arnd@arndb.de>
>>> Cc: Carlo Caione <carlo.caione@gmail.com>
>>> Cc: Chen-Yu Tsai <wens@csie.org>
>>> Cc: David Lanzendörfer <david.lanzendoerfer@o2s.ch>
>>> Cc: Emilio López <emilio@elopez.com.ar>
>>> Cc: Hans de Goede <hdegoede@redhat.com>
>>> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
>>> Cc: Oliver Schinagl <oliver@schinagl.nl>
>>> Cc: Roman Byshko <rbyshko@gmail.com>
>>> Cc: Stefan Roese <sr@denx.de>
>>
>> Series is:
>>
>> Acked-by: Hans de Goede <hdegoede@redhat.com>
>
> and
> Acked-by: Olliver Schinagl <oliver@schinagl.nl>

Acked-by: Chen-Yu Tsai <wens@csie.org>

>>> ---
>>>    arch/arm/boot/dts/sun4i-a10.dtsi | 46
>>> +++++++++++++++++++++++++++++++++++-----
>>>    1 file changed, 41 insertions(+), 5 deletions(-)
>>>
>>> diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi
>>> b/arch/arm/boot/dts/sun4i-a10.dtsi
>>> index 380f914b226d..d12d36c470bc 100644
>>> --- a/arch/arm/boot/dts/sun4i-a10.dtsi
>>> +++ b/arch/arm/boot/dts/sun4i-a10.dtsi
>>> @@ -2,12 +2,48 @@
>>>     * Copyright 2012 Stefan Roese
>>>     * Stefan Roese <sr@denx.de>
>>>     *
>>> - * The code contained herein is licensed under the GNU General Public
>>> - * License. You may obtain a copy of the GNU General Public License
>>> - * Version 2 or later at the following locations:
>>> + * This file is dual-licensed: you can use it either under the terms
>>> + * of the GPL or the X11 license, at your option. Note that this dual
>>> + * licensing only applies to this file, and not this project as a
>>> + * whole.
>>>     *
>>> - * http://www.opensource.org/licenses/gpl-license.html
>>> - * http://www.gnu.org/copyleft/gpl.html
>>> + *  a) This library is free software; you can redistribute it and/or
>>> + *     modify it under the terms of the GNU General Public License as
>>> + *     published by the Free Software Foundation; either version 2 of
>>> the
>>> + *     License, or (at your option) any later version.
>>> + *
>>> + *     This library is distributed in the hope that it will be useful,
>>> + *     but WITHOUT ANY WARRANTY; without even the implied warranty of
>>> + *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>>> + *     GNU General Public License for more details.
>>> + *
>>> + *     You should have received a copy of the GNU General Public
>>> + *     License along with this library; if not, write to the Free
>>> + *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
>>> + *     MA 02110-1301 USA
>>> + *
>>> + * Or, alternatively,
>>> + *
>>> + *  b) 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.
>>>     */
>>>
>>>    /include/ "skeleton.dtsi"
>>>
>
Stefan Roese Sept. 3, 2014, 5:51 a.m. UTC | #4
On 02.09.2014 20:21, Maxime Ripard wrote:
> The current GPL only licensing on the DTSI makes it very impractical for other
> software components licensed under another license.
>
> In order to make it easier for them to reuse our device trees, relicense our
> DTSI first under a GPL/X11 dual-license. Hopefully, the DTS will follow soon.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Carlo Caione <carlo.caione@gmail.com>
> Cc: Chen-Yu Tsai <wens@csie.org>
> Cc: David Lanzendörfer <david.lanzendoerfer@o2s.ch>
> Cc: Emilio López <emilio@elopez.com.ar>
> Cc: Hans de Goede <hdegoede@redhat.com>
> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> Cc: Oliver Schinagl <oliver@schinagl.nl>
> Cc: Roman Byshko <rbyshko@gmail.com>
> Cc: Stefan Roese <sr@denx.de>
> ---

For the whole series:

Acked-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan
Roman Byshko Sept. 3, 2014, 9:22 a.m. UTC | #5
On Tue, Sep 2, 2014 at 8:21 PM, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> The current GPL only licensing on the DTSI makes it very impractical for other
> software components licensed under another license.
>
> In order to make it easier for them to reuse our device trees, relicense our
> DTSI first under a GPL/X11 dual-license. Hopefully, the DTS will follow soon.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Carlo Caione <carlo.caione@gmail.com>
> Cc: Chen-Yu Tsai <wens@csie.org>
> Cc: David Lanzendörfer <david.lanzendoerfer@o2s.ch>
> Cc: Emilio López <emilio@elopez.com.ar>
> Cc: Hans de Goede <hdegoede@redhat.com>
> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> Cc: Oliver Schinagl <oliver@schinagl.nl>
> Cc: Roman Byshko <rbyshko@gmail.com>
> Cc: Stefan Roese <sr@denx.de>
> ---
>  arch/arm/boot/dts/sun4i-a10.dtsi | 46 +++++++++++++++++++++++++++++++++++-----
>  1 file changed, 41 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
> index 380f914b226d..d12d36c470bc 100644
> --- a/arch/arm/boot/dts/sun4i-a10.dtsi
> +++ b/arch/arm/boot/dts/sun4i-a10.dtsi
> @@ -2,12 +2,48 @@
>   * Copyright 2012 Stefan Roese
>   * Stefan Roese <sr@denx.de>
>   *
> - * The code contained herein is licensed under the GNU General Public
> - * License. You may obtain a copy of the GNU General Public License
> - * Version 2 or later at the following locations:
> + * This file is dual-licensed: you can use it either under the terms
> + * of the GPL or the X11 license, at your option. Note that this dual
> + * licensing only applies to this file, and not this project as a
> + * whole.
>   *
> - * http://www.opensource.org/licenses/gpl-license.html
> - * http://www.gnu.org/copyleft/gpl.html
> + *  a) This library is free software; you can redistribute it and/or
> + *     modify it under the terms of the GNU General Public License as
> + *     published by the Free Software Foundation; either version 2 of the
> + *     License, or (at your option) any later version.
> + *
> + *     This library is distributed in the hope that it will be useful,
> + *     but WITHOUT ANY WARRANTY; without even the implied warranty of
> + *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + *     GNU General Public License for more details.
> + *
> + *     You should have received a copy of the GNU General Public
> + *     License along with this library; if not, write to the Free
> + *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
> + *     MA 02110-1301 USA
> + *
> + * Or, alternatively,
> + *
> + *  b) 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.
>   */
>
>  /include/ "skeleton.dtsi"
> --
> 2.0.2
>

For the whole series

Acked-by: Roman Byshko <rbyshko@gmail.com>
Arnd Bergmann Sept. 3, 2014, 10:51 a.m. UTC | #6
On Tuesday 02 September 2014 20:21:05 Maxime Ripard wrote:
> The current GPL only licensing on the DTSI makes it very impractical for other
> software components licensed under another license.
> 
> In order to make it easier for them to reuse our device trees, relicense our
> DTSI first under a GPL/X11 dual-license. Hopefully, the DTS will follow soon.
> 
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Carlo Caione <carlo.caione@gmail.com>
> Cc: Chen-Yu Tsai <wens@csie.org>
> Cc: David Lanzendörfer <david.lanzendoerfer@o2s.ch>
> Cc: Emilio López <emilio@elopez.com.ar>
> Cc: Hans de Goede <hdegoede@redhat.com>
> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> Cc: Oliver Schinagl <oliver@schinagl.nl>
> Cc: Roman Byshko <rbyshko@gmail.com>
> Cc: Stefan Roese <sr@denx.de>

Whole series

Acked-by: Arnd Bergmann <arnd@arndb.de>
Boris Brezillon Sept. 3, 2014, 11:46 a.m. UTC | #7
On Tue,  2 Sep 2014 20:21:07 +0200
Maxime Ripard <maxime.ripard@free-electrons.com> wrote:

> The current GPL only licensing on the DTSI makes it very impractical for other
> software components licensed under another license.
> 
> In order to make it easier for them to reuse our device trees, relicense our
> DTSI first under a GPL/X11 dual-license. Hopefully, the DTS will follow soon.
> 

Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>

> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> Cc: Boris BREZILLON <boris.brezillon@free-electrons.com>
> Cc: Carlo Caione <carlo@caione.org>
> Cc: Chen-Yu Tsai <wens@csie.org>
> Cc: Hans de Goede <hdegoede@redhat.com>
> ---
>  arch/arm/boot/dts/sun6i-a31.dtsi | 46 +++++++++++++++++++++++++++++++++++-----
>  1 file changed, 41 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
> index 1c2ec913e650..eb686e78f225 100644
> --- a/arch/arm/boot/dts/sun6i-a31.dtsi
> +++ b/arch/arm/boot/dts/sun6i-a31.dtsi
> @@ -3,12 +3,48 @@
>   *
>   * Maxime Ripard <maxime.ripard@free-electrons.com>
>   *
> - * The code contained herein is licensed under the GNU General Public
> - * License. You may obtain a copy of the GNU General Public License
> - * Version 2 or later at the following locations:
> + * This file is dual-licensed: you can use it either under the terms
> + * of the GPL or the X11 license, at your option. Note that this dual
> + * licensing only applies to this file, and not this project as a
> + * whole.
>   *
> - * http://www.opensource.org/licenses/gpl-license.html
> - * http://www.gnu.org/copyleft/gpl.html
> + *  a) This library is free software; you can redistribute it and/or
> + *     modify it under the terms of the GNU General Public License as
> + *     published by the Free Software Foundation; either version 2 of the
> + *     License, or (at your option) any later version.
> + *
> + *     This library is distributed in the hope that it will be useful,
> + *     but WITHOUT ANY WARRANTY; without even the implied warranty of
> + *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + *     GNU General Public License for more details.
> + *
> + *     You should have received a copy of the GNU General Public
> + *     License along with this library; if not, write to the Free
> + *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
> + *     MA 02110-1301 USA
> + *
> + * Or, alternatively,
> + *
> + *  b) 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.
>   */
>  
>  /include/ "skeleton.dtsi"
Carlo Caione Sept. 3, 2014, 6:42 p.m. UTC | #8
On Tue, Sep 02, 2014 at 08:21:05PM +0200, Maxime Ripard wrote:
> The current GPL only licensing on the DTSI makes it very impractical for other
> software components licensed under another license.
> 
> In order to make it easier for them to reuse our device trees, relicense our
> DTSI first under a GPL/X11 dual-license. Hopefully, the DTS will follow soon.
> 
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Carlo Caione <carlo.caione@gmail.com>
> Cc: Chen-Yu Tsai <wens@csie.org>
> Cc: David Lanzendörfer <david.lanzendoerfer@o2s.ch>
> Cc: Emilio López <emilio@elopez.com.ar>
> Cc: Hans de Goede <hdegoede@redhat.com>
> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> Cc: Oliver Schinagl <oliver@schinagl.nl>
> Cc: Roman Byshko <rbyshko@gmail.com>
> Cc: Stefan Roese <sr@denx.de>
> ---
>  arch/arm/boot/dts/sun4i-a10.dtsi | 46 +++++++++++++++++++++++++++++++++++-----
>  1 file changed, 41 insertions(+), 5 deletions(-)

Acked-by: Carlo Caione <carlo@caione.org>
Carlo Caione Sept. 4, 2014, 7:21 a.m. UTC | #9
On Wed, Sep 03, 2014 at 08:42:50PM +0200, Carlo Caione wrote:
> On Tue, Sep 02, 2014 at 08:21:05PM +0200, Maxime Ripard wrote:
> > The current GPL only licensing on the DTSI makes it very impractical for other
> > software components licensed under another license.
> > 
> > In order to make it easier for them to reuse our device trees, relicense our
> > DTSI first under a GPL/X11 dual-license. Hopefully, the DTS will follow soon.
> > 
> > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> > Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> > Cc: Arnd Bergmann <arnd@arndb.de>
> > Cc: Carlo Caione <carlo.caione@gmail.com>
> > Cc: Chen-Yu Tsai <wens@csie.org>
> > Cc: David Lanzendörfer <david.lanzendoerfer@o2s.ch>
> > Cc: Emilio López <emilio@elopez.com.ar>
> > Cc: Hans de Goede <hdegoede@redhat.com>
> > Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> > Cc: Oliver Schinagl <oliver@schinagl.nl>
> > Cc: Roman Byshko <rbyshko@gmail.com>
> > Cc: Stefan Roese <sr@denx.de>
> > ---
> >  arch/arm/boot/dts/sun4i-a10.dtsi | 46 +++++++++++++++++++++++++++++++++++-----
> >  1 file changed, 41 insertions(+), 5 deletions(-)
> 
> Acked-by: Carlo Caione <carlo@caione.org> 

The ACK is intended for the whole series :)
Emilio López Sept. 6, 2014, 4:50 p.m. UTC | #10
Hi Maxime,

El 02/09/14 a las 15:21, Maxime Ripard escibió:
> The current GPL only licensing on the DTSI makes it very impractical for other
> software components licensed under another license.
>
> In order to make it easier for them to reuse our device trees, relicense our
> DTSI first under a GPL/X11 dual-license. Hopefully, the DTS will follow soon.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

For this whole series (and any future one doing this same kind of dual 
licensing on sunxi dts/dtsi where I may be involved),

Acked-by: Emilio López <emilio@elopez.com.ar>

Cheers,

Emilio
David Lanzendörfer Sept. 7, 2014, 1:04 a.m. UTC | #11
If it would matter you could add as well:
	Acked-by: David Lanzendörfer <david.lanzendoerfer@o2s.ch>

cheers
David Lanzendörfer Sept. 7, 2014, 1:05 a.m. UTC | #12
> For this whole series (and any future one doing this same kind of dual
> licensing on sunxi dts/dtsi where I may be involved),
> 
> Acked-by: Emilio López <emilio@elopez.com.ar>
Dito.
Acked-by: David Lanzendörfer <david.lanzendoerfer@o2s.ch>
Maxime Ripard Sept. 7, 2014, 3:47 p.m. UTC | #13
On Sun, Sep 07, 2014 at 03:04:37AM +0200, David Lanzendörfer wrote:
> If it would matter you could add as well:
> 	Acked-by: David Lanzendörfer <david.lanzendoerfer@o2s.ch>

It does, you made some edit to the DT, so you are part of the
copyright owners. And changing the license agreement of all copyrights
owner.

Thanks!
Maxime
Maxime Ripard Sept. 7, 2014, 3:49 p.m. UTC | #14
On Tue, Sep 02, 2014 at 08:21:05PM +0200, Maxime Ripard wrote:
> The current GPL only licensing on the DTSI makes it very impractical for other
> software components licensed under another license.
> 
> In order to make it easier for them to reuse our device trees, relicense our
> DTSI first under a GPL/X11 dual-license. Hopefully, the DTS will follow soon.
> 
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Carlo Caione <carlo.caione@gmail.com>
> Cc: Chen-Yu Tsai <wens@csie.org>
> Cc: David Lanzendörfer <david.lanzendoerfer@o2s.ch>
> Cc: Emilio López <emilio@elopez.com.ar>
> Cc: Hans de Goede <hdegoede@redhat.com>
> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> Cc: Oliver Schinagl <oliver@schinagl.nl>
> Cc: Roman Byshko <rbyshko@gmail.com>
> Cc: Stefan Roese <sr@denx.de>

Ok, so I just merged the patches 3 to 5 since we have everyone's
approval, and I'll merge the patches 1-2 once and if Lorenzo give his.

Thanks!
Maxime
Maxime Ripard Sept. 19, 2014, 10:38 a.m. UTC | #15
Hi Lorenzo,

On Sun, Sep 07, 2014 at 05:49:07PM +0200, Maxime Ripard wrote:
> On Tue, Sep 02, 2014 at 08:21:05PM +0200, Maxime Ripard wrote:
> > The current GPL only licensing on the DTSI makes it very impractical for other
> > software components licensed under another license.
> > 
> > In order to make it easier for them to reuse our device trees, relicense our
> > DTSI first under a GPL/X11 dual-license. Hopefully, the DTS will follow soon.
> > 
> > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> > Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> > Cc: Arnd Bergmann <arnd@arndb.de>
> > Cc: Carlo Caione <carlo.caione@gmail.com>
> > Cc: Chen-Yu Tsai <wens@csie.org>
> > Cc: David Lanzendörfer <david.lanzendoerfer@o2s.ch>
> > Cc: Emilio López <emilio@elopez.com.ar>
> > Cc: Hans de Goede <hdegoede@redhat.com>
> > Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> > Cc: Oliver Schinagl <oliver@schinagl.nl>
> > Cc: Roman Byshko <rbyshko@gmail.com>
> > Cc: Stefan Roese <sr@denx.de>
> 
> Ok, so I just merged the patches 3 to 5 since we have everyone's
> approval, and I'll merge the patches 1-2 once and if Lorenzo give his.

Any opinion on this?

Maxime
Maxime Ripard Oct. 6, 2014, 8:38 a.m. UTC | #16
Hi Lorenzo,

On Tue, Sep 02, 2014 at 08:21:05PM +0200, Maxime Ripard wrote:
> The current GPL only licensing on the DTSI makes it very impractical for other
> software components licensed under another license.
> 
> In order to make it easier for them to reuse our device trees, relicense our
> DTSI first under a GPL/X11 dual-license. Hopefully, the DTS will follow soon.
> 
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Carlo Caione <carlo.caione@gmail.com>
> Cc: Chen-Yu Tsai <wens@csie.org>
> Cc: David Lanzendörfer <david.lanzendoerfer@o2s.ch>
> Cc: Emilio López <emilio@elopez.com.ar>
> Cc: Hans de Goede <hdegoede@redhat.com>
> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> Cc: Oliver Schinagl <oliver@schinagl.nl>
> Cc: Roman Byshko <rbyshko@gmail.com>
> Cc: Stefan Roese <sr@denx.de>

We need your approval for this license change, otherwise we won't be
able to merge it.

What's your feeling about this?

Thanks,
Maxime
Lorenzo Pieralisi Oct. 6, 2014, 10:21 a.m. UTC | #17
Hi Maxime,

sorry for the delay in repling.

On Mon, Oct 06, 2014 at 09:38:21AM +0100, Maxime Ripard wrote:
> Hi Lorenzo,
> 
> On Tue, Sep 02, 2014 at 08:21:05PM +0200, Maxime Ripard wrote:
> > The current GPL only licensing on the DTSI makes it very impractical for other
> > software components licensed under another license.
> > 
> > In order to make it easier for them to reuse our device trees, relicense our
> > DTSI first under a GPL/X11 dual-license. Hopefully, the DTS will follow soon.
> > 
> > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> > Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> > Cc: Arnd Bergmann <arnd@arndb.de>
> > Cc: Carlo Caione <carlo.caione@gmail.com>
> > Cc: Chen-Yu Tsai <wens@csie.org>
> > Cc: David Lanzend?rfer <david.lanzendoerfer@o2s.ch>
> > Cc: Emilio L?pez <emilio@elopez.com.ar>
> > Cc: Hans de Goede <hdegoede@redhat.com>
> > Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> > Cc: Oliver Schinagl <oliver@schinagl.nl>
> > Cc: Roman Byshko <rbyshko@gmail.com>
> > Cc: Stefan Roese <sr@denx.de>
> 
> We need your approval for this license change, otherwise we won't be
> able to merge it.
> 
> What's your feeling about this?

My feeling does not matter much here, I have to ask for approval and to
be honest I am not in a position to provide you with a firm date/time for
this to happen, I will try to get an answer asap.

Thanks,
Lorenzo
Maxime Ripard Oct. 7, 2014, 8:13 p.m. UTC | #18
Hi Lorenzo,

On Mon, Oct 06, 2014 at 11:21:29AM +0100, Lorenzo Pieralisi wrote:
> Hi Maxime,
> 
> sorry for the delay in repling.
> 
> On Mon, Oct 06, 2014 at 09:38:21AM +0100, Maxime Ripard wrote:
> > Hi Lorenzo,
> > 
> > On Tue, Sep 02, 2014 at 08:21:05PM +0200, Maxime Ripard wrote:
> > > The current GPL only licensing on the DTSI makes it very impractical for other
> > > software components licensed under another license.
> > > 
> > > In order to make it easier for them to reuse our device trees, relicense our
> > > DTSI first under a GPL/X11 dual-license. Hopefully, the DTS will follow soon.
> > > 
> > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> > > Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> > > Cc: Arnd Bergmann <arnd@arndb.de>
> > > Cc: Carlo Caione <carlo.caione@gmail.com>
> > > Cc: Chen-Yu Tsai <wens@csie.org>
> > > Cc: David Lanzend?rfer <david.lanzendoerfer@o2s.ch>
> > > Cc: Emilio L?pez <emilio@elopez.com.ar>
> > > Cc: Hans de Goede <hdegoede@redhat.com>
> > > Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> > > Cc: Oliver Schinagl <oliver@schinagl.nl>
> > > Cc: Roman Byshko <rbyshko@gmail.com>
> > > Cc: Stefan Roese <sr@denx.de>
> > 
> > We need your approval for this license change, otherwise we won't be
> > able to merge it.
> > 
> > What's your feeling about this?
> 
> My feeling does not matter much here, I have to ask for approval and to
> be honest I am not in a position to provide you with a firm date/time for
> this to happen, I will try to get an answer asap.

Thanks for the update.

Let us know when you have such an answer :)

Thanks!
Maxime
Maxime Ripard Dec. 9, 2014, 10:04 a.m. UTC | #19
Hi Lorenzo,

On Mon, Oct 06, 2014 at 11:21:29AM +0100, Lorenzo Pieralisi wrote:
> Hi Maxime,
> 
> sorry for the delay in repling.
> 
> On Mon, Oct 06, 2014 at 09:38:21AM +0100, Maxime Ripard wrote:
> > Hi Lorenzo,
> > 
> > On Tue, Sep 02, 2014 at 08:21:05PM +0200, Maxime Ripard wrote:
> > > The current GPL only licensing on the DTSI makes it very impractical for other
> > > software components licensed under another license.
> > > 
> > > In order to make it easier for them to reuse our device trees, relicense our
> > > DTSI first under a GPL/X11 dual-license. Hopefully, the DTS will follow soon.
> > > 
> > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> > > Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> > > Cc: Arnd Bergmann <arnd@arndb.de>
> > > Cc: Carlo Caione <carlo.caione@gmail.com>
> > > Cc: Chen-Yu Tsai <wens@csie.org>
> > > Cc: David Lanzend?rfer <david.lanzendoerfer@o2s.ch>
> > > Cc: Emilio L?pez <emilio@elopez.com.ar>
> > > Cc: Hans de Goede <hdegoede@redhat.com>
> > > Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> > > Cc: Oliver Schinagl <oliver@schinagl.nl>
> > > Cc: Roman Byshko <rbyshko@gmail.com>
> > > Cc: Stefan Roese <sr@denx.de>
> > 
> > We need your approval for this license change, otherwise we won't be
> > able to merge it.
> > 
> > What's your feeling about this?
> 
> My feeling does not matter much here, I have to ask for approval and to
> be honest I am not in a position to provide you with a firm date/time for
> this to happen, I will try to get an answer asap.

Do you have any update on this?

Thanks,
Maxime
Maxime Ripard Jan. 26, 2015, 10:53 a.m. UTC | #20
On Tue, Dec 09, 2014 at 11:04:24AM +0100, Maxime Ripard wrote:
> Hi Lorenzo,
> 
> On Mon, Oct 06, 2014 at 11:21:29AM +0100, Lorenzo Pieralisi wrote:
> > Hi Maxime,
> > 
> > sorry for the delay in repling.
> > 
> > On Mon, Oct 06, 2014 at 09:38:21AM +0100, Maxime Ripard wrote:
> > > Hi Lorenzo,
> > > 
> > > On Tue, Sep 02, 2014 at 08:21:05PM +0200, Maxime Ripard wrote:
> > > > The current GPL only licensing on the DTSI makes it very impractical for other
> > > > software components licensed under another license.
> > > > 
> > > > In order to make it easier for them to reuse our device trees, relicense our
> > > > DTSI first under a GPL/X11 dual-license. Hopefully, the DTS will follow soon.
> > > > 
> > > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> > > > Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> > > > Cc: Arnd Bergmann <arnd@arndb.de>
> > > > Cc: Carlo Caione <carlo.caione@gmail.com>
> > > > Cc: Chen-Yu Tsai <wens@csie.org>
> > > > Cc: David Lanzend?rfer <david.lanzendoerfer@o2s.ch>
> > > > Cc: Emilio L?pez <emilio@elopez.com.ar>
> > > > Cc: Hans de Goede <hdegoede@redhat.com>
> > > > Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> > > > Cc: Oliver Schinagl <oliver@schinagl.nl>
> > > > Cc: Roman Byshko <rbyshko@gmail.com>
> > > > Cc: Stefan Roese <sr@denx.de>
> > > 
> > > We need your approval for this license change, otherwise we won't be
> > > able to merge it.
> > > 
> > > What's your feeling about this?
> > 
> > My feeling does not matter much here, I have to ask for approval and to
> > be honest I am not in a position to provide you with a firm date/time for
> > this to happen, I will try to get an answer asap.
> 
> Do you have any update on this?

Ping?
Lorenzo Pieralisi Jan. 26, 2015, 11:08 a.m. UTC | #21
On Tue, Sep 02, 2014 at 07:21:05PM +0100, Maxime Ripard wrote:
> The current GPL only licensing on the DTSI makes it very impractical for other
> software components licensed under another license.
> 
> In order to make it easier for them to reuse our device trees, relicense our
> DTSI first under a GPL/X11 dual-license. Hopefully, the DTS will follow soon.
> 
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Carlo Caione <carlo.caione@gmail.com>
> Cc: Chen-Yu Tsai <wens@csie.org>
> Cc: David Lanzend?rfer <david.lanzendoerfer@o2s.ch>
> Cc: Emilio L?pez <emilio@elopez.com.ar>
> Cc: Hans de Goede <hdegoede@redhat.com>
> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> Cc: Oliver Schinagl <oliver@schinagl.nl>
> Cc: Roman Byshko <rbyshko@gmail.com>
> Cc: Stefan Roese <sr@denx.de>

Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>

> ---
>  arch/arm/boot/dts/sun4i-a10.dtsi | 46 +++++++++++++++++++++++++++++++++++-----
>  1 file changed, 41 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
> index 380f914b226d..d12d36c470bc 100644
> --- a/arch/arm/boot/dts/sun4i-a10.dtsi
> +++ b/arch/arm/boot/dts/sun4i-a10.dtsi
> @@ -2,12 +2,48 @@
>   * Copyright 2012 Stefan Roese
>   * Stefan Roese <sr@denx.de>
>   *
> - * The code contained herein is licensed under the GNU General Public
> - * License. You may obtain a copy of the GNU General Public License
> - * Version 2 or later at the following locations:
> + * This file is dual-licensed: you can use it either under the terms
> + * of the GPL or the X11 license, at your option. Note that this dual
> + * licensing only applies to this file, and not this project as a
> + * whole.
>   *
> - * http://www.opensource.org/licenses/gpl-license.html
> - * http://www.gnu.org/copyleft/gpl.html
> + *  a) This library is free software; you can redistribute it and/or
> + *     modify it under the terms of the GNU General Public License as
> + *     published by the Free Software Foundation; either version 2 of the
> + *     License, or (at your option) any later version.
> + *
> + *     This library is distributed in the hope that it will be useful,
> + *     but WITHOUT ANY WARRANTY; without even the implied warranty of
> + *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + *     GNU General Public License for more details.
> + *
> + *     You should have received a copy of the GNU General Public
> + *     License along with this library; if not, write to the Free
> + *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
> + *     MA 02110-1301 USA
> + *
> + * Or, alternatively,
> + *
> + *  b) 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.
>   */
>  
>  /include/ "skeleton.dtsi"
> -- 
> 2.0.2
> 
>
diff mbox

Patch

diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
index 380f914b226d..d12d36c470bc 100644
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
@@ -2,12 +2,48 @@ 
  * Copyright 2012 Stefan Roese
  * Stefan Roese <sr@denx.de>
  *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
  *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ *  a) This library is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This library is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public
+ *     License along with this library; if not, write to the Free
+ *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ *     MA 02110-1301 USA
+ *
+ * Or, alternatively,
+ *
+ *  b) 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.
  */
 
 /include/ "skeleton.dtsi"