diff options
| author | Gregory CLEMENT <gregory.clement@bootlin.com> | 2018-03-15 09:40:56 -0400 |
|---|---|---|
| committer | Gregory CLEMENT <gregory.clement@bootlin.com> | 2018-03-27 09:07:53 -0400 |
| commit | 69f5689b6b4ac5bb77079ddef6b357bcaadb962c (patch) | |
| tree | 686ef4b7717558e61dd1bf8877d26e53da4dda0a | |
| parent | 29e36c1f63d16c6fe895fa4e33b01e45a11f96de (diff) | |
arm: dts: armada-*.dtsi: use SPDX-License-Identifier for most of the Armada SoCs
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>
| -rw-r--r-- | arch/arm/boot/dts/armada-370-xp.dtsi | 39 | ||||
| -rw-r--r-- | arch/arm/boot/dts/armada-370.dtsi | 39 | ||||
| -rw-r--r-- | arch/arm/boot/dts/armada-375.dtsi | 39 | ||||
| -rw-r--r-- | arch/arm/boot/dts/armada-380.dtsi | 39 | ||||
| -rw-r--r-- | arch/arm/boot/dts/armada-385.dtsi | 39 | ||||
| -rw-r--r-- | arch/arm/boot/dts/armada-388.dtsi | 34 | ||||
| -rw-r--r-- | arch/arm/boot/dts/armada-38x.dtsi | 39 | ||||
| -rw-r--r-- | arch/arm/boot/dts/armada-390.dtsi | 39 | ||||
| -rw-r--r-- | arch/arm/boot/dts/armada-395.dtsi | 39 | ||||
| -rw-r--r-- | arch/arm/boot/dts/armada-398.dtsi | 39 | ||||
| -rw-r--r-- | arch/arm/boot/dts/armada-39x.dtsi | 39 | ||||
| -rw-r--r-- | arch/arm/boot/dts/armada-xp-mv78230.dtsi | 39 | ||||
| -rw-r--r-- | arch/arm/boot/dts/armada-xp-mv78260.dtsi | 39 | ||||
| -rw-r--r-- | arch/arm/boot/dts/armada-xp-mv78460.dtsi | 39 | ||||
| -rw-r--r-- | arch/arm/boot/dts/armada-xp.dtsi | 39 |
15 files changed, 15 insertions, 565 deletions
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi index 09495e87b038..11fc3271dad4 100644 --- a/arch/arm/boot/dts/armada-370-xp.dtsi +++ b/arch/arm/boot/dts/armada-370-xp.dtsi | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: (GPL-2.0+ OR MIT) | ||
| 1 | /* | 2 | /* |
| 2 | * Device Tree Include file for Marvell Armada 370 and Armada XP SoC | 3 | * Device Tree Include file for Marvell Armada 370 and Armada XP SoC |
| 3 | * | 4 | * |
| @@ -8,44 +9,6 @@ | |||
| 8 | * Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 9 | * Thomas Petazzoni <thomas.petazzoni@free-electrons.com> |
| 9 | * Ben Dooks <ben.dooks@codethink.co.uk> | 10 | * Ben Dooks <ben.dooks@codethink.co.uk> |
| 10 | * | 11 | * |
| 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 | * | ||
| 49 | * This file contains the definitions that are common to the Armada | 12 | * This file contains the definitions that are common to the Armada |
| 50 | * 370 and Armada XP SoC. | 13 | * 370 and Armada XP SoC. |
| 51 | */ | 14 | */ |
diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi index b1cf5a26f3c2..46e6d3ed8f35 100644 --- a/arch/arm/boot/dts/armada-370.dtsi +++ b/arch/arm/boot/dts/armada-370.dtsi | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: (GPL-2.0+ OR MIT) | ||
| 1 | /* | 2 | /* |
| 2 | * Device Tree Include file for Marvell Armada 370 family SoC | 3 | * Device Tree Include file for Marvell Armada 370 family SoC |
| 3 | * | 4 | * |
| @@ -7,44 +8,6 @@ | |||
| 7 | * Gregory CLEMENT <gregory.clement@free-electrons.com> | 8 | * Gregory CLEMENT <gregory.clement@free-electrons.com> |
| 8 | * Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 9 | * Thomas Petazzoni <thomas.petazzoni@free-electrons.com> |
| 9 | * | 10 | * |
| 10 | * This file is dual-licensed: you can use it either under the terms | ||
| 11 | * of the GPL or the X11 license, at your option. Note that this dual | ||
| 12 | * licensing only applies to this file, and not this project as a | ||
| 13 | * whole. | ||
| 14 | * | ||
| 15 | * a) This file is free software; you can redistribute it and/or | ||
| 16 | * modify it under the terms of the GNU General Public License as | ||
| 17 | * published by the Free Software Foundation; either version 2 of the | ||
| 18 | * License, or (at your option) any later version. | ||
| 19 | * | ||
| 20 | * This file is distributed in the hope that it will be useful, | ||
| 21 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 22 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 23 | * GNU General Public License for more details. | ||
| 24 | * | ||
| 25 | * Or, alternatively, | ||
| 26 | * | ||
| 27 | * b) Permission is hereby granted, free of charge, to any person | ||
| 28 | * obtaining a copy of this software and associated documentation | ||
| 29 | * files (the "Software"), to deal in the Software without | ||
| 30 | * restriction, including without limitation the rights to use, | ||
| 31 | * copy, modify, merge, publish, distribute, sublicense, and/or | ||
| 32 | * sell copies of the Software, and to permit persons to whom the | ||
| 33 | * Software is furnished to do so, subject to the following | ||
| 34 | * conditions: | ||
| 35 | * | ||
| 36 | * The above copyright notice and this permission notice shall be | ||
| 37 | * included in all copies or substantial portions of the Software. | ||
| 38 | * | ||
| 39 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| 40 | * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES | ||
| 41 | * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| 42 | * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT | ||
| 43 | * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, | ||
| 44 | * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
| 45 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | ||
| 46 | * OTHER DEALINGS IN THE SOFTWARE. | ||
| 47 | * | ||
| 48 | * Contains definitions specific to the Armada 370 SoC that are not | 11 | * Contains definitions specific to the Armada 370 SoC that are not |
| 49 | * common to all Armada SoCs. | 12 | * common to all Armada SoCs. |
| 50 | */ | 13 | */ |
diff --git a/arch/arm/boot/dts/armada-375.dtsi b/arch/arm/boot/dts/armada-375.dtsi index 2cb1bcd30976..53ead6f26a0e 100644 --- a/arch/arm/boot/dts/armada-375.dtsi +++ b/arch/arm/boot/dts/armada-375.dtsi | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: (GPL-2.0+ OR MIT) | ||
| 1 | /* | 2 | /* |
| 2 | * Device Tree Include file for Marvell Armada 375 family SoC | 3 | * Device Tree Include file for Marvell Armada 375 family SoC |
| 3 | * | 4 | * |
| @@ -5,44 +6,6 @@ | |||
| 5 | * | 6 | * |
| 6 | * Gregory CLEMENT <gregory.clement@free-electrons.com> | 7 | * Gregory CLEMENT <gregory.clement@free-electrons.com> |
| 7 | * Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 8 | * Thomas Petazzoni <thomas.petazzoni@free-electrons.com> |
| 8 | * | ||
| 9 | * This file is dual-licensed: you can use it either under the terms | ||
| 10 | * of the GPL or the X11 license, at your option. Note that this dual | ||
| 11 | * licensing only applies to this file, and not this project as a | ||
| 12 | * whole. | ||
| 13 | * | ||
| 14 | * a) This file is free software; you can redistribute it and/or | ||
| 15 | * modify it under the terms of the GNU General Public License as | ||
| 16 | * published by the Free Software Foundation; either version 2 of the | ||
| 17 | * License, or (at your option) any later version. | ||
| 18 | * | ||
| 19 | * This file is distributed in the hope that it will be useful, | ||
| 20 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 21 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 22 | * GNU General Public License for more details. | ||
| 23 | * | ||
| 24 | * Or, alternatively, | ||
| 25 | * | ||
| 26 | * b) Permission is hereby granted, free of charge, to any person | ||
| 27 | * obtaining a copy of this software and associated documentation | ||
| 28 | * files (the "Software"), to deal in the Software without | ||
| 29 | * restriction, including without limitation the rights to use, | ||
| 30 | * copy, modify, merge, publish, distribute, sublicense, and/or | ||
| 31 | * sell copies of the Software, and to permit persons to whom the | ||
| 32 | * Software is furnished to do so, subject to the following | ||
| 33 | * conditions: | ||
| 34 | * | ||
| 35 | * The above copyright notice and this permission notice shall be | ||
| 36 | * included in all copies or substantial portions of the Software. | ||
| 37 | * | ||
| 38 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| 39 | * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES | ||
| 40 | * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| 41 | * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT | ||
| 42 | * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, | ||
| 43 | * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
| 44 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | ||
| 45 | * OTHER DEALINGS IN THE SOFTWARE. | ||
| 46 | */ | 9 | */ |
| 47 | 10 | ||
| 48 | #include <dt-bindings/interrupt-controller/arm-gic.h> | 11 | #include <dt-bindings/interrupt-controller/arm-gic.h> |
diff --git a/arch/arm/boot/dts/armada-380.dtsi b/arch/arm/boot/dts/armada-380.dtsi index 132596fd0860..cff1269f3fbf 100644 --- a/arch/arm/boot/dts/armada-380.dtsi +++ b/arch/arm/boot/dts/armada-380.dtsi | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: (GPL-2.0+ OR MIT) | ||
| 1 | /* | 2 | /* |
| 2 | * Device Tree Include file for Marvell Armada 380 SoC. | 3 | * Device Tree Include file for Marvell Armada 380 SoC. |
| 3 | * | 4 | * |
| @@ -6,44 +7,6 @@ | |||
| 6 | * Lior Amsalem <alior@marvell.com> | 7 | * Lior Amsalem <alior@marvell.com> |
| 7 | * Gregory CLEMENT <gregory.clement@free-electrons.com> | 8 | * Gregory CLEMENT <gregory.clement@free-electrons.com> |
| 8 | * Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 9 | * Thomas Petazzoni <thomas.petazzoni@free-electrons.com> |
| 9 | * | ||
| 10 | * This file is dual-licensed: you can use it either under the terms | ||
| 11 | * of the GPL or the X11 license, at your option. Note that this dual | ||
| 12 | * licensing only applies to this file, and not this project as a | ||
| 13 | * whole. | ||
| 14 | * | ||
| 15 | * a) This file is free software; you can redistribute it and/or | ||
| 16 | * modify it under the terms of the GNU General Public License as | ||
| 17 | * published by the Free Software Foundation; either version 2 of the | ||
| 18 | * License, or (at your option) any later version. | ||
| 19 | * | ||
| 20 | * This file is distributed in the hope that it will be useful, | ||
| 21 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 22 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 23 | * GNU General Public License for more details. | ||
| 24 | * | ||
| 25 | * Or, alternatively, | ||
| 26 | * | ||
| 27 | * b) Permission is hereby granted, free of charge, to any person | ||
| 28 | * obtaining a copy of this software and associated documentation | ||
| 29 | * files (the "Software"), to deal in the Software without | ||
| 30 | * restriction, including without limitation the rights to use, | ||
| 31 | * copy, modify, merge, publish, distribute, sublicense, and/or | ||
| 32 | * sell copies of the Software, and to permit persons to whom the | ||
| 33 | * Software is furnished to do so, subject to the following | ||
| 34 | * conditions: | ||
| 35 | * | ||
| 36 | * The above copyright notice and this permission notice shall be | ||
| 37 | * included in all copies or substantial portions of the Software. | ||
| 38 | * | ||
| 39 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| 40 | * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES | ||
| 41 | * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| 42 | * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT | ||
| 43 | * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, | ||
| 44 | * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
| 45 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | ||
| 46 | * OTHER DEALINGS IN THE SOFTWARE. | ||
| 47 | */ | 10 | */ |
| 48 | 11 | ||
| 49 | #include "armada-38x.dtsi" | 12 | #include "armada-38x.dtsi" |
diff --git a/arch/arm/boot/dts/armada-385.dtsi b/arch/arm/boot/dts/armada-385.dtsi index 74863aff01c6..f0022d10c715 100644 --- a/arch/arm/boot/dts/armada-385.dtsi +++ b/arch/arm/boot/dts/armada-385.dtsi | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: (GPL-2.0+ OR MIT) | ||
| 1 | /* | 2 | /* |
| 2 | * Device Tree Include file for Marvell Armada 385 SoC. | 3 | * Device Tree Include file for Marvell Armada 385 SoC. |
| 3 | * | 4 | * |
| @@ -6,44 +7,6 @@ | |||
| 6 | * Lior Amsalem <alior@marvell.com> | 7 | * Lior Amsalem <alior@marvell.com> |
| 7 | * Gregory CLEMENT <gregory.clement@free-electrons.com> | 8 | * Gregory CLEMENT <gregory.clement@free-electrons.com> |
| 8 | * Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 9 | * Thomas Petazzoni <thomas.petazzoni@free-electrons.com> |
| 9 | * | ||
| 10 | * This file is dual-licensed: you can use it either under the terms | ||
| 11 | * of the GPL or the X11 license, at your option. Note that this dual | ||
| 12 | * licensing only applies to this file, and not this project as a | ||
| 13 | * whole. | ||
| 14 | * | ||
| 15 | * a) This file is free software; you can redistribute it and/or | ||
| 16 | * modify it under the terms of the GNU General Public License as | ||
| 17 | * published by the Free Software Foundation; either version 2 of the | ||
| 18 | * License, or (at your option) any later version. | ||
| 19 | * | ||
| 20 | * This file is distributed in the hope that it will be useful, | ||
| 21 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 22 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 23 | * GNU General Public License for more details. | ||
| 24 | * | ||
| 25 | * Or, alternatively, | ||
| 26 | * | ||
| 27 | * b) Permission is hereby granted, free of charge, to any person | ||
| 28 | * obtaining a copy of this software and associated documentation | ||
| 29 | * files (the "Software"), to deal in the Software without | ||
| 30 | * restriction, including without limitation the rights to use, | ||
| 31 | * copy, modify, merge, publish, distribute, sublicense, and/or | ||
| 32 | * sell copies of the Software, and to permit persons to whom the | ||
| 33 | * Software is furnished to do so, subject to the following | ||
| 34 | * conditions: | ||
| 35 | * | ||
| 36 | * The above copyright notice and this permission notice shall be | ||
| 37 | * included in all copies or substantial portions of the Software. | ||
| 38 | * | ||
| 39 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| 40 | * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES | ||
| 41 | * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| 42 | * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT | ||
| 43 | * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, | ||
| 44 | * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
| 45 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | ||
| 46 | * OTHER DEALINGS IN THE SOFTWARE. | ||
| 47 | */ | 10 | */ |
| 48 | 11 | ||
| 49 | #include "armada-38x.dtsi" | 12 | #include "armada-38x.dtsi" |
diff --git a/arch/arm/boot/dts/armada-388.dtsi b/arch/arm/boot/dts/armada-388.dtsi index 1c0d151b2aaa..f3a020ff577e 100644 --- a/arch/arm/boot/dts/armada-388.dtsi +++ b/arch/arm/boot/dts/armada-388.dtsi | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: (GPL-2.0+ OR MIT) | ||
| 1 | /* | 2 | /* |
| 2 | * Device Tree Include file for Marvell Armada 388 SoC. | 3 | * Device Tree Include file for Marvell Armada 388 SoC. |
| 3 | * | 4 | * |
| @@ -5,39 +6,6 @@ | |||
| 5 | * | 6 | * |
| 6 | * Gregory CLEMENT <gregory.clement@free-electrons.com> | 7 | * Gregory CLEMENT <gregory.clement@free-electrons.com> |
| 7 | * | 8 | * |
| 8 | * This file is dual-licensed: you can use it either under the terms | ||
| 9 | * of the GPL or the X11 license, at your option. Note that this dual | ||
| 10 | * licensing only applies to this file, and not this project as a | ||
| 11 | * whole. | ||
| 12 | * | ||
| 13 | * a) This file is licensed under the terms of the GNU General Public | ||
| 14 | * License version 2. This program is licensed "as is" without | ||
| 15 | * any warranty of any kind, whether express or implied. | ||
| 16 | * | ||
| 17 | * Or, alternatively, | ||
| 18 | * | ||
| 19 | * b) Permission is hereby granted, free of charge, to any person | ||
| 20 | * obtaining a copy of this software and associated documentation | ||
| 21 | * files (the "Software"), to deal in the Software without | ||
| 22 | * restriction, including without limitation the rights to use, | ||
| 23 | * copy, modify, merge, publish, distribute, sublicense, and/or | ||
| 24 | * sell copies of the Software, and to permit persons to whom the | ||
| 25 | * Software is furnished to do so, subject to the following | ||
| 26 | * conditions: | ||
| 27 | * | ||
| 28 | * The above copyright notice and this permission notice shall be | ||
| 29 | * included in all copies or substantial portions of the Software. | ||
| 30 | * | ||
| 31 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| 32 | * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES | ||
| 33 | * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| 34 | * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT | ||
| 35 | * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, | ||
| 36 | * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
| 37 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | ||
| 38 | * OTHER DEALINGS IN THE SOFTWARE. | ||
| 39 | * | ||
| 40 | * | ||
| 41 | * The main difference with the Armada 385 is that the 388 can handle two more | 9 | * The main difference with the Armada 385 is that the 388 can handle two more |
| 42 | * SATA ports. So we can reuse the dtsi of the Armada 385, override the pinctrl | 10 | * SATA ports. So we can reuse the dtsi of the Armada 385, override the pinctrl |
| 43 | * property and the name of the SoC, and add the second SATA host which control | 11 | * property and the name of the SoC, and add the second SATA host which control |
diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi index a6cc568f74f7..4cc09e43eea2 100644 --- a/arch/arm/boot/dts/armada-38x.dtsi +++ b/arch/arm/boot/dts/armada-38x.dtsi | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: (GPL-2.0+ OR MIT) | ||
| 1 | /* | 2 | /* |
| 2 | * Device Tree Include file for Marvell Armada 38x family of SoCs. | 3 | * Device Tree Include file for Marvell Armada 38x family of SoCs. |
| 3 | * | 4 | * |
| @@ -6,44 +7,6 @@ | |||
| 6 | * Lior Amsalem <alior@marvell.com> | 7 | * Lior Amsalem <alior@marvell.com> |
| 7 | * Gregory CLEMENT <gregory.clement@free-electrons.com> | 8 | * Gregory CLEMENT <gregory.clement@free-electrons.com> |
| 8 | * Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 9 | * Thomas Petazzoni <thomas.petazzoni@free-electrons.com> |
| 9 | * | ||
| 10 | * This file is dual-licensed: you can use it either under the terms | ||
| 11 | * of the GPL or the X11 license, at your option. Note that this dual | ||
| 12 | * licensing only applies to this file, and not this project as a | ||
| 13 | * whole. | ||
| 14 | * | ||
| 15 | * a) This file is free software; you can redistribute it and/or | ||
| 16 | * modify it under the terms of the GNU General Public License as | ||
| 17 | * published by the Free Software Foundation; either version 2 of the | ||
| 18 | * License, or (at your option) any later version. | ||
| 19 | * | ||
| 20 | * This file is distributed in the hope that it will be useful, | ||
| 21 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 22 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 23 | * GNU General Public License for more details. | ||
| 24 | * | ||
| 25 | * Or, alternatively, | ||
| 26 | * | ||
| 27 | * b) Permission is hereby granted, free of charge, to any person | ||
| 28 | * obtaining a copy of this software and associated documentation | ||
| 29 | * files (the "Software"), to deal in the Software without | ||
| 30 | * restriction, including without limitation the rights to use, | ||
| 31 | * copy, modify, merge, publish, distribute, sublicense, and/or | ||
| 32 | * sell copies of the Software, and to permit persons to whom the | ||
| 33 | * Software is furnished to do so, subject to the following | ||
| 34 | * conditions: | ||
| 35 | * | ||
| 36 | * The above copyright notice and this permission notice shall be | ||
| 37 | * included in all copies or substantial portions of the Software. | ||
| 38 | * | ||
| 39 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| 40 | * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES | ||
| 41 | * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| 42 | * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT | ||
| 43 | * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, | ||
| 44 | * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
| 45 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | ||
| 46 | * OTHER DEALINGS IN THE SOFTWARE. | ||
| 47 | */ | 10 | */ |
| 48 | 11 | ||
| 49 | #include "skeleton.dtsi" | 12 | #include "skeleton.dtsi" |
diff --git a/arch/arm/boot/dts/armada-390.dtsi b/arch/arm/boot/dts/armada-390.dtsi index 0d8a54ad007c..aa2057d4d6f8 100644 --- a/arch/arm/boot/dts/armada-390.dtsi +++ b/arch/arm/boot/dts/armada-390.dtsi | |||
| @@ -1,47 +1,10 @@ | |||
| 1 | // SPDX-License-Identifier: (GPL-2.0+ OR MIT) | ||
| 1 | /* | 2 | /* |
| 2 | * Device Tree Include file for Marvell Armada 390 SoC. | 3 | * Device Tree Include file for Marvell Armada 390 SoC. |
| 3 | * | 4 | * |
| 4 | * Copyright (C) 2015 Marvell | 5 | * Copyright (C) 2015 Marvell |
| 5 | * | 6 | * |
| 6 | * Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 7 | * Thomas Petazzoni <thomas.petazzoni@free-electrons.com> |
| 7 | * | ||
| 8 | * This file is dual-licensed: you can use it either under the terms | ||
| 9 | * of the GPL or the X11 license, at your option. Note that this dual | ||
| 10 | * licensing only applies to this file, and not this project as a | ||
| 11 | * whole. | ||
| 12 | * | ||
| 13 | * a) This file is free software; you can redistribute it and/or | ||
| 14 | * modify it under the terms of the GNU General Public License as | ||
| 15 | * published by the Free Software Foundation; either version 2 of the | ||
| 16 | * License, or (at your option) any later version. | ||
| 17 | * | ||
| 18 | * This file is distributed in the hope that it will be useful, | ||
| 19 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 20 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 21 | * GNU General Public License for more details. | ||
| 22 | * | ||
| 23 | * Or, alternatively, | ||
| 24 | * | ||
| 25 | * b) Permission is hereby granted, free of charge, to any person | ||
| 26 | * obtaining a copy of this software and associated documentation | ||
| 27 | * files (the "Software"), to deal in the Software without | ||
| 28 | * restriction, including without limitation the rights to use, | ||
| 29 | * copy, modify, merge, publish, distribute, sublicense, and/or | ||
| 30 | * sell copies of the Software, and to permit persons to whom the | ||
| 31 | * Software is furnished to do so, subject to the following | ||
| 32 | * conditions: | ||
| 33 | * | ||
| 34 | * The above copyright notice and this permission notice shall be | ||
| 35 | * included in all copies or substantial portions of the Software. | ||
| 36 | * | ||
| 37 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| 38 | * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES | ||
| 39 | * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| 40 | * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT | ||
| 41 | * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, | ||
| 42 | * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
| 43 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | ||
| 44 | * OTHER DEALINGS IN THE SOFTWARE. | ||
| 45 | */ | 8 | */ |
| 46 | 9 | ||
| 47 | #include "armada-39x.dtsi" | 10 | #include "armada-39x.dtsi" |
diff --git a/arch/arm/boot/dts/armada-395.dtsi b/arch/arm/boot/dts/armada-395.dtsi index bf7e4335e36a..e18a7d9cd7d4 100644 --- a/arch/arm/boot/dts/armada-395.dtsi +++ b/arch/arm/boot/dts/armada-395.dtsi | |||
| @@ -1,47 +1,10 @@ | |||
| 1 | // SPDX-License-Identifier: (GPL-2.0+ OR MIT) | ||
| 1 | /* | 2 | /* |
| 2 | * Device Tree Include file for Marvell Armada 395 SoC. | 3 | * Device Tree Include file for Marvell Armada 395 SoC. |
| 3 | * | 4 | * |
| 4 | * Copyright (C) 2016 Marvell | 5 | * Copyright (C) 2016 Marvell |
| 5 | * | 6 | * |
| 6 | * Grzegorz Jaszczyk <jaz@semihalf.com> | 7 | * Grzegorz Jaszczyk <jaz@semihalf.com> |
| 7 | * | ||
| 8 | * This file is dual-licensed: you can use it either under the terms | ||
| 9 | * of the GPL or the X11 license, at your option. Note that this dual | ||
| 10 | * licensing only applies to this file, and not this project as a | ||
| 11 | * whole. | ||
| 12 | * | ||
| 13 | * a) This file is free software; you can redistribute it and/or | ||
| 14 | * modify it under the terms of the GNU General Public License as | ||
| 15 | * published by the Free Software Foundation; either version 2 of the | ||
| 16 | * License, or (at your option) any later version. | ||
| 17 | * | ||
| 18 | * This file is distributed in the hope that it will be useful, | ||
| 19 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 20 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 21 | * GNU General Public License for more details. | ||
| 22 | * | ||
| 23 | * Or, alternatively, | ||
| 24 | * | ||
| 25 | * b) Permission is hereby granted, free of charge, to any person | ||
| 26 | * obtaining a copy of this software and associated documentation | ||
| 27 | * files (the "Software"), to deal in the Software without | ||
| 28 | * restriction, including without limitation the rights to use, | ||
| 29 | * copy, modify, merge, publish, distribute, sublicense, and/or | ||
| 30 | * sell copies of the Software, and to permit persons to whom the | ||
| 31 | * Software is furnished to do so, subject to the following | ||
| 32 | * conditions: | ||
| 33 | * | ||
| 34 | * The above copyright notice and this permission notice shall be | ||
| 35 | * included in all copies or substantial portions of the Software. | ||
| 36 | * | ||
| 37 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| 38 | * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES | ||
| 39 | * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| 40 | * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT | ||
| 41 | * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, | ||
| 42 | * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
| 43 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | ||
| 44 | * OTHER DEALINGS IN THE SOFTWARE. | ||
| 45 | */ | 8 | */ |
| 46 | 9 | ||
| 47 | #include "armada-39x.dtsi" | 10 | #include "armada-39x.dtsi" |
diff --git a/arch/arm/boot/dts/armada-398.dtsi b/arch/arm/boot/dts/armada-398.dtsi index 1f4e113fc821..c5ac89399ce1 100644 --- a/arch/arm/boot/dts/armada-398.dtsi +++ b/arch/arm/boot/dts/armada-398.dtsi | |||
| @@ -1,47 +1,10 @@ | |||
| 1 | // SPDX-License-Identifier: (GPL-2.0+ OR MIT) | ||
| 1 | /* | 2 | /* |
| 2 | * Device Tree Include file for Marvell Armada 398 SoC. | 3 | * Device Tree Include file for Marvell Armada 398 SoC. |
| 3 | * | 4 | * |
| 4 | * Copyright (C) 2015 Marvell | 5 | * Copyright (C) 2015 Marvell |
| 5 | * | 6 | * |
| 6 | * Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 7 | * Thomas Petazzoni <thomas.petazzoni@free-electrons.com> |
| 7 | * | ||
| 8 | * This file is dual-licensed: you can use it either under the terms | ||
| 9 | * of the GPL or the X11 license, at your option. Note that this dual | ||
| 10 | * licensing only applies to this file, and not this project as a | ||
| 11 | * whole. | ||
| 12 | * | ||
| 13 | * a) This file is free software; you can redistribute it and/or | ||
| 14 | * modify it under the terms of the GNU General Public License as | ||
| 15 | * published by the Free Software Foundation; either version 2 of the | ||
| 16 | * License, or (at your option) any later version. | ||
| 17 | * | ||
| 18 | * This file is distributed in the hope that it will be useful, | ||
| 19 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 20 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 21 | * GNU General Public License for more details. | ||
| 22 | * | ||
| 23 | * Or, alternatively, | ||
| 24 | * | ||
| 25 | * b) Permission is hereby granted, free of charge, to any person | ||
| 26 | * obtaining a copy of this software and associated documentation | ||
| 27 | * files (the "Software"), to deal in the Software without | ||
| 28 | * restriction, including without limitation the rights to use, | ||
| 29 | * copy, modify, merge, publish, distribute, sublicense, and/or | ||
| 30 | * sell copies of the Software, and to permit persons to whom the | ||
| 31 | * Software is furnished to do so, subject to the following | ||
| 32 | * conditions: | ||
| 33 | * | ||
| 34 | * The above copyright notice and this permission notice shall be | ||
| 35 | * included in all copies or substantial portions of the Software. | ||
| 36 | * | ||
| 37 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| 38 | * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES | ||
| 39 | * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| 40 | * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT | ||
| 41 | * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, | ||
| 42 | * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
| 43 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | ||
| 44 | * OTHER DEALINGS IN THE SOFTWARE. | ||
| 45 | */ | 8 | */ |
| 46 | 9 | ||
| 47 | #include "armada-395.dtsi" | 10 | #include "armada-395.dtsi" |
diff --git a/arch/arm/boot/dts/armada-39x.dtsi b/arch/arm/boot/dts/armada-39x.dtsi index 5218bd2a248d..c1737c0a8325 100644 --- a/arch/arm/boot/dts/armada-39x.dtsi +++ b/arch/arm/boot/dts/armada-39x.dtsi | |||
| @@ -1,47 +1,10 @@ | |||
| 1 | // SPDX-License-Identifier: (GPL-2.0+ OR MIT) | ||
| 1 | /* | 2 | /* |
| 2 | * Device Tree Include file for Marvell Armada 39x family of SoCs. | 3 | * Device Tree Include file for Marvell Armada 39x family of SoCs. |
| 3 | * | 4 | * |
| 4 | * Copyright (C) 2015 Marvell | 5 | * Copyright (C) 2015 Marvell |
| 5 | * | 6 | * |
| 6 | * Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 7 | * Thomas Petazzoni <thomas.petazzoni@free-electrons.com> |
| 7 | * | ||
| 8 | * This file is dual-licensed: you can use it either under the terms | ||
| 9 | * of the GPL or the X11 license, at your option. Note that this dual | ||
| 10 | * licensing only applies to this file, and not this project as a | ||
| 11 | * whole. | ||
| 12 | * | ||
| 13 | * a) This file is free software; you can redistribute it and/or | ||
| 14 | * modify it under the terms of the GNU General Public License as | ||
| 15 | * published by the Free Software Foundation; either version 2 of the | ||
| 16 | * License, or (at your option) any later version. | ||
| 17 | * | ||
| 18 | * This file is distributed in the hope that it will be useful, | ||
| 19 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 20 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 21 | * GNU General Public License for more details. | ||
| 22 | * | ||
| 23 | * Or, alternatively, | ||
| 24 | * | ||
| 25 | * b) Permission is hereby granted, free of charge, to any person | ||
| 26 | * obtaining a copy of this software and associated documentation | ||
| 27 | * files (the "Software"), to deal in the Software without | ||
| 28 | * restriction, including without limitation the rights to use, | ||
| 29 | * copy, modify, merge, publish, distribute, sublicense, and/or | ||
| 30 | * sell copies of the Software, and to permit persons to whom the | ||
| 31 | * Software is furnished to do so, subject to the following | ||
| 32 | * conditions: | ||
| 33 | * | ||
| 34 | * The above copyright notice and this permission notice shall be | ||
| 35 | * included in all copies or substantial portions of the Software. | ||
| 36 | * | ||
| 37 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| 38 | * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES | ||
| 39 | * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| 40 | * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT | ||
| 41 | * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, | ||
| 42 | * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
| 43 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | ||
| 44 | * OTHER DEALINGS IN THE SOFTWARE. | ||
| 45 | */ | 8 | */ |
| 46 | 9 | ||
| 47 | #include "skeleton.dtsi" | 10 | #include "skeleton.dtsi" |
diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi b/arch/arm/boot/dts/armada-xp-mv78230.dtsi index 129738f7973d..8558bf6bb54c 100644 --- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: (GPL-2.0+ OR MIT) | ||
| 1 | /* | 2 | /* |
| 2 | * Device Tree Include file for Marvell Armada XP family SoC | 3 | * Device Tree Include file for Marvell Armada XP family SoC |
| 3 | * | 4 | * |
| @@ -5,44 +6,6 @@ | |||
| 5 | * | 6 | * |
| 6 | * Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 7 | * Thomas Petazzoni <thomas.petazzoni@free-electrons.com> |
| 7 | * | 8 | * |
| 8 | * This file is dual-licensed: you can use it either under the terms | ||
| 9 | * of the GPL or the X11 license, at your option. Note that this dual | ||
| 10 | * licensing only applies to this file, and not this project as a | ||
| 11 | * whole. | ||
| 12 | * | ||
| 13 | * a) This file is free software; you can redistribute it and/or | ||
| 14 | * modify it under the terms of the GNU General Public License as | ||
| 15 | * published by the Free Software Foundation; either version 2 of the | ||
| 16 | * License, or (at your option) any later version. | ||
| 17 | * | ||
| 18 | * This file is distributed in the hope that it will be useful, | ||
| 19 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 20 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 21 | * GNU General Public License for more details. | ||
| 22 | * | ||
| 23 | * Or, alternatively, | ||
| 24 | * | ||
| 25 | * b) Permission is hereby granted, free of charge, to any person | ||
| 26 | * obtaining a copy of this software and associated documentation | ||
| 27 | * files (the "Software"), to deal in the Software without | ||
| 28 | * restriction, including without limitation the rights to use, | ||
| 29 | * copy, modify, merge, publish, distribute, sublicense, and/or | ||
| 30 | * sell copies of the Software, and to permit persons to whom the | ||
| 31 | * Software is furnished to do so, subject to the following | ||
| 32 | * conditions: | ||
| 33 | * | ||
| 34 | * The above copyright notice and this permission notice shall be | ||
| 35 | * included in all copies or substantial portions of the Software. | ||
| 36 | * | ||
| 37 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| 38 | * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES | ||
| 39 | * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| 40 | * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT | ||
| 41 | * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, | ||
| 42 | * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
| 43 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | ||
| 44 | * OTHER DEALINGS IN THE SOFTWARE. | ||
| 45 | * | ||
| 46 | * Contains definitions specific to the Armada XP MV78230 SoC that are not | 9 | * Contains definitions specific to the Armada XP MV78230 SoC that are not |
| 47 | * common to all Armada XP SoCs. | 10 | * common to all Armada XP SoCs. |
| 48 | */ | 11 | */ |
diff --git a/arch/arm/boot/dts/armada-xp-mv78260.dtsi b/arch/arm/boot/dts/armada-xp-mv78260.dtsi index e58d597e37b9..2d85fe8ac327 100644 --- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: (GPL-2.0+ OR MIT) | ||
| 1 | /* | 2 | /* |
| 2 | * Device Tree Include file for Marvell Armada XP family SoC | 3 | * Device Tree Include file for Marvell Armada XP family SoC |
| 3 | * | 4 | * |
| @@ -5,44 +6,6 @@ | |||
| 5 | * | 6 | * |
| 6 | * Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 7 | * Thomas Petazzoni <thomas.petazzoni@free-electrons.com> |
| 7 | * | 8 | * |
| 8 | * This file is dual-licensed: you can use it either under the terms | ||
| 9 | * of the GPL or the X11 license, at your option. Note that this dual | ||
| 10 | * licensing only applies to this file, and not this project as a | ||
| 11 | * whole. | ||
| 12 | * | ||
| 13 | * a) This file is free software; you can redistribute it and/or | ||
| 14 | * modify it under the terms of the GNU General Public License as | ||
| 15 | * published by the Free Software Foundation; either version 2 of the | ||
| 16 | * License, or (at your option) any later version. | ||
| 17 | * | ||
| 18 | * This file is distributed in the hope that it will be useful, | ||
| 19 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 20 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 21 | * GNU General Public License for more details. | ||
| 22 | * | ||
| 23 | * Or, alternatively, | ||
| 24 | * | ||
| 25 | * b) Permission is hereby granted, free of charge, to any person | ||
| 26 | * obtaining a copy of this software and associated documentation | ||
| 27 | * files (the "Software"), to deal in the Software without | ||
| 28 | * restriction, including without limitation the rights to use, | ||
| 29 | * copy, modify, merge, publish, distribute, sublicense, and/or | ||
| 30 | * sell copies of the Software, and to permit persons to whom the | ||
| 31 | * Software is furnished to do so, subject to the following | ||
| 32 | * conditions: | ||
| 33 | * | ||
| 34 | * The above copyright notice and this permission notice shall be | ||
| 35 | * included in all copies or substantial portions of the Software. | ||
| 36 | * | ||
| 37 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| 38 | * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES | ||
| 39 | * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| 40 | * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT | ||
| 41 | * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, | ||
| 42 | * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
| 43 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | ||
| 44 | * OTHER DEALINGS IN THE SOFTWARE. | ||
| 45 | * | ||
| 46 | * Contains definitions specific to the Armada XP MV78260 SoC that are not | 9 | * Contains definitions specific to the Armada XP MV78260 SoC that are not |
| 47 | * common to all Armada XP SoCs. | 10 | * common to all Armada XP SoCs. |
| 48 | */ | 11 | */ |
diff --git a/arch/arm/boot/dts/armada-xp-mv78460.dtsi b/arch/arm/boot/dts/armada-xp-mv78460.dtsi index a5c961cee7de..230a3fd36b30 100644 --- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: (GPL-2.0+ OR MIT) | ||
| 1 | /* | 2 | /* |
| 2 | * Device Tree Include file for Marvell Armada XP family SoC | 3 | * Device Tree Include file for Marvell Armada XP family SoC |
| 3 | * | 4 | * |
| @@ -5,44 +6,6 @@ | |||
| 5 | * | 6 | * |
| 6 | * Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 7 | * Thomas Petazzoni <thomas.petazzoni@free-electrons.com> |
| 7 | * | 8 | * |
| 8 | * This file is dual-licensed: you can use it either under the terms | ||
| 9 | * of the GPL or the X11 license, at your option. Note that this dual | ||
| 10 | * licensing only applies to this file, and not this project as a | ||
| 11 | * whole. | ||
| 12 | * | ||
| 13 | * a) This file is free software; you can redistribute it and/or | ||
| 14 | * modify it under the terms of the GNU General Public License as | ||
| 15 | * published by the Free Software Foundation; either version 2 of the | ||
| 16 | * License, or (at your option) any later version. | ||
| 17 | * | ||
| 18 | * This file is distributed in the hope that it will be useful, | ||
| 19 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 20 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 21 | * GNU General Public License for more details. | ||
| 22 | * | ||
| 23 | * Or, alternatively, | ||
| 24 | * | ||
| 25 | * b) Permission is hereby granted, free of charge, to any person | ||
| 26 | * obtaining a copy of this software and associated documentation | ||
| 27 | * files (the "Software"), to deal in the Software without | ||
| 28 | * restriction, including without limitation the rights to use, | ||
| 29 | * copy, modify, merge, publish, distribute, sublicense, and/or | ||
| 30 | * sell copies of the Software, and to permit persons to whom the | ||
| 31 | * Software is furnished to do so, subject to the following | ||
| 32 | * conditions: | ||
| 33 | * | ||
| 34 | * The above copyright notice and this permission notice shall be | ||
| 35 | * included in all copies or substantial portions of the Software. | ||
| 36 | * | ||
| 37 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| 38 | * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES | ||
| 39 | * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| 40 | * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT | ||
| 41 | * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, | ||
| 42 | * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
| 43 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | ||
| 44 | * OTHER DEALINGS IN THE SOFTWARE. | ||
| 45 | * | ||
| 46 | * Contains definitions specific to the Armada XP MV78460 SoC that are not | 9 | * Contains definitions specific to the Armada XP MV78460 SoC that are not |
| 47 | * common to all Armada XP SoCs. | 10 | * common to all Armada XP SoCs. |
| 48 | */ | 11 | */ |
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi index fa1e881266ac..ee15c77d3689 100644 --- a/arch/arm/boot/dts/armada-xp.dtsi +++ b/arch/arm/boot/dts/armada-xp.dtsi | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: (GPL-2.0+ OR MIT) | ||
| 1 | /* | 2 | /* |
| 2 | * Device Tree Include file for Marvell Armada XP family SoC | 3 | * Device Tree Include file for Marvell Armada XP family SoC |
| 3 | * | 4 | * |
| @@ -8,44 +9,6 @@ | |||
| 8 | * Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 9 | * Thomas Petazzoni <thomas.petazzoni@free-electrons.com> |
| 9 | * Ben Dooks <ben.dooks@codethink.co.uk> | 10 | * Ben Dooks <ben.dooks@codethink.co.uk> |
| 10 | * | 11 | * |
| 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 | * | ||
| 49 | * Contains definitions specific to the Armada XP SoC that are not | 12 | * Contains definitions specific to the Armada XP SoC that are not |
| 50 | * common to all Armada SoCs. | 13 | * common to all Armada SoCs. |
| 51 | */ | 14 | */ |