Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

arm: dts: kirkwood*.dts: use SPDX-License-Identifier for boards using GPL-2.0+/MIT

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

Acked-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>

+8 -304
+1 -38
arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi
··· 1 + // SPDX-License-Identifier: (GPL-2.0+ OR MIT) 1 2 /* 2 3 * Device Tree common file for kirkwood-6282 based Buffalo Linkstation 3 4 * 4 5 * Copyright (C) 2015, 2016 5 6 * Roger Shimizu <rogershimizu@gmail.com> 6 - * 7 - * This file is dual-licensed: you can use it either under the terms 8 - * of the GPL or the X11 license, at your option. Note that this dual 9 - * licensing only applies to this file, and not this project as a 10 - * whole. 11 - * 12 - * a) This file is free software; you can redistribute it and/or 13 - * modify it under the terms of the GNU General Public License as 14 - * published by the Free Software Foundation; either version 2 of the 15 - * License, or (at your option) any later version. 16 - * 17 - * This file is distributed in the hope that it will be useful, 18 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 19 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 20 - * GNU General Public License for more details. 21 - * 22 - * Or, alternatively, 23 - * 24 - * b) Permission is hereby granted, free of charge, to any person 25 - * obtaining a copy of this software and associated documentation 26 - * files (the "Software"), to deal in the Software without 27 - * restriction, including without limitation the rights to use, 28 - * copy, modify, merge, publish, distribute, sublicense, and/or 29 - * sell copies of the Software, and to permit persons to whom the 30 - * Software is furnished to do so, subject to the following 31 - * conditions: 32 - * 33 - * The above copyright notice and this permission notice shall be 34 - * included in all copies or substantial portions of the Software. 35 - * 36 - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 37 - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 38 - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 39 - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 40 - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 41 - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 42 - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 43 - * OTHER DEALINGS IN THE SOFTWARE. 44 7 */ 45 8 46 9 #include "kirkwood.dtsi"
+1 -38
arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi
··· 1 + // SPDX-License-Identifier: (GPL-2.0+ OR MIT) 1 2 /* 2 3 * Device Tree common file for kirkwood-6281 based 2-Bay Buffalo Linkstation 3 4 * 4 5 * Copyright (C) 2015, 2016 5 6 * Roger Shimizu <rogershimizu@gmail.com> 6 - * 7 - * This file is dual-licensed: you can use it either under the terms 8 - * of the GPL or the X11 license, at your option. Note that this dual 9 - * licensing only applies to this file, and not this project as a 10 - * whole. 11 - * 12 - * a) This file is free software; you can redistribute it and/or 13 - * modify it under the terms of the GNU General Public License as 14 - * published by the Free Software Foundation; either version 2 of the 15 - * License, or (at your option) any later version. 16 - * 17 - * This file is distributed in the hope that it will be useful, 18 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 19 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 20 - * GNU General Public License for more details. 21 - * 22 - * Or, alternatively, 23 - * 24 - * b) Permission is hereby granted, free of charge, to any person 25 - * obtaining a copy of this software and associated documentation 26 - * files (the "Software"), to deal in the Software without 27 - * restriction, including without limitation the rights to use, 28 - * copy, modify, merge, publish, distribute, sublicense, and/or 29 - * sell copies of the Software, and to permit persons to whom the 30 - * Software is furnished to do so, subject to the following 31 - * conditions: 32 - * 33 - * The above copyright notice and this permission notice shall be 34 - * included in all copies or substantial portions of the Software. 35 - * 36 - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 37 - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 38 - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 39 - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 40 - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 41 - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 42 - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 43 - * OTHER DEALINGS IN THE SOFTWARE. 44 7 */ 45 8 46 9 #include "kirkwood.dtsi"
+1 -38
arch/arm/boot/dts/kirkwood-linkstation-lsqvl.dts
··· 1 + // SPDX-License-Identifier: (GPL-2.0+ OR MIT) 1 2 /* 2 3 * Device Tree file for Buffalo Linkstation LS-QVL 3 4 * ··· 7 6 * Based on kirkwood-linkstation-lswvl.dts, 8 7 * Copyright (C) 2015, 2016 9 8 * Roger Shimizu <rogershimizu@gmail.com> 10 - * 11 - * This file is dual-licensed: you can use it either under the terms 12 - * of the GPL or the X11 license, at your option. Note that this dual 13 - * licensing only applies to this file, and not this project as a 14 - * whole. 15 - * 16 - * a) This file is free software; you can redistribute it and/or 17 - * modify it under the terms of the GNU General Public License as 18 - * published by the Free Software Foundation; either version 2 of the 19 - * License, or (at your option) any later version. 20 - * 21 - * This file is distributed in the hope that it will be useful, 22 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 23 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 24 - * GNU General Public License for more details. 25 - * 26 - * Or, alternatively, 27 - * 28 - * b) Permission is hereby granted, free of charge, to any person 29 - * obtaining a copy of this software and associated documentation 30 - * files (the "Software"), to deal in the Software without 31 - * restriction, including without limitation the rights to use, 32 - * copy, modify, merge, publish, distribute, sublicense, and/or 33 - * sell copies of the Software, and to permit persons to whom the 34 - * Software is furnished to do so, subject to the following 35 - * conditions: 36 - * 37 - * The above copyright notice and this permission notice shall be 38 - * included in all copies or substantial portions of the Software. 39 - * 40 - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 41 - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 42 - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 43 - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 44 - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 45 - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 46 - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 47 - * OTHER DEALINGS IN THE SOFTWARE. 48 9 */ 49 10 50 11 /dts-v1/;
+1 -38
arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts
··· 1 + // SPDX-License-Identifier: (GPL-2.0+ OR MIT) 1 2 /* 2 3 * Device Tree file for Buffalo Linkstation LS-VL 3 4 * 4 5 * Copyright (C) 2015, 2016 5 6 * Roger Shimizu <rogershimizu@gmail.com> 6 - * 7 - * This file is dual-licensed: you can use it either under the terms 8 - * of the GPL or the X11 license, at your option. Note that this dual 9 - * licensing only applies to this file, and not this project as a 10 - * whole. 11 - * 12 - * a) This file is free software; you can redistribute it and/or 13 - * modify it under the terms of the GNU General Public License as 14 - * published by the Free Software Foundation; either version 2 of the 15 - * License, or (at your option) any later version. 16 - * 17 - * This file is distributed in the hope that it will be useful, 18 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 19 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 20 - * GNU General Public License for more details. 21 - * 22 - * Or, alternatively, 23 - * 24 - * b) Permission is hereby granted, free of charge, to any person 25 - * obtaining a copy of this software and associated documentation 26 - * files (the "Software"), to deal in the Software without 27 - * restriction, including without limitation the rights to use, 28 - * copy, modify, merge, publish, distribute, sublicense, and/or 29 - * sell copies of the Software, and to permit persons to whom the 30 - * Software is furnished to do so, subject to the following 31 - * conditions: 32 - * 33 - * The above copyright notice and this permission notice shall be 34 - * included in all copies or substantial portions of the Software. 35 - * 36 - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 37 - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 38 - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 39 - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 40 - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 41 - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 42 - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 43 - * OTHER DEALINGS IN THE SOFTWARE. 44 7 */ 45 8 46 9 /dts-v1/;
+1 -38
arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts
··· 1 + // SPDX-License-Identifier: (GPL-2.0+ OR MIT) 1 2 /* 2 3 * Device Tree file for Buffalo Linkstation LS-WSXL 3 4 * 4 5 * Copyright (C) 2015, 2016 5 6 * Roger Shimizu <rogershimizu@gmail.com> 6 - * 7 - * This file is dual-licensed: you can use it either under the terms 8 - * of the GPL or the X11 license, at your option. Note that this dual 9 - * licensing only applies to this file, and not this project as a 10 - * whole. 11 - * 12 - * a) This file is free software; you can redistribute it and/or 13 - * modify it under the terms of the GNU General Public License as 14 - * published by the Free Software Foundation; either version 2 of the 15 - * License, or (at your option) any later version. 16 - * 17 - * This file is distributed in the hope that it will be useful, 18 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 19 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 20 - * GNU General Public License for more details. 21 - * 22 - * Or, alternatively, 23 - * 24 - * b) Permission is hereby granted, free of charge, to any person 25 - * obtaining a copy of this software and associated documentation 26 - * files (the "Software"), to deal in the Software without 27 - * restriction, including without limitation the rights to use, 28 - * copy, modify, merge, publish, distribute, sublicense, and/or 29 - * sell copies of the Software, and to permit persons to whom the 30 - * Software is furnished to do so, subject to the following 31 - * conditions: 32 - * 33 - * The above copyright notice and this permission notice shall be 34 - * included in all copies or substantial portions of the Software. 35 - * 36 - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 37 - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 38 - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 39 - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 40 - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 41 - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 42 - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 43 - * OTHER DEALINGS IN THE SOFTWARE. 44 7 */ 45 8 46 9 /dts-v1/;
+1 -38
arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts
··· 1 + // SPDX-License-Identifier: (GPL-2.0+ OR MIT) 1 2 /* 2 3 * Device Tree file for Buffalo Linkstation LS-WVL 3 4 * 4 5 * Copyright (C) 2015, 2016 5 6 * Roger Shimizu <rogershimizu@gmail.com> 6 - * 7 - * This file is dual-licensed: you can use it either under the terms 8 - * of the GPL or the X11 license, at your option. Note that this dual 9 - * licensing only applies to this file, and not this project as a 10 - * whole. 11 - * 12 - * a) This file is free software; you can redistribute it and/or 13 - * modify it under the terms of the GNU General Public License as 14 - * published by the Free Software Foundation; either version 2 of the 15 - * License, or (at your option) any later version. 16 - * 17 - * This file is distributed in the hope that it will be useful, 18 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 19 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 20 - * GNU General Public License for more details. 21 - * 22 - * Or, alternatively, 23 - * 24 - * b) Permission is hereby granted, free of charge, to any person 25 - * obtaining a copy of this software and associated documentation 26 - * files (the "Software"), to deal in the Software without 27 - * restriction, including without limitation the rights to use, 28 - * copy, modify, merge, publish, distribute, sublicense, and/or 29 - * sell copies of the Software, and to permit persons to whom the 30 - * Software is furnished to do so, subject to the following 31 - * conditions: 32 - * 33 - * The above copyright notice and this permission notice shall be 34 - * included in all copies or substantial portions of the Software. 35 - * 36 - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 37 - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 38 - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 39 - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 40 - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 41 - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 42 - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 43 - * OTHER DEALINGS IN THE SOFTWARE. 44 7 */ 45 8 46 9 /dts-v1/;
+1 -38
arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts
··· 1 + // SPDX-License-Identifier: (GPL-2.0+ OR MIT) 1 2 /* 2 3 * Device Tree file for Buffalo Linkstation LS-WXL 3 4 * 4 5 * Copyright (C) 2015, 2016 5 6 * Roger Shimizu <rogershimizu@gmail.com> 6 - * 7 - * This file is dual-licensed: you can use it either under the terms 8 - * of the GPL or the X11 license, at your option. Note that this dual 9 - * licensing only applies to this file, and not this project as a 10 - * whole. 11 - * 12 - * a) This file is free software; you can redistribute it and/or 13 - * modify it under the terms of the GNU General Public License as 14 - * published by the Free Software Foundation; either version 2 of the 15 - * License, or (at your option) any later version. 16 - * 17 - * This file is distributed in the hope that it will be useful, 18 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 19 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 20 - * GNU General Public License for more details. 21 - * 22 - * Or, alternatively, 23 - * 24 - * b) Permission is hereby granted, free of charge, to any person 25 - * obtaining a copy of this software and associated documentation 26 - * files (the "Software"), to deal in the Software without 27 - * restriction, including without limitation the rights to use, 28 - * copy, modify, merge, publish, distribute, sublicense, and/or 29 - * sell copies of the Software, and to permit persons to whom the 30 - * Software is furnished to do so, subject to the following 31 - * conditions: 32 - * 33 - * The above copyright notice and this permission notice shall be 34 - * included in all copies or substantial portions of the Software. 35 - * 36 - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 37 - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 38 - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 39 - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 40 - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 41 - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 42 - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 43 - * OTHER DEALINGS IN THE SOFTWARE. 44 7 */ 45 8 46 9 /dts-v1/;
+1 -38
arch/arm/boot/dts/kirkwood-linkstation.dtsi
··· 1 + // SPDX-License-Identifier: (GPL-2.0+ OR MIT) 1 2 /* 2 3 * Device Tree common file for kirkwood based Buffalo Linkstation 3 4 * 4 5 * Copyright (C) 2015, 2016 5 6 * Roger Shimizu <rogershimizu@gmail.com> 6 - * 7 - * This file is dual-licensed: you can use it either under the terms 8 - * of the GPL or the X11 license, at your option. Note that this dual 9 - * licensing only applies to this file, and not this project as a 10 - * whole. 11 - * 12 - * a) This file is free software; you can redistribute it and/or 13 - * modify it under the terms of the GNU General Public License as 14 - * published by the Free Software Foundation; either version 2 of the 15 - * License, or (at your option) any later version. 16 - * 17 - * This file is distributed in the hope that it will be useful, 18 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 19 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 20 - * GNU General Public License for more details. 21 - * 22 - * Or, alternatively, 23 - * 24 - * b) Permission is hereby granted, free of charge, to any person 25 - * obtaining a copy of this software and associated documentation 26 - * files (the "Software"), to deal in the Software without 27 - * restriction, including without limitation the rights to use, 28 - * copy, modify, merge, publish, distribute, sublicense, and/or 29 - * sell copies of the Software, and to permit persons to whom the 30 - * Software is furnished to do so, subject to the following 31 - * conditions: 32 - * 33 - * The above copyright notice and this permission notice shall be 34 - * included in all copies or substantial portions of the Software. 35 - * 36 - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 37 - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 38 - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 39 - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 40 - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 41 - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 42 - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 43 - * OTHER DEALINGS IN THE SOFTWARE. 44 7 */ 45 8 46 9 / {