From mboxrd@z Thu Jan 1 00:00:00 1970 From: hl Subject: Re: [PATCH 4/8] ARM: dts: rockchip: relicense rk3288.dtsi under GPLv2/X11 Date: Fri, 15 May 2015 08:50:33 +0800 Message-ID: <555542D9.3030909@rock-chips.com> References: <1425665046-22927-1-git-send-email-heiko@sntech.de> <1425665046-22927-5-git-send-email-heiko@sntech.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1425665046-22927-5-git-send-email-heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+glpar-linux-rockchip=m.gmane.org-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org To: Heiko Stuebner , linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org Cc: Addy Ke , Roger Chen , Olof Johansson , Sonny Rao , Daniel Lezcano , Kever Yang , Daniel Kurtz , Doug Anderson , linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, Yunzhi Li , Caesar Wang , Chris Zhong , Andy Yan , Jianqun Xu List-Id: linux-rockchip.vger.kernel.org Ck9uIDIwMTXlubQwM+aciDA35pelIDAyOjA0LCBIZWlrbyBTdHVlYm5lciB3cm90ZToKPiBHUEx2 Mi1vbmx5IGRldmljZXRyZWVzIG1ha2UgcmV1c2UgZGlmZmljdWx0IGZvciBzb2Z0d2FyZSBjb21w b25lbnRzIGxpY2Vuc2VkCj4gdW5kZXIgYSBkaWZmZXJlbnQgbGljZW5zZS4KPgo+IFRoZSBjb25z ZW5zdXMgaXMgdGhhdCBhIEdQTC9YMTEgZHVhbC1saWNlbnNlIHNob3VsZCBhbGxvdyBhbGwgbmVj ZXNzYXJ5IHVzZXMsCj4gc28gcmVsaWNlbnNlIHRoZSByazMyODguZHRzaSB0byB0aGlzIGNvbWJp bmF0aW9uLgo+Cj4gQ0NzIHdlcmUgYXF1aXJlZCBieSBnaXQgc2hvcnRsb2cgLXNuZSBzbyBpdCBz aG91bGQndmUgaG9wZWZ1bGx5IGNhdGNoZWQKPiBldmVyeSBjb250cmlidXRvci4KPgo+IFNpZ25l ZC1vZmYtYnk6IEhlaWtvIFN0dWVibmVyIDxoZWlrb0BzbnRlY2guZGU+Cj4gQ2M6IEtldmVyIFlh bmcgPGtldmVyLnlhbmdAcm9jay1jaGlwcy5jb20+Cj4gQ2M6IERvdWcgQW5kZXJzb24gPGRpYW5k ZXJzQGNocm9taXVtLm9yZz4KPiBDYzogQWRkeSBLZSA8YWRkeS5rZUByb2NrLWNoaXBzLmNvbT4K PiBDYzogRGFuaWVsIEt1cnR6IDxkamt1cnR6QGNocm9taXVtLm9yZz4KPiBDYzogQW5keSBZYW4g PGFuZHkueWFuQHJvY2stY2hpcHMuY29tPgo+IENjOiBDYWVzYXIgV2FuZyA8Y2Flc2FyLndhbmdA cm9jay1jaGlwcy5jb20+Cj4gQ2M6IENocmlzIFpob25nIDx6eXdAcm9jay1jaGlwcy5jb20+Cj4g Q2M6IERhbmllbCBMZXpjYW5vIDxkYW5pZWwubGV6Y2Fub0BsaW5hcm8ub3JnPgo+IENjOiBKaWFu cXVuIFh1PGpheS54dUByb2NrLWNoaXBzLmNvbT4KPiBDYzogUm9nZXIgQ2hlbiA8cm9nZXIuY2hl bkByb2NrLWNoaXBzLmNvbT4KPiBDYzogU29ubnkgUmFvIDxzb25ueXJhb0BjaHJvbWl1bS5vcmc+ Cj4gQ2M6IFl1bnpoaSBMaSA8bHl6QHJvY2stY2hpcHMuY29tPgo+IENjOiBodWFuZyBsaW4gPGhs QHJvY2stY2hpcHMuY29tPgo+Cj4gTm90IHN1cmUgaWYgYW4gQWNrIGZvciBhIHNpbXBsZSByZXZl cnQgaXMgbmVjZXNzYXJ5LCBidXQgaW5jbHVkZWQgYW55d2F5Cj4gQ2M6IE9sb2YgSm9oYW5zc29u IDxvbG9mQGxpeG9tLm5ldD4KPiAtLS0KPiBJJ20gaG9waW5nIHRvIGdldCBBY2tlZC1ieSB0YWdz IGZyb20gdGhlIHBlb3BsZSBpbiB0aGUgQ2MtbGlzdC4KPgo+ICAgYXJjaC9hcm0vYm9vdC9kdHMv cmszMjg4LmR0c2kgfCA0NCArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0t LS0tCj4gICAxIGZpbGUgY2hhbmdlZCwgMzYgaW5zZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMoLSkK Pgo+IGRpZmYgLS1naXQgYS9hcmNoL2FybS9ib290L2R0cy9yazMyODguZHRzaSBiL2FyY2gvYXJt L2Jvb3QvZHRzL3JrMzI4OC5kdHNpCj4gaW5kZXggMmMyOWEzZS4uMzVhMDZhNSAxMDA2NDQKPiAt LS0gYS9hcmNoL2FybS9ib290L2R0cy9yazMyODguZHRzaQo+ICsrKyBiL2FyY2gvYXJtL2Jvb3Qv ZHRzL3JrMzI4OC5kdHNpCj4gQEAgLTEsMTMgKzEsNDEgQEAKPiAgIC8qCj4gLSAqIFRoaXMgcHJv Z3JhbSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IgbW9k aWZ5Cj4gLSAqIGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIEdlbmVyYWwgUHVibGljIExp Y2Vuc2UgYXMgcHVibGlzaGVkIGJ5Cj4gLSAqIHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb247 IGVpdGhlciB2ZXJzaW9uIDIgb2YgdGhlIExpY2Vuc2UsIG9yCj4gLSAqIChhdCB5b3VyIG9wdGlv bikgYW55IGxhdGVyIHZlcnNpb24uCj4gKyAqIFRoaXMgZmlsZSBpcyBkdWFsLWxpY2Vuc2VkOiB5 b3UgY2FuIHVzZSBpdCBlaXRoZXIgdW5kZXIgdGhlIHRlcm1zCj4gKyAqIG9mIHRoZSBHUEwgb3Ig dGhlIFgxMSBsaWNlbnNlLCBhdCB5b3VyIG9wdGlvbi4gTm90ZSB0aGF0IHRoaXMgZHVhbAo+ICsg KiBsaWNlbnNpbmcgb25seSBhcHBsaWVzIHRvIHRoaXMgZmlsZSwgYW5kIG5vdCB0aGlzIHByb2pl Y3QgYXMgYQo+ICsgKiB3aG9sZS4KPiAgICAqCj4gLSAqIFRoaXMgcHJvZ3JhbSBpcyBkaXN0cmli dXRlZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLAo+IC0gKiBidXQgV0lUSE9V VCBBTlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50eSBvZgo+IC0g KiBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UuICBT ZWUgdGhlCj4gLSAqIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZvciBtb3JlIGRldGFpbHMu Cj4gKyAqICBhKSBUaGlzIGZpbGUgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1 dGUgaXQgYW5kL29yCj4gKyAqICAgICBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBH TlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBhcwo+ICsgKiAgICAgcHVibGlzaGVkIGJ5IHRoZSBG cmVlIFNvZnR3YXJlIEZvdW5kYXRpb247IGVpdGhlciB2ZXJzaW9uIDIgb2YgdGhlCj4gKyAqICAg ICBMaWNlbnNlLCBvciAoYXQgeW91ciBvcHRpb24pIGFueSBsYXRlciB2ZXJzaW9uLgo+ICsgKgo+ ICsgKiAgICAgVGhpcyBmaWxlIGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRoYXQgaXQgd2ls bCBiZSB1c2VmdWwsCj4gKyAqICAgICBidXQgV0lUSE9VVCBBTlkgV0FSUkFOVFk7IHdpdGhvdXQg ZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50eSBvZgo+ICsgKiAgICAgTUVSQ0hBTlRBQklMSVRZIG9y IEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFLiAgU2VlIHRoZQo+ICsgKiAgICAgR05V IEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9yIG1vcmUgZGV0YWlscy4KPiArICoKPiArICogT3Is IGFsdGVybmF0aXZlbHksCj4gKyAqCj4gKyAqICBiKSBQZXJtaXNzaW9uIGlzIGhlcmVieSBncmFu dGVkLCBmcmVlIG9mIGNoYXJnZSwgdG8gYW55IHBlcnNvbgo+ICsgKiAgICAgb2J0YWluaW5nIGEg Y29weSBvZiB0aGlzIHNvZnR3YXJlIGFuZCBhc3NvY2lhdGVkIGRvY3VtZW50YXRpb24KPiArICog ICAgIGZpbGVzICh0aGUgIlNvZnR3YXJlIiksIHRvIGRlYWwgaW4gdGhlIFNvZnR3YXJlIHdpdGhv dXQKPiArICogICAgIHJlc3RyaWN0aW9uLCBpbmNsdWRpbmcgd2l0aG91dCBsaW1pdGF0aW9uIHRo ZSByaWdodHMgdG8gdXNlLAo+ICsgKiAgICAgY29weSwgbW9kaWZ5LCBtZXJnZSwgcHVibGlzaCwg ZGlzdHJpYnV0ZSwgc3VibGljZW5zZSwgYW5kL29yCj4gKyAqICAgICBzZWxsIGNvcGllcyBvZiB0 aGUgU29mdHdhcmUsIGFuZCB0byBwZXJtaXQgcGVyc29ucyB0byB3aG9tIHRoZQo+ICsgKiAgICAg U29mdHdhcmUgaXMgZnVybmlzaGVkIHRvIGRvIHNvLCBzdWJqZWN0IHRvIHRoZSBmb2xsb3dpbmcK PiArICogICAgIGNvbmRpdGlvbnM6Cj4gKyAqCj4gKyAqICAgICBUaGUgYWJvdmUgY29weXJpZ2h0 IG5vdGljZSBhbmQgdGhpcyBwZXJtaXNzaW9uIG5vdGljZSBzaGFsbCBiZQo+ICsgKiAgICAgaW5j bHVkZWQgaW4gYWxsIGNvcGllcyBvciBzdWJzdGFudGlhbCBwb3J0aW9ucyBvZiB0aGUgU29mdHdh cmUuCj4gKyAqCj4gKyAqICAgICBUSEUgU09GVFdBUkUgSVMgUFJPVklERUQgIkFTIElTIiwgV0lU SE9VVCBXQVJSQU5UWSBPRiBBTlkgS0lORCwKPiArICogICAgIEVYUFJFU1MgT1IgSU1QTElFRCwg SU5DTFVESU5HIEJVVCBOT1QgTElNSVRFRCBUTyBUSEUgV0FSUkFOVElFUwo+ICsgKiAgICAgT0Yg TUVSQ0hBTlRBQklMSVRZLCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBTkQKPiAr ICogICAgIE5PTklORlJJTkdFTUVOVC4gSU4gTk8gRVZFTlQgU0hBTEwgVEhFIEFVVEhPUlMgT1Ig Q09QWVJJR0hUCj4gKyAqICAgICBIT0xERVJTIEJFIExJQUJMRSBGT1IgQU5ZIENMQUlNLCBEQU1B R0VTIE9SIE9USEVSIExJQUJJTElUWSwKPiArICogICAgIFdIRVRIRVIgSU4gQU4gQUNUSU9OIE9G IENPTlRSQUNULCBUT1JUIE9SIE9USEVSV0lTRSwgQVJJU0lORwo+ICsgKiAgICAgRlJPTSwgT1VU IE9GIE9SIElOIENPTk5FQ1RJT04gV0lUSCBUSEUgU09GVFdBUkUgT1IgVEhFIFVTRSBPUgo+ICsg KiAgICAgT1RIRVIgREVBTElOR1MgSU4gVEhFIFNPRlRXQVJFLgo+ICAgICovCj4gICAKPiAgICNp bmNsdWRlIDxkdC1iaW5kaW5ncy9ncGlvL2dwaW8uaD4KQWNrZWQtYnk6IExpbiBIdWFuZyA8aGxA cm9jay1jaGlwcy5jb20+CgotLSAK6buE5p6XCuemj+W3nueRnuiKr+W+rueUteWtkOaciemZkOWF rOWPuApGdXpob3UgUm9ja2NoaXAgRWxlY3Ryb25pY3MgQ28uTHRkCuemj+W7uuecgeemj+W3nuW4 gumTnOebmOi3r+i9r+S7tuWkp+mBkzg55Y+36L2v5Lu25ZutQeWMujIx5Y+35qW8KDM1MDAwMykK QWRkcjpOby4yMSBCdWlsZGluZywgQSBEaXN0cmljdCwgTm8uODksIHNvZnR3YXJlIEJvdWxldmFy ZCBGdXpob3UsIEZ1amlhbixQUkMKRW1haWw6aGxAcm9jay1jaGlwcy5jb20KVGVsOis4Ni01OTEt ODM5OTE5MDYvMDcKICAKKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgrkv53lr4bmj5Dn pLrvvJrmnKzpgq7ku7blj4rlhbbpmYTku7blkKvmnInmnLrlr4bkv6Hmga/vvIzku4Xlj5HpgIHn u5nmnKzpgq7ku7bmiYDmjIfnibnlrprmlLbku7bkurrjgILoi6XpnZ7or6XnibnlrprmlLbku7bk urrvvIzor7cK5Yu/5aSN5Yi244CBIOS9v+eUqOaIluaKq+mcsuacrOmCruS7tueahOS7u+S9leWG heWuueOAguiLpeivr+aUtuacrOmCruS7tu+8jOivt+S7juezu+e7n+S4reawuOS5heaAp+WIoOmZ pOacrOmCruS7tuWPiuaJgOaciemZhOS7tu+8jArlubbku6Xlm57lpI3pgq7ku7bmiJblhbbku5bm lrnlvI/ljbPliLvlkYrnn6Xlj5Hku7bkurrjgILnpo/lt57nkZ7oiq/lvq7nlLXlrZDmnInpmZDl hazlj7jmi6XmnInmnKzpgq7ku7bkv6Hmga/nmoTokZfkvZzmnYPlj4rop6Pph4oK5p2D77yM56aB 5q2i5Lu75L2V5pyq57uP5o6I5p2D6K645Y+v55qE5L615p2D6KGM5Li644CCCiAgCklNUE9SVEFO VCBOT1RJQ0U6IFRoaXMgZW1haWwgaXMgZnJvbSBGdXpob3UgUm9ja2NoaXAgRWxlY3Ryb25pY3Mg Q28uLCBMdGQgLlRoZSBjb250ZW50cwpvZiB0aGlzIGVtYWlsIGFuZCBhbnkgYXR0YWNobWVudHMg bWF5IGNvbnRhaW4gaW5mb3JtYXRpb24gdGhhdCBpcyBwcml2aWxlZ2VkLCBjb25maWRlbnRpYWwK YW5kL29yIGV4ZW1wdCBmcm9tIGRpc2Nsb3N1cmUgdW5kZXIgYXBwbGljYWJsZSBsYXcgYW5kIHJl bGV2YW50IE5EQS4gSWYgeW91IGFyZSBub3QgdGhlCmludGVuZGVkIHJlY2lwaWVudCwgeW91IGFy ZSBoZXJlYnkgbm90aWZpZWQgdGhhdCBhbnkgZGlzY2xvc3VyZSwgY29weWluZywgZGlzdHJpYnV0 aW9uLApvciB1c2Ugb2YgdGhlIGluZm9ybWF0aW9uIGlzIFNUUklDVExZIFBST0hJQklURUQuIFBs ZWFzZSBpbW1lZGlhdGVseSBjb250YWN0IHRoZSBzZW5kZXIKYXMgc29vbiBhcyBwb3NzaWJsZSBh bmQgZGVzdHJveSB0aGUgbWF0ZXJpYWwgaW4gaXRzIGVudGlyZXR5IGluIGFueSBmb3JtYXQuIFRo YW5rIHlvdS4KKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpMaW51eC1yb2NrY2hpcCBtYWlsaW5nIGxpc3QKTGlu dXgtcm9ja2NoaXBAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LXJvY2tjaGlwCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: hl@rock-chips.com (hl) Date: Fri, 15 May 2015 08:50:33 +0800 Subject: [PATCH 4/8] ARM: dts: rockchip: relicense rk3288.dtsi under GPLv2/X11 In-Reply-To: <1425665046-22927-5-git-send-email-heiko@sntech.de> References: <1425665046-22927-1-git-send-email-heiko@sntech.de> <1425665046-22927-5-git-send-email-heiko@sntech.de> Message-ID: <555542D9.3030909@rock-chips.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 2015?03?07? 02:04, Heiko Stuebner wrote: > GPLv2-only devicetrees make reuse difficult for software components licensed > under a different license. > > The consensus is that a GPL/X11 dual-license should allow all necessary uses, > so relicense the rk3288.dtsi to this combination. > > CCs were aquired by git shortlog -sne so it should've hopefully catched > every contributor. > > Signed-off-by: Heiko Stuebner > Cc: Kever Yang > Cc: Doug Anderson > Cc: Addy Ke > Cc: Daniel Kurtz > Cc: Andy Yan > Cc: Caesar Wang > Cc: Chris Zhong > Cc: Daniel Lezcano > Cc: Jianqun Xu > Cc: Roger Chen > Cc: Sonny Rao > Cc: Yunzhi Li > Cc: huang lin > > Not sure if an Ack for a simple revert is necessary, but included anyway > Cc: Olof Johansson > --- > I'm hoping to get Acked-by tags from the people in the Cc-list. > > arch/arm/boot/dts/rk3288.dtsi | 44 +++++++++++++++++++++++++++++++++++-------- > 1 file changed, 36 insertions(+), 8 deletions(-) > > diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi > index 2c29a3e..35a06a5 100644 > --- a/arch/arm/boot/dts/rk3288.dtsi > +++ b/arch/arm/boot/dts/rk3288.dtsi > @@ -1,13 +1,41 @@ > /* > - * This program 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 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. > * > - * This program 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. > + * a) This file 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 file 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. > + * > + * 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 Acked-by: Lin Huang -- ?? ??????????? Fuzhou Rockchip Electronics Co.Ltd ?????????????89????A?21??(350003) Addr:No.21 Building, A District, No.89, software Boulevard Fuzhou, Fujian,PRC Email:hl at rock-chips.com Tel:+86-591-83991906/07 **************************************************************************************** ???????????????????????????????????????????? ???? ???????????????????????????????????????? ???????????????????????????????????????????? ?????????????????? IMPORTANT NOTICE: This email is from Fuzhou Rockchip Electronics Co., Ltd .The contents of this email and any attachments may contain information that is privileged, confidential and/or exempt from disclosure under applicable law and relevant NDA. If you are not the intended recipient, you are hereby notified that any disclosure, copying, distribution, or use of the information is STRICTLY PROHIBITED. Please immediately contact the sender as soon as possible and destroy the material in its entirety in any format. Thank you. ********************************************************************************