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

Commit 7bc13d78 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'integrator-for-v3.13-2' of... 

Merge tag 'integrator-for-v3.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/soc

From Linus Walleij:
Integrator patches for the v3.13 kernel cycle:
- Fix up the LED support
- Update the Integrator defconfig
- Remove ATAG boot path
- Move some stuff over to the device tree

* tag 'integrator-for-v3.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator

:
  ARM: integrator: core module registers from compatible strings
  ARM: integrator: use devm_ioremap() to remap CM
  cpufreq: probe the Integrator cpufreq driver from DT
  ARM: integrator: move CM base into device tree
  ARM: integrator: decommission the <mach/irqs.h> header
  ARM: integrator: delete non-devicetree boot path
  ARM: integrator: print the Linux IRQ in LL_DEBUG code
  ARM: integrator: get the LM interrupts from DT
  ARM: integrator: update defconfig
  ARM: integrator: get the CM control register by proxy

Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
parents 1723f2a1 df36680f

Documentation/devicetree/bindings/arm/arm-boards

+47 −3
Original line number Diff line number Diff line
@@ -9,9 +9,53 @@ Required properties (in root node): 


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.

Required nodes:



- core-module: the root node to the Integrator platforms must have

  a core-module with regs and the compatible string

  "arm,core-module-integrator"



  Required properties for the core module:

  - regs: the location and size of the core module registers, one

    range of 0x200 bytes.



- syscon: the root node of the Integrator platforms must have a

  system controller node pointong to the control registers,

  with the compatible string

  "arm,integrator-ap-syscon"

  "arm,integrator-cp-syscon"

  respectively.



  Required properties for the system controller:

  - regs: the location and size of the system controller registers,

    one range of 0x100 bytes.



  Required properties for the AP system controller:

  - interrupts: the AP syscon node must include the logical module

    interrupts, stated in order of module instance <module 0>,

    <module 1>, <module 2> ... for the CP system controller this

    is not required not of any use.



/dts-v1/;

/include/ "integrator.dtsi"



/ {

	model = "ARM Integrator/AP";

	compatible = "arm,integrator-ap";



	core-module@10000000 {

		compatible = "arm,core-module-integrator";

		reg = <0x10000000 0x200>;

	};



	syscon {

		compatible = "arm,integrator-ap-syscon";

		reg = <0x11000000 0x100>;

		interrupt-parent = <&pic>;

		/* These are the logic module IRQs */

		interrupts = <9>, <10>, <11>, <12>;

	};

};





ARM Versatile Application and Platform Baseboards

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -317,6 +317,7 @@ config ARCH_INTEGRATOR 
	select NEED_MACH_MEMORY_H

	select PLAT_VERSATILE

	select SPARSE_IRQ

	select USE_OF

	select VERSATILE_FPGA_IRQ

	help

	  Support for ARM's Integrator platform.

arch/arm/boot/dts/integrator.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -5,6 +5,11 @@ 
/include/ "skeleton.dtsi"



/ {

	core-module@10000000 {

		compatible = "arm,core-module-integrator";

		reg = <0x10000000 0x200>;

	};



	timer@13000000 {

		reg = <0x13000000 0x100>;

		interrupt-parent = <&pic>;

arch/arm/boot/dts/integratorap.dts

+4 −1
Original line number Diff line number Diff line
@@ -19,8 +19,11 @@ 
	};



	syscon {

		/* AP system controller registers */

		compatible = "arm,integrator-ap-syscon";

		reg = <0x11000000 0x100>;

		interrupt-parent = <&pic>;

		/* These are the logical module IRQs */

		interrupts = <9>, <10>, <11>, <12>;

	};



	timer0: timer@13000000 {

arch/arm/boot/dts/integratorcp.dts

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
		bootargs = "root=/dev/ram0 console=ttyAMA0,38400n8 earlyprintk";

	};



	cpcon {

		/* CP controller registers */

	syscon {

		compatible = "arm,integrator-cp-syscon";

		reg = <0xcb000000 0x100>;

	};