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

Commit 451ce7f9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull general arm-soc cleanups from Arnd Bergmann:
 "These are all boring changes, moving stuff around or renaming things
  mostly, and also getting rid of stuff that is duplicate or should not
  be there to start with.  Platform-wise this is all over the place,
  mainly omap, samsung, at91, imx and tegra."

Resolve trivial conflict in arch/arm/mach-omap2/clockdomains3xxx_data.c

* tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (67 commits)
  ARM: clps711x: Remove the setting of the time
  ARM: clps711x: Removed superfluous transform virt_to_bus and related functions
  ARM: clps711x/p720t: Replace __initcall by .init_early call
  ARM: S3C24XX: Remove unused GPIO definitions for Openmoko GTA02 board
  ARM: S3C24XX: Remove unused GPIO definitions for port J
  ARM: S3C24XX: Remove unused GPA, GPE, GPH bank GPIO aliases
  ARM: S3C24XX: Convert the touchscreen setup code to common GPIO API
  ARM: S3C24XX: Convert the PM code to gpiolib API
  ARM: S3C24XX: Convert QT2410 board file to the gpiolib API
  ARM: S3C24XX: Convert SMDK board file to the gpiolib API
  ARM: S3C24XX: Free the backlight gpio requested in Mini2440 board code
  ARM: imx: remove unused pdata from device macros
  ARM: imx: Kconfig: Remove IMX_HAVE_PLATFORM_IMX_SSI from MACH_MX25_3DS
  ARM: at91: fix new build errors
  ARM: at91: add AIC5 support
  ARM: at91: remove mach/irqs.h
  ARM: at91: sparse irq support
  ARM: at91: at91 based machines specify their own irq handler at run time
  ARM: at91: remove static irq priorities for sam9x5
  ARM: at91: add of irq priorities support
  ...
parents b85c14fb 1a33a4eb

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

+6 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ Required properties: 
- compatible: Should be "atmel,<chip>-aic"

- interrupt-controller: Identifies the node as an interrupt controller.

- interrupt-parent: For single AIC system, it is an empty property.

- #interrupt-cells: The number of cells to define the interrupts. It sould be 2.

- #interrupt-cells: The number of cells to define the interrupts. It sould be 3.

  The first cell is the IRQ number (aka "Peripheral IDentifier" on datasheet).

  The second cell is used to specify flags:

    bits[3:0] trigger type and level flags:
@@ -14,7 +14,10 @@ Required properties: 
      8 = active low level-sensitive.

      Valid combinations are 1, 2, 3, 4, 8.

      Default flag for internal sources should be set to 4 (active high).

  The third cell is used to specify the irq priority from 0 (lowest) to 7

  (highest).

- reg: Should contain AIC registers location and length

- atmel,external-irqs: u32 array of external irqs.



Examples:

	/*
@@ -24,7 +27,7 @@ Examples: 
		compatible = "atmel,at91rm9200-aic";

		interrupt-controller;

		interrupt-parent;

		#interrupt-cells = <2>;

		#interrupt-cells = <3>;

		reg = <0xfffff000 0x200>;

	};
@@ -34,5 +37,5 @@ Examples: 
	dma: dma-controller@ffffec00 {

		compatible = "atmel,at91sam9g45-dma";

		reg = <0xffffec00 0x200>;

		interrupts = <21 4>;

		interrupts = <21 4 5>;

	};

Documentation/devicetree/bindings/arm/tegra/emc.txt→Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-emc.txt

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ Child device nodes describe the memory settings for different configurations and 


Example:



	emc@7000f400 {

	memory-controller@7000f400 {

		#address-cells = < 1 >;

		#size-cells = < 0 >;

		compatible = "nvidia,tegra20-emc";

Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-mc.txt

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ Required properties: 
- interrupts : Should contain MC General interrupt.



Example:

	mc {

	memory-controller@0x7000f000 {

		compatible = "nvidia,tegra20-mc";

		reg = <0x7000f000 0x024

		       0x7000f03c 0x3c4>;

Documentation/devicetree/bindings/arm/tegra/nvidia,tegra30-mc.txt

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ Required properties: 
- interrupts : Should contain MC General interrupt.



Example:

	mc {

	memory-controller {

		compatible = "nvidia,tegra30-mc";

		reg = <0x7000f000 0x010

		       0x7000f03c 0x1b4