Commit d5935b07 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM64 SoC changes from Arnd Bergmann:
 "Starting with 3.18, we are merging SoC-specific changes for arm64
  through the arm-soc tree, like we have been doing for arm32.

  This time, there is only one set of changes, adding support for the
  Cavium "Thunder" Soc family.  Since the changes are relatively small,
  this includes Kconfig, defconfig and DT changes.

  If all goes well, we will never require adding actual C source code
  for platform support in arm64, given that the architecture is more
  clearly defined and we have moved out a lot of the platform specifics
  into device drivers for arm32 already"

* tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  arm64, defconfig: Enable Cavium Thunder SoC in defconfig
  arm64, thunder: Add Kconfig option for Cavium Thunder SoC Family
  arm64, thunder: Document devicetree bindings for Cavium Thunder SoC
  arm64, thunder: Add initial dts for Cavium Thunder SoC
parents f86dc4b0 18ef9fef

Documentation/devicetree/bindings/arm/cavium-thunder.txt

0 → 100644
+10 −0
Original line number Diff line number Diff line 
Cavium Thunder platform device tree bindings

--------------------------------------------



Boards with Cavium's Thunder SoC shall have following properties.



Root Node

---------

Required root node properties:



  - compatible = "cavium,thunder-88xx";

Documentation/devicetree/bindings/arm/cpus.txt

+1 −0
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ nodes to be present and contain the properties described below. 
			    "arm,cortex-r5"

			    "arm,cortex-r7"

			    "brcm,brahma-b15"

			    "cavium,thunder"

			    "faraday,fa526"

			    "intel,sa110"

			    "intel,sa1100"

arch/arm64/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -135,6 +135,11 @@ source "kernel/Kconfig.freezer" 


menu "Platform selection"



config ARCH_THUNDER

	bool "Cavium Inc. Thunder SoC Family"

	help

	  This enables support for Cavium's Thunder Family of SoCs.



config ARCH_VEXPRESS

	bool "ARMv8 software model (Versatile Express)"

	select ARCH_REQUIRE_GPIOLIB

arch/arm64/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line 
dtb-$(CONFIG_ARCH_THUNDER) += thunder-88xx.dtb

dtb-$(CONFIG_ARCH_VEXPRESS) += rtsm_ve-aemv8a.dtb foundation-v8.dtb

dtb-$(CONFIG_ARCH_XGENE) += apm-mustang.dtb

arch/arm64/boot/dts/thunder-88xx.dts

0 → 100644
+67 −0
Original line number Diff line number Diff line 
/*

 * Cavium Thunder DTS file - Thunder board description

 *

 * Copyright (C) 2014, Cavium Inc.

 *

 * 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 library is free software; you can redistribute it and/or

 *     modify it under the terms of the GNU General Public License as

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

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

 *

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

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

 *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *     GNU General Public License for more details.

 *

 *     You should have received a copy of the GNU General Public

 *     License along with this library; if not, write to the Free

 *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,

 *     MA 02110-1301 USA

 *

 * 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/;



/include/ "thunder-88xx.dtsi"



/ {

	model = "Cavium ThunderX CN88XX board";

	compatible = "cavium,thunder-88xx";



	aliases {

		serial0 = &uaa0;

		serial1 = &uaa1;

	};



	memory@00000000 {

		device_type = "memory";

		reg = <0x0 0x00000000 0x0 0x80000000>;

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE