Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e60a94c authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'mvebu-dt-4.11-1' of git://git.infradead.org/linux-mvebu into next/dt 

mvebu dt for 4.11 (part 1)

- Add support for the ethernet switch on the Turris Omnia board
- Clean up and improvement for ClearFog boards
- Correct license text which was mangled when switching to dual license

* tag 'mvebu-dt-4.11-1' of git://git.infradead.org/linux-mvebu

:
  ARM: dts: turris-omnia: add support for ethernet switch
  ARM: dts: armada388-clearfog: move uart nodes
  ARM: dts: armada388-clearfog: move ethernet related nodes
  ARM: dts: armada388-clearfog: move I2C nodes
  ARM: dts: armada388-clearfog: move device specific pinctrl nodes
  ARM: dts: armada388-clearfog: add pro model DTS file
  ARM: dts: armada388-clearfog: add base model DTS file
  ARM: dts: armada388-clearfog: move rear button
  ARM: dts: armada388-clearfog: move SPI CS1
  ARM: dts: armada388-clearfog: move second PCIe port
  ARM: dts: armada388-clearfog: move DSA switch
  ARM: dts: armada388-clearfog: split clearfog DTS file
  ARM: dts: armada388-clearfog: move sdhci pinctrl node to microsom
  ARM: dts: armada388-clearfog: move SPI flash into microsom
  ARM: dts: armada388-clearfog: fix SPI flash #size-cells
  ARM: dts: mvebu: Correct license text

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 0e1c1c7a 7b7db5ab

arch/arm/boot/dts/Makefile

+2 −0
Original line number Original line Diff line number Diff line
@@ -951,6 +951,8 @@ dtb-$(CONFIG_MACH_ARMADA_38X) += \ 
	armada-385-linksys-cobra.dtb \

	armada-385-linksys-cobra.dtb \

	armada-385-turris-omnia.dtb \

	armada-385-turris-omnia.dtb \

	armada-388-clearfog.dtb \

	armada-388-clearfog.dtb \

	armada-388-clearfog-base.dtb \

	armada-388-clearfog-pro.dtb \

	armada-388-db.dtb \

	armada-388-db.dtb \

	armada-388-gp.dtb \

	armada-388-gp.dtb \

	armada-388-rd.dtb

	armada-388-rd.dtb

arch/arm/boot/dts/armada-370-db.dts

+5 −5
Original line number Original line Diff line number Diff line
@@ -18,17 +18,17 @@ 
 *     published by the Free Software Foundation; either version 2 of the

 *     published by the Free Software Foundation; either version 2 of the

 *     License, or (at your option) any later version.

 *     License, or (at your option) any later version.

 *

 *

 *     This file is distributed in the hope that it will be useful

 *     This file is distributed in the hope that it will be useful,

 *     but WITHOUT ANY WARRANTY; without even the implied warranty of

 *     but WITHOUT ANY WARRANTY; without even the implied warranty of

 *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *     GNU General Public License for more details.

 *     GNU General Public License for more details.

 *

 *

 * Or, alternatively

 * Or, alternatively,

 *

 *

 *  b) Permission is hereby granted, free of charge, to any person

 *  b) Permission is hereby granted, free of charge, to any person

 *     obtaining a copy of this software and associated documentation

 *     obtaining a copy of this software and associated documentation

 *     files (the "Software"), to deal in the Software without

 *     files (the "Software"), to deal in the Software without

 *     restriction, including without limitation the rights to use

 *     restriction, including without limitation the rights to use,

 *     copy, modify, merge, publish, distribute, sublicense, and/or

 *     copy, modify, merge, publish, distribute, sublicense, and/or

 *     sell copies of the Software, and to permit persons to whom the

 *     sell copies of the Software, and to permit persons to whom the

 *     Software is furnished to do so, subject to the following

 *     Software is furnished to do so, subject to the following
@@ -37,11 +37,11 @@ 
 *     The above copyright notice and this permission notice shall be

 *     The above copyright notice and this permission notice shall be

 *     included in all copies or substantial portions of the Software.

 *     included in all copies or substantial portions of the Software.

 *

 *

 *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND

 *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES

 *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES

 *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

 *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

 *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY

 *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

 *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

 *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

 *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 *     OTHER DEALINGS IN THE SOFTWARE.

 *     OTHER DEALINGS IN THE SOFTWARE.

arch/arm/boot/dts/armada-370-dlink-dns327l.dts

+5 −5
Original line number Original line Diff line number Diff line
@@ -13,17 +13,17 @@ 
 *     published by the Free Software Foundation; either version 2 of the

 *     published by the Free Software Foundation; either version 2 of the

 *     License, or (at your option) any later version.

 *     License, or (at your option) any later version.

 *

 *

 *     This file is distributed in the hope that it will be useful

 *     This file is distributed in the hope that it will be useful,

 *     but WITHOUT ANY WARRANTY; without even the implied warranty of

 *     but WITHOUT ANY WARRANTY; without even the implied warranty of

 *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *     GNU General Public License for more details.

 *     GNU General Public License for more details.

 *

 *

 * Or, alternatively

 * Or, alternatively,

 *

 *

 *  b) Permission is hereby granted, free of charge, to any person

 *  b) Permission is hereby granted, free of charge, to any person

 *     obtaining a copy of this software and associated documentation

 *     obtaining a copy of this software and associated documentation

 *     files (the "Software"), to deal in the Software without

 *     files (the "Software"), to deal in the Software without

 *     restriction, including without limitation the rights to use

 *     restriction, including without limitation the rights to use,

 *     copy, modify, merge, publish, distribute, sublicense, and/or

 *     copy, modify, merge, publish, distribute, sublicense, and/or

 *     sell copies of the Software, and to permit persons to whom the

 *     sell copies of the Software, and to permit persons to whom the

 *     Software is furnished to do so, subject to the following

 *     Software is furnished to do so, subject to the following
@@ -32,11 +32,11 @@ 
 *     The above copyright notice and this permission notice shall be

 *     The above copyright notice and this permission notice shall be

 *     included in all copies or substantial portions of the Software.

 *     included in all copies or substantial portions of the Software.

 *

 *

 *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND

 *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES

 *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES

 *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

 *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

 *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY

 *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

 *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

 *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

 *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 *     OTHER DEALINGS IN THE SOFTWARE.

 *     OTHER DEALINGS IN THE SOFTWARE.

arch/arm/boot/dts/armada-370-mirabox.dts

+5 −5
Original line number Original line Diff line number Diff line
@@ -13,17 +13,17 @@ 
 *     published by the Free Software Foundation; either version 2 of the

 *     published by the Free Software Foundation; either version 2 of the

 *     License, or (at your option) any later version.

 *     License, or (at your option) any later version.

 *

 *

 *     This file is distributed in the hope that it will be useful

 *     This file is distributed in the hope that it will be useful,

 *     but WITHOUT ANY WARRANTY; without even the implied warranty of

 *     but WITHOUT ANY WARRANTY; without even the implied warranty of

 *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *     GNU General Public License for more details.

 *     GNU General Public License for more details.

 *

 *

 * Or, alternatively

 * Or, alternatively,

 *

 *

 *  b) Permission is hereby granted, free of charge, to any person

 *  b) Permission is hereby granted, free of charge, to any person

 *     obtaining a copy of this software and associated documentation

 *     obtaining a copy of this software and associated documentation

 *     files (the "Software"), to deal in the Software without

 *     files (the "Software"), to deal in the Software without

 *     restriction, including without limitation the rights to use

 *     restriction, including without limitation the rights to use,

 *     copy, modify, merge, publish, distribute, sublicense, and/or

 *     copy, modify, merge, publish, distribute, sublicense, and/or

 *     sell copies of the Software, and to permit persons to whom the

 *     sell copies of the Software, and to permit persons to whom the

 *     Software is furnished to do so, subject to the following

 *     Software is furnished to do so, subject to the following
@@ -32,11 +32,11 @@ 
 *     The above copyright notice and this permission notice shall be

 *     The above copyright notice and this permission notice shall be

 *     included in all copies or substantial portions of the Software.

 *     included in all copies or substantial portions of the Software.

 *

 *

 *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND

 *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES

 *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES

 *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

 *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

 *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY

 *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

 *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

 *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

 *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 *     OTHER DEALINGS IN THE SOFTWARE.

 *     OTHER DEALINGS IN THE SOFTWARE.

arch/arm/boot/dts/armada-370-netgear-rn102.dts

+5 −5
Original line number Original line Diff line number Diff line
@@ -13,17 +13,17 @@ 
 *     published by the Free Software Foundation; either version 2 of the

 *     published by the Free Software Foundation; either version 2 of the

 *     License, or (at your option) any later version.

 *     License, or (at your option) any later version.

 *

 *

 *     This file is distributed in the hope that it will be useful

 *     This file is distributed in the hope that it will be useful,

 *     but WITHOUT ANY WARRANTY; without even the implied warranty of

 *     but WITHOUT ANY WARRANTY; without even the implied warranty of

 *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *     GNU General Public License for more details.

 *     GNU General Public License for more details.

 *

 *

 * Or, alternatively

 * Or, alternatively,

 *

 *

 *  b) Permission is hereby granted, free of charge, to any person

 *  b) Permission is hereby granted, free of charge, to any person

 *     obtaining a copy of this software and associated documentation

 *     obtaining a copy of this software and associated documentation

 *     files (the "Software"), to deal in the Software without

 *     files (the "Software"), to deal in the Software without

 *     restriction, including without limitation the rights to use

 *     restriction, including without limitation the rights to use,

 *     copy, modify, merge, publish, distribute, sublicense, and/or

 *     copy, modify, merge, publish, distribute, sublicense, and/or

 *     sell copies of the Software, and to permit persons to whom the

 *     sell copies of the Software, and to permit persons to whom the

 *     Software is furnished to do so, subject to the following

 *     Software is furnished to do so, subject to the following
@@ -32,11 +32,11 @@ 
 *     The above copyright notice and this permission notice shall be

 *     The above copyright notice and this permission notice shall be

 *     included in all copies or substantial portions of the Software.

 *     included in all copies or substantial portions of the Software.

 *

 *

 *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND

 *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES

 *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES

 *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

 *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

 *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY

 *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

 *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

 *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

 *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 *     OTHER DEALINGS IN THE SOFTWARE.

 *     OTHER DEALINGS IN THE SOFTWARE.