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

Commit 44d82e29 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull arm-soc Marvell Orion device-tree updates from Olof Johansson:
 "This contains a set of device-tree conversions for Marvell Orion
  platforms that were staged early but took a few tries to get the
  branch into a format where it was suitable for us to pick up.

  Given that most people working on these platforms are hobbyists with
  limited time, we were a bit more flexible with merging it even though
  it came in late."

* tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (21 commits)
  ARM: Kirkwood: Replace mrvl with marvell
  ARM: Kirkwood: Describe GoFlex Net LEDs and SATA in DT.
  ARM: Kirkwood: Describe Dreamplug LEDs in DT.
  ARM: Kirkwood: Describe iConnects LEDs in DT.
  ARM: Kirkwood: Describe iConnects temperature sensor in DT.
  ARM: Kirkwood: Describe IB62x0 LEDs in DT.
  ARM: Kirkwood: Describe IB62x0 gpio-keys in DT.
  ARM: Kirkwood: Describe DNS32? gpio-keys in DT.
  ARM: Kirkwood: Move common portions into a kirkwood-dnskw.dtsi
  ARM: Kirkwood: Replace DNS-320/DNS-325 leds with dt bindings
  ARM: Kirkwood: Describe DNS325 temperature sensor in DT.
  ARM: Kirkwood: Use DT to configure SATA device.
  ARM: kirkwood: use devicetree for SPI on dreamplug
  ARM: kirkwood: Add LS-XHL and LS-CHLv2 support
  ARM: Kirkwood: Initial DTS support for Kirkwood GoFlex Net
  ARM: Kirkwood: Add basic device tree support for QNAP TS219.
  ATA: sata_mv: Add device tree support
  ARM: Orion: DTify the watchdog timer.
  ARM: Orion: Add arch support needed for I2C via DT.
  ARM: kirkwood: use devicetree for orion-spi
  ...

Conflicts:
	drivers/watchdog/orion_wdt.c
parents bfdf85df 15a1e1ba

Documentation/devicetree/bindings/arm/mrvl/intc.txt

+20 −0
Original line number Original line Diff line number Diff line
@@ -38,3 +38,23 @@ Example: 
		reg-names = "mux status", "mux mask";

		reg-names = "mux status", "mux mask";

		mrvl,intc-nr-irqs = <2>;

		mrvl,intc-nr-irqs = <2>;

	};

	};



* Marvell Orion Interrupt controller



Required properties

- compatible :  Should be "marvell,orion-intc".

- #interrupt-cells: Specifies the number of cells needed to encode an

  interrupt source. Supported value is <1>.

- interrupt-controller : Declare this node to be an interrupt controller.

- reg : Interrupt mask address. A list of 4 byte ranges, one per controller.

        One entry in the list represents 32 interrupts.



Example:



	intc: interrupt-controller {

        	compatible = "marvell,orion-intc", "marvell,intc";

		interrupt-controller;

		#interrupt-cells = <1>;

                reg = <0xfed20204 0x04>,

		      <0xfed20214 0x04>;

        };

Documentation/devicetree/bindings/ata/marvell.txt

0 → 100644
+16 −0
Original line number Original line Diff line number Diff line 
* Marvell Orion SATA



Required Properties:

- compatibility : "marvell,orion-sata"

- reg           : Address range of controller

- interrupts    : Interrupt controller is using

- nr-ports      : Number of SATA ports in use.



Example:



	sata@80000 {

		compatible = "marvell,orion-sata";

		reg = <0x80000 0x5000>;

		interrupts = <21>;

		nr-ports = <2>;

	}

Documentation/devicetree/bindings/gpio/mrvl-gpio.txt

+23 −0
Original line number Original line Diff line number Diff line
@@ -27,3 +27,26 @@ Example: 
		interrupt-controller;

		interrupt-controller;

		#interrupt-cells = <1>;

		#interrupt-cells = <1>;

      };

      };



* Marvell Orion GPIO Controller



Required properties:

- compatible         : Should be "marvell,orion-gpio"

- reg                : Address and length of the register set for controller.

- gpio-controller    : So we know this is a gpio controller.

- ngpio              : How many gpios this controller has.

- interrupts	     : Up to 4 Interrupts for the controller.



Optional properties:

- mask-offset        : For SMP Orions, offset for Nth CPU



Example:



		gpio0: gpio@10100 {

			compatible = "marvell,orion-gpio";

			#gpio-cells = <2>;

			gpio-controller;

			reg = <0x10100 0x40>;

			ngpio = <32>;

			interrupts = <35>, <36>, <37>, <38>;

		};

Documentation/devicetree/bindings/watchdog/marvel.txt

0 → 100644
+14 −0
Original line number Original line Diff line number Diff line 
* Marvell Orion Watchdog Time



Required Properties:



- Compatibility : "marvell,orion-wdt"

- reg		: Address of the timer registers



Example:



	wdt@20300 {

		compatible = "marvell,orion-wdt";

		reg = <0x20300 0x28>;

		status = "okay";

	};

arch/arm/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -1151,6 +1151,7 @@ config PLAT_ORION 
	bool

	bool

	select CLKSRC_MMIO

	select CLKSRC_MMIO

	select GENERIC_IRQ_CHIP

	select GENERIC_IRQ_CHIP

	select IRQ_DOMAIN

	select COMMON_CLK

	select COMMON_CLK





config PLAT_PXA

config PLAT_PXA