Commit 7644a448 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'metag-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag 

Pull Metag architecture changes from James Hogan:
 - Infrastructure and DT files for TZ1090 SoC (pin control drivers
   already merged via pinctrl tree).
 - Panic on boot instead of just warning if cache aliasing possible.
 - Various SMP/hotplug fixes.
 - Various other randconfig/sparse fixes.

* tag 'metag-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag: (24 commits)
  metag: move EXPORT_SYMBOL(csum_partial) to metag_ksyms.c
  metag: cpu hotplug: route_irq: preserve irq mask
  metag: kick: add missing irq_enter/exit to kick_handler()
  metag: smp: don't spin waiting for CPU to start
  metag: smp: enable irqs after set_cpu_online
  metag: use clear_tasks_mm_cpumask()
  metag: tz1090: select and instantiate pinctrl-tz1090-pdc
  metag: tz1090: select and instantiate pinctrl-tz1090
  metag: don't check for cache aliasing on smp cpu boot
  metag: panic if cache aliasing possible
  metag: *.dts: include using preprocessor
  metag: add <dt-bindings/> symlink
  metag/.gitignore: Extend the *.dtb pattern to match the dtb.S files
  metag/traps: include setup.h for the per_cpu_trap_init declaration
  metag/traps: Mark die() as __noreturn to match the declaration.
  metag/processor.h: Add missing cpuinfo_op declaration.
  metag/setup: Restrict scope for the capabilities variable
  metag/mm/cache: Restrict scope for metag_lnkget_probe
  metag/asm/irq.h: Declare init_IRQ
  metag/kernel/irq.c: Declare root_domain as static
  ...
parents 16984ce1 c20eb0f1

Documentation/devicetree/bindings/metag/meta.txt

0 → 100644
+30 −0
Original line number Diff line number Diff line 
* Meta Processor Binding



This binding specifies what properties must be available in the device tree

representation of a Meta Processor Core, which is the root node in the tree.



Required properties:



    - compatible: Specifies the compatibility list for the Meta processor.

      The type shall be <string> and the value shall include "img,meta".



Optional properties:



    - clocks: Clock consumer specifiers as described in

      Documentation/devicetree/bindings/clock/clock-bindings.txt



    - clock-names: Clock consumer names as described in

      Documentation/devicetree/bindings/clock/clock-bindings.txt.



Clocks are identified by name. Valid clocks are:



    - "core": The Meta core clock from which the Meta timers are derived.



* Examples



/ {

	compatible = "toumaz,tz1090", "img,meta";



	clocks = <&meta_core_clk>;

	clock-names = "core";

};

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ snps Synopsys, Inc. 
st	STMicroelectronics

ste	ST-Ericsson

stericsson	ST-Ericsson

toumaz	Toumaz

ti	Texas Instruments

toshiba	Toshiba Corporation

v3	V3 Semiconductor

arch/metag/Kconfig.soc

+12 −0
Original line number Diff line number Diff line
@@ -14,6 +14,18 @@ config META21_FPGA 
	help

	  This is a Meta 2.1 FPGA bitstream, just a bare CPU.



config SOC_TZ1090

	bool "Toumaz Xenif TZ1090 SoC (Comet)"

	select METAG_LNKGET_AROUND_CACHE

	select METAG_META21

	select METAG_SMP_WRITE_REORDERING

	select PINCTRL

	select PINCTRL_TZ1090

	select PINCTRL_TZ1090_PDC

	help

	  This is a Toumaz Technology Xenif TZ1090 (A.K.A. Comet) SoC containing

	  a 2-threaded HTP.



endchoice



menu "SoC configuration"

arch/metag/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ checkflags-$(CONFIG_METAG_META12) += -DMETAC_1_2 
checkflags-$(CONFIG_METAG_META21)	+= -DMETAC_2_1

CHECKFLAGS				+= -D__metag__ $(checkflags-y)



KBUILD_DEFCONFIG			:= meta2_defconfig

KBUILD_DEFCONFIG			:= tz1090_defconfig



sflags-$(CONFIG_METAG_META12)		+= -mmetac=1.2

ifeq ($(CONFIG_METAG_META12),y)

arch/metag/boot/.gitignore

+1 −1
Original line number Diff line number Diff line 
vmlinux*

uImage*

ramdisk.*

*.dtb
 
*.dtb*

CRA Git | Maintained and supported by SUSTech CRA and CCSE