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

Commit d1226e8f authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'devel-omap-device-for-v3.7' of... 

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

Kevin Hilman <khilman@ti.com>:

Updates for omap_device layer for v3.7.

Allows omap_device layer to keep track of driver bound status in order
to make more intelligent decisions about idling unused devices.

* tag 'devel-omap-device-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP: omap_device: idle devices with no driver bound
  ARM: OMAP: omap_device: don't attempt late suspend if no driver bound
  ARM: OMAP: omap_device: keep track of driver bound status
  + sync to 3.6-rc5
parents cccc277b 47d85ec2

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/feature-removal-schedule.txt

+1 −1
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ Why: KVM tracepoints provide mostly equivalent information in a much more 
----------------------------



What:	at91-mci driver ("CONFIG_MMC_AT91")

When:	3.7

When:	3.8

Why:	There are two mci drivers: at91-mci and atmel-mci. The PDC support

	was added to atmel-mci as a first step to support more chips.

	Then at91-mci was kept only for old IP versions (on at91rm9200 and

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 6

SUBLEVEL = 0

EXTRAVERSION = -rc4

EXTRAVERSION = -rc5

NAME = Saber-toothed Squirrel



# *DOCUMENTATION*

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ config ARM 
	select HAVE_DMA_API_DEBUG

	select HAVE_IDE if PCI || ISA || PCMCIA

	select HAVE_DMA_ATTRS

	select HAVE_DMA_CONTIGUOUS if (CPU_V6 || CPU_V6K || CPU_V7)

	select HAVE_DMA_CONTIGUOUS if MMU

	select HAVE_MEMBLOCK

	select RTC_LIB

	select SYS_SUPPORTS_APM_EMULATION

arch/arm/boot/dts/at91sam9g25ek.dts

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
	compatible = "atmel,at91sam9g25ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9";



	chosen {

		bootargs = "128M console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=ubifs ubi.mtd=1 root=ubi0:rootfs";

		bootargs = "console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=ubifs ubi.mtd=1 root=ubi0:rootfs";

	};



	ahb {