Commit ebb7c983 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'arm-soc/for-4.6/soc-arm64' of http://github.com/Broadcom/stblinux into next/arm64 

Merge "Broadcom soc-arm64 changes for 4.6" from Florian Fainelli:

This pull request contains Broadcom ARM64-based SoC/platform changes:

- Anup, Ray and Dhanajay enable COMMON_CLK_IPROC, PINCTRL and GPIOLIB for iProc
  SoCs to get the corresponding iProc-based drivers to be available and work

- Zi adds support for Broadcom's Vulcan processor by adding a reference
  board Device Tree file along with a config ARCH_VULCAN symbol

- Jayachandran C. adds the Broadcom implementor ID and part ID for the Vulcan
  processors

* tag 'arm-soc/for-4.6/soc-arm64' of http://github.com/Broadcom/stblinux:
  arm64: cputype info for Broadcom Vulcan
  arm64: Broadcom Vulcan support
  arm64: Select COMMON_CLK_IPROC, PINCTRL and GPIOLIB for iProc SoCs
parents f9098036 9eb8a2cd

arch/arm64/Kconfig.platforms

+8 −0
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ config ARCH_ALPINE 


config ARCH_BCM_IPROC

	bool "Broadcom iProc SoC Family"

	select COMMON_CLK_IPROC

	select PINCTRL

	select ARCH_REQUIRE_GPIOLIB

	help

	  This enables support for Broadcom iProc based SoCs
@@ -145,6 +148,11 @@ config ARCH_VEXPRESS 
	  This enables support for the ARMv8 software model (Versatile

	  Express).



config ARCH_VULCAN

	bool "Broadcom Vulcan SOC Family"

	help

	  This enables support for Broadcom Vulcan SoC Family



config ARCH_XGENE

	bool "AppliedMicro X-Gene SOC Family"

	help

arch/arm64/boot/dts/broadcom/Makefile

+1 −0
Original line number Diff line number Diff line 
dtb-$(CONFIG_ARCH_BCM_IPROC) += ns2-svk.dtb

dtb-$(CONFIG_ARCH_VULCAN) += vulcan-eval.dtb



always		:= $(dtb-y)

subdir-y	:= $(dts-dirs)

arch/arm64/boot/dts/broadcom/vulcan-eval.dts

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

 * dts file for Broadcom (BRCM) Vulcan Evaluation Platform

 *

 * Copyright (c) 2013-2016 Broadcom

 *

 * This program 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.

 */



/dts-v1/;



#include "vulcan.dtsi"



/ {

	model = "Broadcom Vulcan Eval Platform";

	compatible = "brcm,vulcan-eval", "brcm,vulcan-soc";



	memory {

		device_type = "memory";

		reg = <0x00000000 0x80000000 0x0 0x80000000>,  /* 2G @ 2G  */

		      <0x00000008 0x80000000 0x0 0x80000000>;  /* 2G @ 34G */

	};



	aliases {

		serial0 = &uart0;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};

};

arch/arm64/boot/dts/broadcom/vulcan.dtsi

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

 * dtsi file for Broadcom (BRCM) Vulcan processor

 *

 * Copyright (c) 2013-2016 Broadcom

 * Author: Zi Shen Lim <zlim@broadcom.com>

 *

 * This program 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.

 */



#include <dt-bindings/interrupt-controller/arm-gic.h>



/ {

	model = "Broadcom Vulcan";

	compatible = "brcm,vulcan-soc";

	interrupt-parent = <&gic>;

	#address-cells = <2>;

	#size-cells = <2>;



	/* just 4 cpus now, 128 needed in full config */

	cpus {

		#address-cells = <0x2>;

		#size-cells = <0x0>;



		cpu@0 {

			device_type = "cpu";

			compatible = "brcm,vulcan", "arm,armv8";

			reg = <0x0 0x0>;

			enable-method = "psci";

		};



		cpu@1 {

			device_type = "cpu";

			compatible = "brcm,vulcan", "arm,armv8";

			reg = <0x0 0x1>;

			enable-method = "psci";

		};



		cpu@2 {

			device_type = "cpu";

			compatible = "brcm,vulcan", "arm,armv8";

			reg = <0x0 0x2>;

			enable-method = "psci";

		};



		cpu@3 {

			device_type = "cpu";

			compatible = "brcm,vulcan", "arm,armv8";

			reg = <0x0 0x3>;

			enable-method = "psci";

		};

	};



	psci {

		compatible = "arm,psci-0.2";

		method = "smc";

	};



	gic: interrupt-controller@400080000 {

		compatible = "arm,gic-v3";

		#interrupt-cells = <3>;

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;

		interrupt-controller;

		#redistributor-regions = <1>;

		reg = <0x04 0x00080000 0x0 0x20000>,	/* GICD */

		      <0x04 0x01000000 0x0 0x1000000>;	/* GICR */

		interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;



		gicits: gic-its@40010000 {

			compatible = "arm,gic-v3-its";

			msi-controller;

			reg = <0x04 0x00100000 0x0 0x20000>;	/* GIC ITS */

		};

	};



	timer {

		compatible = "arm,armv8-timer";

		interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_PPI 14 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_PPI 10 IRQ_TYPE_LEVEL_HIGH>;

	};



	pmu {

		compatible = "arm,armv8-pmuv3";

		interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_HIGH>; /* PMU overflow */

	};



	clk125mhz: uart_clk125mhz {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		clock-frequency = <125000000>;

		clock-output-names = "clk125mhz";

	};



	pci {

		compatible = "pci-host-ecam-generic";

		device_type = "pci";

		#interrupt-cells = <1>;

		#address-cells = <3>;

		#size-cells = <2>;



		/* ECAM at 0x3000_0000 - 0x4000_0000 */

		reg = <0x0 0x30000000  0x0 0x10000000>;

		reg-names = "PCI ECAM";



			  /* IO 0x4000_0000 - 0x4001_0000 */

		ranges = <0x01000000 0 0x40000000 0 0x40000000 0 0x00010000

			  /* MEM 0x4800_0000 - 0x5000_0000 */

			  0x02000000 0 0x48000000 0 0x48000000 0 0x08000000

			  /* MEM64 pref 0x6_0000_0000 - 0x7_0000_0000 */

			  0x43000000 6 0x00000000 6 0x00000000 1 0x00000000>;

		interrupt-map-mask = <0 0 0 7>;

		interrupt-map =

		      /* addr  pin  ic   icaddr  icintr */

			<0 0 0  1  &gic   0 0    GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH

			 0 0 0  2  &gic   0 0    GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH

			 0 0 0  3  &gic   0 0    GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH

			 0 0 0  4  &gic   0 0    GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;

		msi-parent = <&gicits>;

		dma-coherent;

	};



	soc {

		compatible = "simple-bus";

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;



		uart0: serial@402020000 {

			compatible = "arm,pl011", "arm,primecell";

			reg = <0x04 0x02020000 0x0 0x1000>;

			interrupt-parent = <&gic>;

			interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&clk125mhz>;

			clock-names = "apb_pclk";

		};

	};



};

arch/arm64/include/asm/cputype.h

+3 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ 
#define ARM_CPU_IMP_ARM			0x41

#define ARM_CPU_IMP_APM			0x50

#define ARM_CPU_IMP_CAVIUM		0x43

#define ARM_CPU_IMP_BRCM		0x42



#define ARM_CPU_PART_AEM_V8		0xD0F

#define ARM_CPU_PART_FOUNDATION		0xD00
@@ -75,6 +76,8 @@ 


#define CAVIUM_CPU_PART_THUNDERX	0x0A1



#define BRCM_CPU_PART_VULCAN		0x516



#ifndef __ASSEMBLY__



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE