Commit 3b19119b authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'calxeda-ecx-2000' of git://sources.calxeda.com/kernel/linux into next/soc 

Support for Calxeda ECX-2000 SOC from Rob Herring

* tag 'calxeda-ecx-2000' of git://sources.calxeda.com/kernel/linux:
  ARM: highbank: Add initial ECX-2000 support
  ARM: highbank: abstract out SCU usage
  ARM: smp_twd: don't warn on no DT node
  ARM: dts: Add Calxeda ECX-2000 support
  ARM: highbank: enable coherent DMA for xgmac in dts
  ARM: highbank: disable unused sdhci and gpio in dts
  + sync to Linux 3.7-rc3
parents ccb1cfcb e095c0d1

Documentation/00-INDEX

+2 −2
Original line number Diff line number Diff line
@@ -210,6 +210,8 @@ local_ops.txt 
	- semantics and behavior of local atomic operations.

lockdep-design.txt

	- documentation on the runtime locking correctness validator.

lockup-watchdogs.txt

	- info on soft and hard lockup detectors (aka nmi_watchdog).

logo.gif

	- full colour GIF image of Linux logo (penguin - Tux).

logo.txt
@@ -240,8 +242,6 @@ netlabel/ 
	- directory with information on the NetLabel subsystem.

networking/

	- directory with info on various aspects of networking with Linux.

nmi_watchdog.txt

	- info on NMI watchdog for SMP systems.

nommu-mmap.txt

	- documentation about no-mmu memory mapping support.

numastat.txt

Documentation/devicetree/bindings/arm/atmel-at91.txt

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ PIT Timer required properties: 
  shared across all System Controller members.



TC/TCLIB Timer required properties:

- compatible: Should be "atmel,<chip>-pit".

- compatible: Should be "atmel,<chip>-tcb".

  <chip> can be "at91rm9200" or "at91sam9x5"

- reg: Should contain registers location and length

- interrupts: Should contain all interrupts for the TC block

Documentation/devicetree/bindings/arm/calxeda.txt

+10 −3
Original line number Diff line number Diff line 
Calxeda Highbank Platforms Device Tree Bindings

Calxeda Platforms Device Tree Bindings

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



Boards with Calxeda Cortex-A9 based Highbank SOC shall have the following

properties.

Boards with Calxeda Cortex-A9 based ECX-1000 (Highbank) SOC shall have the

following properties.



Required root node properties:

    - compatible = "calxeda,highbank";





Boards with Calxeda Cortex-A15 based ECX-2000 SOC shall have the following

properties.



Required root node properties:

    - compatible = "calxeda,ecx-2000";

Documentation/devicetree/bindings/pinctrl/nvidia,tegra20-pinmux.txt

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ Valid values for pin and group names are: 


    With some exceptions, these support nvidia,high-speed-mode,

    nvidia,schmitt, nvidia,low-power-mode, nvidia,pull-down-strength,

    nvidia,pull-up-strength, nvidia,slew_rate-rising, nvidia,slew_rate-falling.

    nvidia,pull-up-strength, nvidia,slew-rate-rising, nvidia,slew-rate-falling.



    drive_ao1, drive_ao2, drive_at1, drive_at2, drive_cdev1, drive_cdev2,

    drive_csus, drive_dap1, drive_dap2, drive_dap3, drive_dap4, drive_dbg,

Documentation/devicetree/bindings/pinctrl/nvidia,tegra30-pinmux.txt

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ Valid values for pin and group names are: 
  drive groups:



    These all support nvidia,pull-down-strength, nvidia,pull-up-strength,

    nvidia,slew_rate-rising, nvidia,slew_rate-falling. Most but not all

    nvidia,slew-rate-rising, nvidia,slew-rate-falling. Most but not all

    support nvidia,high-speed-mode, nvidia,schmitt, nvidia,low-power-mode.



    ao1, ao2, at1, at2, at3, at4, at5, cdev1, cdev2, cec, crt, csus, dap1,

CRA Git | Maintained and supported by SUSTech CRA and CCSE