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

Commit b599dc07 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v3.8/dt-signed' of... 

Merge tag 'omap-for-v3.8/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
From Tony Lindgren <tony@atomide.com>:

Device tree related changes for omaps updating the
various .dts files, and timer related changes to allow
configuring the timer via device tree.

* tag 'omap-for-v3.8/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

: (48 commits)
  usb: musb: dsps: dt binding - add resources, example
  ARM: dts: omap4-sdp: Add pinmux configuration for HDMI
  ARM: dts: omap4-panda: Add pinmux configuration for HDMI
  ARM: dts: Makefile: Add the am335x-evmsk target in dtbs list
  ARM: dts: AM33XX: Add usbss node
  ARM: dts: AM33XX: Add push-buttons device tree data to am335x-evmsk
  ARM: dts: AM33XX: Add pinmux configuration for gpio-keys to EVMSK
  ARM: dts: AM33XX: Add user-leds device tree data to am335x-evmsk
  ARM: dts: AM33XX: Add pinmux configuration for gpio-leds to EVMSK
  ARM: dts: AM33XX: Add user-leds device tree data to am335x-bone
  ARM: dts: AM33XX: Add pinmux configuration for user-leds to BONE
  ARM: dts: AM33XX: Add volume-keys device tree data to am335x-evm
  ARM: dts: AM33XX: Add pinmux configuration for volume-keys to EVM
  ARM: dts: AM33XX: Add matrix keypad device tree data to am335x-evm
  ARM: dts: AM33XX: Add pinmux configuration for matrix keypad to EVM
  ARM: dts: omap5-evm: LPDDR2 memory device details for EVM
  ARM: dts: omap5: EMIF device tree data for OMAP5 boards
  ARM: dts: omap5-evm: Fix size of memory defined for EVM
  ARM: OMAP2+: Add device-tree support for 32kHz counter
  ARM: OMAP: Add DT support for timer driver
  ...

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents b1f71bd0 d308ba50

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

0 → 100644
+15 −0
Original line number 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 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 Diff line number Diff line
@@ -2,9 +2,27 @@ 


properties:

- 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

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

- ti,hwmods : must be "ocp2scp_usb_phy"



Sub-nodes:

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/trivial-devices.txt

+2 −0
Original line number Diff line number Diff line
@@ -55,5 +55,7 @@ st-micro,24c256 i2c serial eeprom (24cxx) 
stm,m41t00		Serial Access TIMEKEEPER

stm,m41t62		Serial real-time clock (RTC) with alarm

stm,m41t80		M41T80 - SERIAL ACCESS RTC WITH ALARMS

taos,tsl2550		Ambient Light Sensor with SMBUS/Two Wire Serial Interface

ti,tsc2003		I2C Touch-Screen Controller

ti,tmp102		Low Power Digital Temperature Sensor with SMBUS/Two Wire Serial Interface

ti,tmp275		Digital Temperature Sensor

Documentation/devicetree/bindings/usb/am33xx-usb.txt

+21 −0
Original line number Diff line number Diff line 
AM33XX MUSB GLUE

 - compatible : Should be "ti,musb-am33xx"

 - reg : offset and length of register sets, first usbss, then for musb instances

 - interrupts : usbss, musb instance interrupts in order

 - ti,hwmods : must be "usb_otg_hs"

 - multipoint : Should be "1" indicating the musb controller supports

   multipoint. This is a MUSB configuration-specific setting.
@@ -12,3 +14,22 @@ AM33XX MUSB GLUE 
   represents PERIPHERAL.

 - power : Should be "250". This signifies the controller can supply upto

   500mA when operating in host mode.



Example:



usb@47400000  {

	compatible = "ti,musb-am33xx";

	reg = <0x47400000 0x1000	/* usbss */

	       0x47401000 0x800		/* musb instance 0 */

	       0x47401800 0x800>;	/* musb instance 1 */

	interrupts = <17		/* usbss */

		      18		/* musb instance 0 */

		      19>;		/* musb instance 1 */

	multipoint = <1>;

	num-eps = <16>;

	ram-bits = <12>;

	port0-mode = <3>;

	port1-mode = <3>;

	power = <250>;

	ti,hwmods = "usb_otg_hs";

};