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

Commit 2bc733e8 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes 

ARM: i.MX: Fix SSI clock associations for i.MX25/i.MX35

* tag 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6:
  ARM: clk-imx35: Fix SSI clock registration
  ARM: clk-imx25: Fix SSI clock registration
  + Linux 3.6-rc5
parents f5a60d4e 48540058

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.

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/include/asm/dma-mapping.h

+7 −0
Original line number Diff line number Diff line
@@ -202,6 +202,13 @@ static inline void dma_free_writecombine(struct device *dev, size_t size, 
	return dma_free_attrs(dev, size, cpu_addr, dma_handle, &attrs);

}



/*

 * This can be called during early boot to increase the size of the atomic

 * coherent DMA pool above the default value of 256KiB. It must be called

 * before postcore_initcall.

 */

extern void __init init_dma_coherent_pool_size(unsigned long size);



/*

 * This can be called during boot to increase the size of the consistent

 * DMA region above it's default value of 2MB. It must be called before the

arch/arm/mach-imx/clk-imx25.c

+2 −4
Original line number Diff line number Diff line
@@ -222,10 +222,8 @@ int __init mx25_clocks_init(void) 
	clk_register_clkdev(clk[lcdc_ipg], "ipg", "imx-fb.0");

	clk_register_clkdev(clk[lcdc_ahb], "ahb", "imx-fb.0");

	clk_register_clkdev(clk[wdt_ipg], NULL, "imx2-wdt.0");

	clk_register_clkdev(clk[ssi1_ipg_per], "per", "imx-ssi.0");

	clk_register_clkdev(clk[ssi1_ipg], "ipg", "imx-ssi.0");

	clk_register_clkdev(clk[ssi2_ipg_per], "per", "imx-ssi.1");

	clk_register_clkdev(clk[ssi2_ipg], "ipg", "imx-ssi.1");

	clk_register_clkdev(clk[ssi1_ipg], NULL, "imx-ssi.0");

	clk_register_clkdev(clk[ssi2_ipg], NULL, "imx-ssi.1");

	clk_register_clkdev(clk[esdhc1_ipg_per], "per", "sdhci-esdhc-imx25.0");

	clk_register_clkdev(clk[esdhc1_ipg], "ipg", "sdhci-esdhc-imx25.0");

	clk_register_clkdev(clk[esdhc1_ahb], "ahb", "sdhci-esdhc-imx25.0");