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

Commit 2843c7d2 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-devel-dt-merged-for-v3.7' of... 

Merge tag 'omap-devel-dt-merged-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Device tree related changes for omaps.

Note that this branch is based on omap-cleanup-sparseirq-for-v3.7
to avoid merge conflicts with the sparseirq changes for gpio-twl4030
driver.

* tag 'omap-devel-dt-merged-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  arm/dts: Mux uart pins for omap4-sdp
  ARM: OMAP2+: select PINCTRL in Kconfig
  arm/dts: Add pinctrl driver entries for omap2/3/4
  arm/dts: Add omap36xx.dtsi file and rename omap3-beagle to omap3-beagle-xm
  ARM: dts: omap3-overo: Add support for the blue LED
  Documentation: dt: Update the OMAP documentation with Overo/Toby
  ARM: dts: OMAP3: Add support for Gumstix Overo with Tobi expansion board
  ARM: dts: OMAP4: Add reg and interrupts for every nodes
  ARM: dts: AM33XX: Specify reg and interrupt property for all nodes
  ARM: dts: AM33XX: Convert all hex numbers to lower-case
  ARM: dts: omap3-beagle: Enable audio support
  ARM: dts: omap5: Add McPDM and DMIC section to the dtsi file
  ARM: dts: omap5: Add McBSP entries
  ARM: dts: omap4: Add reg-names for McPDM and DMIC
  ARM: dts: omap4: Add McBSP entries
  ARM: dts: omap3: Add McBSP entries
  ARM: dts: omap2420-h4: Include omap2420.dtsi file instead the common omap2
  ARM: dts: omap2: Add McBSP entries for OMAP2420 and OMAP2430 SoC
  ARM: dts: omap3-beagle: Add heartbeat and mmc LEDs support
  ARM: dts: omap3: Add gpio-twl4030 properties for BeagleBoard and omap3-EVM
  ...
parents 084cfebc 6bfc82ff

Documentation/ABI/testing/sysfs-bus-pci

+12 −0
Original line number Diff line number Diff line
@@ -210,3 +210,15 @@ Users: 
		firmware assigned instance number of the PCI

		device that can help in understanding the firmware

		intended order of the PCI device.



What:		/sys/bus/pci/devices/.../d3cold_allowed

Date:		July 2012

Contact:	Huang Ying <ying.huang@intel.com>

Description:

		d3cold_allowed is bit to control whether the corresponding PCI

		device can be put into D3Cold state.  If it is cleared, the

		device will never be put into D3Cold state.  If it is set, the

		device may be put into D3Cold state if other requirements are

		satisfied too.  Reading this attribute will show the current

		value of d3cold_allowed bit.  Writing this attribute will set

		the value of d3cold_allowed bit.

Documentation/ABI/testing/sysfs-tty

+9 −0
Original line number Diff line number Diff line
@@ -17,3 +17,12 @@ Description: 
		 device, like 'tty1'.

		 The file supports poll() to detect virtual

		 console switches.



What:		/sys/class/tty/ttyS0/uartclk

Date:		Sep 2012

Contact:	Tomas Hlavacek <tmshlvck@gmail.com>

Description:

		 Shows the current uartclk value associated with the

		 UART port in serial_core, that is bound to TTY like ttyS0.

		 uartclk = 16 * baud_base

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

+3 −0
Original line number Diff line number Diff line
@@ -36,6 +36,9 @@ Boards: 
- OMAP3 BeagleBoard : Low cost community board

  compatible = "ti,omap3-beagle", "ti,omap3"



- OMAP3 Tobi with Overo : Commercial expansion board with daughter board

  compatible = "ti,omap3-tobi", "ti,omap3-overo", "ti,omap3"



- OMAP4 SDP : Software Developement Board

  compatible = "ti,omap4-sdp", "ti,omap4430"

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

+6 −0
Original line number Diff line number Diff line
@@ -11,6 +11,11 @@ Required properties: 
- interrupt-controller: Mark the device node as an interrupt controller

  The first cell is the GPIO number.

  The second cell is not used.

- ti,use-leds : Enables LEDA and LEDB outputs if set

- ti,debounce : if n-th bit is set, debounces GPIO-n

- ti,mmc-cd : if n-th bit is set, GPIO-n controls VMMC(n+1)

- ti,pullups : if n-th bit is set, set a pullup on GPIO-n

- ti,pulldowns : if n-th bit is set, set a pulldown on GPIO-n



Example:
@@ -20,4 +25,5 @@ twl_gpio: gpio { 
    gpio-controller;

    #interrupt-cells = <2>;

    interrupt-controller;

    ti,use-leds;

};

Documentation/devicetree/bindings/i2c/trivial-devices.txt

+1 −0
Original line number Diff line number Diff line
@@ -56,3 +56,4 @@ stm,m41t00 Serial Access TIMEKEEPER 
stm,m41t62		Serial real-time clock (RTC) with alarm

stm,m41t80		M41T80 - SERIAL ACCESS RTC WITH ALARMS

ti,tsc2003		I2C Touch-Screen Controller

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