From patchwork Tue May 15 10:14:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 913551 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=synaptics.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="k7iIoCCq"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=Synaptics.onmicrosoft.com header.i=@Synaptics.onmicrosoft.com header.b="aYc/0XWi"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40lYQF181Kz9s08 for ; Tue, 15 May 2018 20:16:53 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=FbA/YKQe944DNRHhxM9Drh8ZpSQJWw0TUoMM/OP5VBg=; b=k7iIoCCqEDbEVC hOZiNzvVNaJyhL3MJ8QW2W9vgqsO6ZvzcGUa/5T3uvErnFuVisPRX3srdCzxtYFZIMMfVu+SaQ2Ic tW5FM+jwKWAKYbXgMQQiPJtWrqHXSapriXZRbdRkOJI1009MXh6tMVOpmOE+e76YRQYnKJlayR4H3 5dp3vJ5gPnvw0HQcjt4F1SBzX0FV/tmvTXAHd7IvIaUnSEoBgcm58Nc5zlbjoI6d2VsS5ZYiTs8eh zZC+rhiTpmNud0eDS3nv0rKCfED1MctuQm0gHOsEn4hYLiQtpYoQZcMX2FFA1sOpRPfBZzZm1fbRH 1h3uLEjQX3CoM0q27m0Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fIX0h-0006Z0-7V; Tue, 15 May 2018 10:16:47 +0000 Received: from mail-bn3nam01on0056.outbound.protection.outlook.com ([104.47.33.56] helo=NAM01-BN3-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fIWz6-0004Eh-6B for linux-arm-kernel@lists.infradead.org; Tue, 15 May 2018 10:15:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Synaptics.onmicrosoft.com; s=selector1-synaptics-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=Y1TtCvXseU9e34ywzlHReRBoT20XdlYv9H3Jzfrn8Qc=; b=aYc/0XWis4LwAFUJVJGYw4NCRn5BAgOugJIN2XKBOXG1uTZUGWOsMcSUezlQrLeYXM5ylVoDVhhaQRt1yQONFwIufmeC1H5vm0u4IJXaJ0zAf5QK5RrhHHd0vxvIUHNzsdtcicu/rslNkI2oZmvzeEUOOXTGc9Pc9Zqhfa43Qew= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Jisheng.Zhang@synaptics.com; Received: from xhacker.debian (124.74.246.114) by DM5PR03MB2635.namprd03.prod.outlook.com (2603:10b6:3:43::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.755.16; Tue, 15 May 2018 10:14:52 +0000 Date: Tue, 15 May 2018 18:14:07 +0800 From: Jisheng Zhang To: Sebastian Hesselbarth , Rob Herring , Mark Rutland Subject: [PATCH 2/2] ARM: dts: berlin*-dts: use SPDX-License-Identifier for berlin based board Message-ID: <20180515181407.1848452b@xhacker.debian> In-Reply-To: <20180515181216.6d82f7fc@xhacker.debian> References: <20180515181216.6d82f7fc@xhacker.debian> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-Originating-IP: [124.74.246.114] X-ClientProxiedBy: TY1PR01CA0182.jpnprd01.prod.outlook.com (2603:1096:402::34) To DM5PR03MB2635.namprd03.prod.outlook.com (2603:10b6:3:43::9) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM5PR03MB2635; X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2635; 3:zySQUoXIKtXhBjFWIoNNkuhwN1FSymHyk8zyQfm2z/ZgsnA0UwCzTqyQTireDzgX7J5lKREiI59nlzLJxmBXf76ms1s02neqY0i/orY07OdQMDMBhKMCVPmFngJGEJIvkAsHxsiqjsRGhlpEDTiJrZHiG46TSoYdAOgisfWj+UwmOZWpUz9SzJnK+DguYZMeJpiNatqMg3GhLhODrKhcvgoK8P/DZEQAyOWni1ufveiAaS9mJrhU+PfAtA+AI1zb; 25:L22MsrZLKRFVkj/hnjPuaw0TkzlexLnK6A/c1gcOmzS++1b7qRBqhx4SvxXM8U+yT+DKLp1Rw/7cWtp+c8/nLELw1KfYWlwXTrd8iHSHfBwaKnGGlSvs4QcYxI6cKNHzGv0sMjwD1smARNSfupgiqyDepNsB4I82SnmE7nZrMTeVbcDp+RdB7oD5afeuZcjzsMVm7bktZw3PXyzvNFu4PRli69Wo5mHWeKmmoAb1Aoe1bJOZVK4jcGQyhJNV0v01Ga0bbbfRCHr5McSrp4mcHKKCenqsKdSM5sfXIDnA1BowhQCzbyqP6qO4a12qDvsRv8/zMsqUcUujP1ebYJMRSg==; 31:m7E4eNEi9AWY9gp6eMpC/GdZpdI0b1LUyd3hrkIik5asHYdCM2QycEWeX9hFrgRJ9v0UajZMU8KZvVrMMIsrjyCaP1C3VjwQvWVFjVDkQTWH+1KAcxAgx3sy2rYsok5ZDn1tofw6u/6Wmmv7PnwrJxSg/fI7Cwq9/ziOEq0y2HNJbfRiV5OMMNahViX5Xrd0ygbf/LVZCgVxUje3pB348jsJXnisaopmCUYj1Qz9uF0= X-MS-TrafficTypeDiagnostic: DM5PR03MB2635: X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2635; 20:MZpuMOrPLvctDf/xNDgFFLXuxAlyL/DVbVFqT3q3PvuCsere1t5lq9bBf3Lj0BtOpwUA99VZLIC3g7Sqc2pgaEL9MSmO9GVQnNbl3k99/p44RsdELZs076oLL9sbsYQynRDAIm0CkEzNJZHt1gKNQ2JJ9UAA6i6UKuOq6HzaMQSH/RarXPVpkWUO3YEGrTOWe5x+YbAlxM80qTV4GTQx1jMylGk5MMwKXTqqdpHjJyzM14uiMrG+ed2X8AJwURnaNWtxT/5nM7qyWXMYjSxE5FRvM2sU0ZRE7lqyB+nAPIHTePaSRCtyVv9Y3koDQz5s0I2H+pcRn3lcEoz/y+re7QguJH2td5VdMQh/kBRJ2P9L+JHhp9PF0JSsHfjj5+QqYlv7y75/YAP1oYbdEpkoxaxzz7h8DK7hlJ7RjJ+2BOkZtT8DJaKSvm76RuKb4WHTEEMJEtNrGeqCkrjI11bDoq3sKLN/d6J8qni8wy+vZR4icC5HnOUXbDxy1L1StTBK; 4:H/cdXQMxAn+97FwGkRB/owCxaU7cZMCgOnXPcUfy10/bsbmTc3hEY3XC17P/w5gn9JlDaY5uC+IRfswsn7zsO5NcNimjamAh+5QpPZqWZOVI6iaWdekzZfwxujUrPWC7bdVJmTSIgph0HYZ7JtZK1P3EfMogeYNeVzIvhvJMwty19lGi0J3SW5FZRCG6WWU7Spq1yePpg0V8HcXIGzoSoSQzDn/tRW0ZpO/pU45u0Z+RkGfyLbRJAm+bhmknZ+9wcF+sn6mwXQjk/Gw2bpiTFhQDyIXYXkE4atnBVeEsDaWDBbxinBN5v5u+DonBpWU0UpzXZv0s+k5wDBO1ZyqBzUZRMdeGGpSoYPydzsFVf5k= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(85827821059158)(58145275503218); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(3231254)(944501410)(52105095)(93006095)(93001095)(10201501046)(3002001)(149027)(150027)(6041310)(20161123562045)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:DM5PR03MB2635; BCL:0; PCL:0; RULEID:; SRVR:DM5PR03MB2635; X-Forefront-PRVS: 0673F5BE31 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(39380400002)(366004)(346002)(39860400002)(199004)(189003)(6116002)(386003)(6506007)(97736004)(59450400001)(7696005)(53936002)(55016002)(6306002)(47776003)(316002)(110136005)(9686003)(33896004)(72206003)(476003)(966005)(3846002)(1076002)(575784001)(52116002)(478600001)(956004)(446003)(11346002)(86362001)(26005)(16526019)(76176011)(486006)(186003)(23676004)(81166006)(8746002)(81156014)(7736002)(8676002)(8936002)(4326008)(2906002)(6666003)(106356001)(25786009)(5660300001)(39060400002)(68736007)(66066001)(50466002)(50226002)(305945005)(105586002)(39210200001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR03MB2635; H:xhacker.debian; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: synaptics.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BDM5PR03MB2635=3B23=3AXmqt?= =?utf-8?q?qLF9w2pP34AiMOM12eQYY3NnFRfUQibczP7YZkS/eQ39Ta9XYQuJnOOy?= =?utf-8?q?VrsYMsKLL+TpnFrlNr5uSHahcEjmkUnRd9zGYtmr9pWZzxvcmABoD0L2?= =?utf-8?q?HVx64HPKbxtAIRyKIbpJ1G0xDDzDDGjzo6bW1sJUyAWyeQIgTj6Az7+7?= =?utf-8?q?OPiov0VlgO9pVqKDtcTqhzi3azAybJpXw6zNpYbPnH9YE28YdDDL09XW?= =?utf-8?q?btc4oZg+nSS5+5xASlQ696vh/Qul2ikXM1acOuS33R3GlWW9kfjj/qJL?= =?utf-8?q?d2fARCObMpkbwZkPFPBlsfnglTqU3v6DjV4gkFmyyUHdgXNUuCVPb5+j?= =?utf-8?q?CuhtTaYim/VUxGZAJr764adOLQSutFvRgi4tqSjhf3WpJgISYbk3S8B2?= =?utf-8?q?TcN9PqJvGq6Dj1gCCywLRkUySEtCsbJz5/O8Hsw2iODNVwo5QDQ6V8W3?= =?utf-8?q?FD4vMk6q4bExQLi3cgj834jjvXMRAn+Ol/1TD3GJTG2kjWLQpmqImENe?= =?utf-8?q?kc8ww/EIlXm459Xkkv76BWVehjCgYHzO9+PGc0yDkOPbjEaoEOyKgr8U?= =?utf-8?q?Uwk1YtC85dyZohIvfzFPRo/CR4GjyKaHtYMgaojYoJ3CccOXRzskRv7q?= =?utf-8?q?liizLoFu9tn4gLdMmrMcmqa3MKmRWZrbU+k4snielNPDlNchgSndjxrz?= =?utf-8?q?ozQl/wh7vXw1alXPflsTf8yQfk9IF06i3iTIDnZp07viAF9m4RGROpvy?= =?utf-8?q?oY464ibUd9O0NcEsypRBoh3exlhsHXa59kpXTPqCZwOfjDNhq4NN5Vj8?= =?utf-8?q?t8CbreLmjlQrnYL436MmsSzcpc22AHTvhmkClYWy/Ap5/rBXkbKBNIlo?= =?utf-8?q?SX6e4GieaqbbSUi/MAfOw8t6XVLnu1FoIj01DiHd548uZZ8F7cPFtTSA?= =?utf-8?q?S7WW6Xoad9c7BJyieP8eO8ERQNq/TZutMdNxHK4ETdY4eqnMBvOJzUEe?= =?utf-8?q?dt0S/Lwnbl3WeaEz5uzBPEOlwWY3bQ7GJ9PKR//VYIcCP/bSQHrxcbYM?= =?utf-8?q?xEOIVBTEz44w3mpHeYc32AMpXJncYDUJNOwZjFwnclT4IylsRW2WUPwP?= =?utf-8?q?iUrdhPhsBWnbUeKSVkxMUFT/YRpYvN9QhIi9Fh0U3PUr5ORHbydotFgp?= =?utf-8?q?Dl9UFSePeZQKe8Hp0X6lUVTwYkZJxPFSgCd8gpiL32KN50VJjgp/IqDw?= =?utf-8?q?thI3Aq8kR5oSPmA2UMwkpQS7kKvWVAlYFNjHU83YAMMmBVee9a7oS3rs?= =?utf-8?q?SuvLYoBYRI9c62jxcagGE9naQ1BH48be1f+2nQ1++3mXi6RmuAWiNX0m?= =?utf-8?q?ZIxjUr73emlmMv7dApiqOinrNgnEWRmFkTl8ZrqCXbwmY7c22msM?= X-Microsoft-Antispam-Message-Info: QOvoGOz6BUycyYWyXtv+IkS2KW4PpaLG4JE2gD3BACwyf7K4/H2xS5Pwmvt98QUgZNKl5SAU0Ob/IIFXXtqvkfYteK38vUGtrazEdMi0HlYTA80JaI2qw/WrcMrp3rn/ZMHN2cdxe62FHy4m+H/V1LuBGq5Uu2faqmG1u+SMPVKCG3qeRhL4V5lFLSOsjORV X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2635; 6:6W4Ja86gcZdTItKGr41oeh5vHWu7qWgyoA5tM+sdovdb5iwBRy5UCmStc5cKOaZ4t0bdzr47iPZmDTmZzSd6BAXguh81N2SGQWaCa/90ViS3DaEQJHXbTepD+0ysX3VR5j2jmGTqvThAJ43nEMHuF6eUfyTChSPFerk4ijPXBJvwa6VY+Qza1qEoCqnMQUF59qcfBb9Ai2LO7S3Ee5C95rkl5z5/axcxVXxU2QKF9TnIqhyIAA+2L7X6SGoCnDQ35YV1uo7Nxw9PBb9wvg0rFLm2aZ1X4xbJN+/AmeY0r9Or6wCrfHra2CqBTa7Lov4SadQpRnsxUy9wUE/3o614q+OiHiAoo0J/Nli0A5wxHlkyaVopIsZ2HEERaQc/9muiJRwGD/tv5F7WatI0DA11S/d5q0Wn+4u+PGh8AtcZZtcpqrLHM5vr+82AzuHX3lDv0UZ83h47pYaiH/4jVoGbSg==; 5:c0uX9C49XUhA+2yytHowR+WHhwLld7yM9qn9+m/mMnRpL7X2BACc7RsFXQcCSsZP4Jau5IOJq2CKb1qdpEb0/I7yCaJRdw4qIPSf2yL3oYmAKjrvrFKTm74vggS17M9qksXzNho7rDp7ZpxWFgKpZQEvZEvnV8awlR36m9YPxXk=; 24:/+LxZdU53adu7+5yLJpdn2VQWbuyYYAju1Zq4v9bA5EO3QJLD1n4JT1+iZ43SVir3qNt+u5VD5cPwXj9/ngYLKh5fyfMZCOclhC10zDPxkg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2635; 7:XWKErYJ50cnWUC6lzYPFrAlyoZucCXU+JfNhO8c+At5w39gkQlcrpS3yMVe3ceWGz+FY6B2316FxtDpYF7fKLx3tN8Db3vWiYgpw+QVpyx0AtzoHutbr5YSh1traxTiRlzWITBUhIipNe3BlXfoqiPMsI9rEEcD0aMfutT0NLW1VZqN1UFVwx29nlzYpKXHoiwqBn0t2EDGN2ydov/0/dK0AYlIT7umDW0LnAKyjD16EIYUaAvhuz0GoA6KFUdIW X-MS-Office365-Filtering-Correlation-Id: 6b799398-e935-4a2a-84d2-08d5ba4cb431 X-OriginatorOrg: synaptics.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 May 2018 10:14:52.7936 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6b799398-e935-4a2a-84d2-08d5ba4cb431 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335d1fbc-2124-4173-9863-17e7051a2a0e X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR03MB2635 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180515_031508_431942_0A43C33A X-CRM114-Status: GOOD ( 14.58 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [104.47.33.56 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [104.47.33.56 listed in wl.mailspike.net] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -0.0 T_DKIMWL_WL_MED DKIMwl.org - Whitelisted Medium sender X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org 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 Signed-off-by: Jisheng Zhang --- arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts | 33 +------------------ .../boot/dts/berlin2cd-google-chromecast.dts | 33 +------------------ arch/arm/boot/dts/berlin2q-marvell-dmp.dts | 33 +------------------ 3 files changed, 3 insertions(+), 96 deletions(-) diff --git a/arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts b/arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts index 1c475796d17f..64a297759eb9 100644 --- a/arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts +++ b/arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts @@ -1,39 +1,8 @@ +// SPDX-License-Identifier: (GPL-2.0 OR MIT) /* * Device Tree file for Sony NSZ-GS7 * * Sebastian Hesselbarth - * - * 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. - * - * a) This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without any - * warranty of any kind, whether express or implied. - * - * 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. */ /dts-v1/; diff --git a/arch/arm/boot/dts/berlin2cd-google-chromecast.dts b/arch/arm/boot/dts/berlin2cd-google-chromecast.dts index ca24def0ce13..540115172d3a 100644 --- a/arch/arm/boot/dts/berlin2cd-google-chromecast.dts +++ b/arch/arm/boot/dts/berlin2cd-google-chromecast.dts @@ -1,39 +1,8 @@ +// SPDX-License-Identifier: (GPL-2.0 OR MIT) /* * Device Tree file for Google Chromecast * * Sebastian Hesselbarth - * - * 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. - * - * a) This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without any - * warranty of any kind, whether express or implied. - * - * 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. */ /dts-v1/; diff --git a/arch/arm/boot/dts/berlin2q-marvell-dmp.dts b/arch/arm/boot/dts/berlin2q-marvell-dmp.dts index 57aa5f8a7c77..c162f98cb8e8 100644 --- a/arch/arm/boot/dts/berlin2q-marvell-dmp.dts +++ b/arch/arm/boot/dts/berlin2q-marvell-dmp.dts @@ -1,37 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0 OR MIT) /* * Copyright (C) 2014 Antoine Ténart - * - * 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. - * - * a) This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without any - * warranty of any kind, whether express or implied. - * - * 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. */ /dts-v1/;