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

Commit d01e4afd 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 ARM SoC cleanups on various subarchitectures from Olof Johansson:
 "Cleanup patches for various ARM platforms and some of their associated
  drivers.  There's also a branch in here that enables Freescale i.MX to
  be part of the multiplatform support -- the first "big" SoC that is
  moved over (more multiplatform work comes in a separate branch later
  during the merge window)."

Conflicts fixed as per Olof, including a silent semantic one in
arch/arm/mach-omap2/board-generic.c (omap_prcm_restart() was renamed to
omap3xxx_restart(), and a new user of the old name was added).

* tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (189 commits)
  ARM: omap: fix typo on timer cleanup
  ARM: EXYNOS: Remove unused regs-mem.h file
  ARM: EXYNOS: Remove unused non-dt support for dwmci controller
  ARM: Kirkwood: Use hw_pci.ops instead of hw_pci.scan
  ARM: OMAP3: cm-t3517: use GPTIMER for system clock
  ARM: OMAP2+: timer: remove CONFIG_OMAP_32K_TIMER
  ARM: SAMSUNG: use devm_ functions for ADC driver
  ARM: EXYNOS: no duplicate mask/unmask in eint0_15
  ARM: S3C24XX: SPI clock channel setup is fixed for S3C2443
  ARM: EXYNOS: Remove i2c0 resource information and setting of device names
  ARM: Kirkwood: checkpatch cleanups
  ARM: Kirkwood: Fix sparse warnings.
  ARM: Kirkwood: Remove unused includes
  ARM: kirkwood: cleanup lsxl board includes
  ARM: integrator: use BUG_ON where possible
  ARM: integrator: push down SC dependencies
  ARM: integrator: delete static UART1 mapping
  ARM: integrator: delete SC mapping on the CP
  ARM: integrator: remove static CP syscon mapping
  ARM: integrator: remove static AP syscon mapping
  ...
parents 8287361a 794b175f

Documentation/devicetree/bindings/arm/arm-boards

+4 −0
Original line number Original line Diff line number Diff line
@@ -9,6 +9,10 @@ Required properties (in root node): 




FPGA type interrupt controllers, see the versatile-fpga-irq binding doc.

FPGA type interrupt controllers, see the versatile-fpga-irq binding doc.





In the root node the Integrator/CP must have a /cpcon node pointing

to the CP control registers, and the Integrator/AP must have a

/syscon node pointing to the Integrator/AP system controller.







ARM Versatile Application and Platform Baseboards

ARM Versatile Application and Platform Baseboards

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

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

Documentation/devicetree/bindings/arm/omap/counter.txt

0 → 100644
+15 −0
Original line number Original line Diff line number Diff line 
OMAP Counter-32K bindings



Required properties:

- compatible:	Must be "ti,omap-counter32k" for OMAP controllers

- reg:		Contains timer register address range (base address and length)

- ti,hwmods:	Name of the hwmod associated to the counter, which is typically

		"counter_32k"



Example:



counter32k: counter@4a304000 {

	compatible = "ti,omap-counter32k";

	reg = <0x4a304000 0x20>;

	ti,hwmods = "counter_32k";

};

Documentation/devicetree/bindings/arm/omap/timer.txt

0 → 100644
+31 −0
Original line number Original line Diff line number Diff line 
OMAP Timer bindings



Required properties:

- compatible:		Must be "ti,omap2-timer" for OMAP2+ controllers.

- reg:			Contains timer register address range (base address and

			length).

- interrupts: 		Contains the interrupt information for the timer. The

			format is being dependent on which interrupt controller

			the OMAP device uses.

- ti,hwmods:		Name of the hwmod associated to the timer, "timer<X>",

			where <X> is the instance number of the timer from the

			HW spec.



Optional properties:

- ti,timer-alwon:	Indicates the timer is in an alway-on power domain.

- ti,timer-dsp:		Indicates the timer can interrupt the on-chip DSP in

			addition to the ARM CPU.

- ti,timer-pwm: 	Indicates the timer can generate a PWM output.

- ti,timer-secure: 	Indicates the timer is reserved on a secure OMAP device

			and therefore cannot be used by the kernel.



Example:



timer12: timer@48304000 {

	compatible = "ti,omap2-timer";

	reg = <0x48304000 0x400>;

	interrupts = <95>;

	ti,hwmods = "timer12"

	ti,timer-alwon;

	ti,timer-secure;

};

Documentation/devicetree/bindings/bus/omap-ocp2scp.txt

+18 −0
Original line number Original line Diff line number Diff line
@@ -2,9 +2,27 @@ 




properties:

properties:

- compatible : Should be "ti,omap-ocp2scp"

- compatible : Should be "ti,omap-ocp2scp"

- reg : Address and length of the register set for the device

- #address-cells, #size-cells : Must be present if the device has sub-nodes

- #address-cells, #size-cells : Must be present if the device has sub-nodes

- ranges : the child address space are mapped 1:1 onto the parent address space

- ranges : the child address space are mapped 1:1 onto the parent address space

- ti,hwmods : must be "ocp2scp_usb_phy"

- ti,hwmods : must be "ocp2scp_usb_phy"





Sub-nodes:

Sub-nodes:

All the devices connected to ocp2scp are described using sub-node to ocp2scp

All the devices connected to ocp2scp are described using sub-node to ocp2scp



ocp2scp@4a0ad000 {

	compatible = "ti,omap-ocp2scp";

	reg = <0x4a0ad000 0x1f>;

	#address-cells = <1>;

	#size-cells = <1>;

	ranges;

	ti,hwmods = "ocp2scp_usb_phy";



	subnode1 {

	...

	};



	subnode2 {

	...

	};

};

Documentation/devicetree/bindings/i2c/i2c-imx.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -12,13 +12,13 @@ Optional properties: 
Examples:

Examples:





i2c@83fc4000 { /* I2C2 on i.MX51 */

i2c@83fc4000 { /* I2C2 on i.MX51 */

	compatible = "fsl,imx51-i2c", "fsl,imx1-i2c";

	compatible = "fsl,imx51-i2c", "fsl,imx21-i2c";

	reg = <0x83fc4000 0x4000>;

	reg = <0x83fc4000 0x4000>;

	interrupts = <63>;

	interrupts = <63>;

};

};





i2c@70038000 { /* HS-I2C on i.MX51 */

i2c@70038000 { /* HS-I2C on i.MX51 */

	compatible = "fsl,imx51-i2c", "fsl,imx1-i2c";

	compatible = "fsl,imx51-i2c", "fsl,imx21-i2c";

	reg = <0x70038000 0x4000>;

	reg = <0x70038000 0x4000>;

	interrupts = <64>;

	interrupts = <64>;

	clock-frequency = <400000>;

	clock-frequency = <400000>;