Commits · e2611ba40a937b8a749ef075a67e40acee5d1748 · nexedi / linux

30 Jun, 2010 18 commits

ARM: imx: Change the way nand devices are registered (imx35) · e2611ba4

Uwe Kleine-König authored Jun 16, 2010

Make use of new mechanism to register a nand device.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

e2611ba4

ARM: imx: Change the way nand devices are registered (imx31) · a2ceeef5

Uwe Kleine-König authored Jun 16, 2010

Make use of new mechanism to register a nand device.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

a2ceeef5

ARM: imx: Change the way nand devices are registered (imx27) · 0e7a29a8

Uwe Kleine-König authored Jun 16, 2010

Make use of new mechanism to register a nand device.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

0e7a29a8

ARM: imx: Change the way nand devices are registered (imx25) · b0c4845c

Uwe Kleine-König authored Jun 16, 2010

Make use of new mechanism to register a nand device.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

b0c4845c

ARM: imx: Change the way nand devices are registered (imx21) · 1f8d721c

Uwe Kleine-König authored Jun 16, 2010

Make use of new mechanism to register a nand device.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

1f8d721c

ARM: imx: Change the way nand devices are registered (generic part) · 66384eed

Uwe Kleine-König authored Jun 15, 2010

Instead of having a platform device defined in a devices.c and register
it in the machine file allocate it dynamically. This reduces the size
of needed memory as the new function is discarded after init and only
the existing devices are created.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

66384eed

ARM: mxc: remove paragraphs with old address of the FSF · aa71251c

Uwe Kleine-König authored Jun 16, 2010

As the kernel contains a copy of the GPL anyhow just get rid of the address
specification instead of fixing it.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

aa71251c

ARM: mxc91231: remove paragraphs with old address of the FSF · a1d62fc5

Uwe Kleine-König authored Jun 16, 2010

As the kernel contains a copy of the GPL anyhow just get rid of the address
specification instead of fixing it.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

a1d62fc5

ARM: mx3: remove paragraphs with old address of the FSF · d694eea5

Uwe Kleine-König authored Jun 16, 2010

As the kernel contains a copy of the GPL anyhow just get rid of the address
specification instead of fixing it.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

d694eea5

ARM: mx25: remove paragraphs with old address of the FSF · 6cc702a6

Uwe Kleine-König authored Jun 16, 2010

As the kernel contains a copy of the GPL anyhow just get rid of the address
specification instead of fixing it.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

6cc702a6

ARM: imx: remove paragraphs with old address of the FSF · 6851a408

Uwe Kleine-König authored Jun 16, 2010

As the kernel contains a copy of the GPL anyhow just get rid of the address
specification instead of fixing it.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

6851a408

MTD: mxc_nand: make bit fields unsigned to please sparse · cd57c777

Uwe Kleine-König authored Jun 16, 2010

This fixes:

	arch/arm/plat-mxc/include/mach/mxc_nand.h:25:14: error: dubious one-bit signed bitfield
	arch/arm/plat-mxc/include/mach/mxc_nand.h:26:17: error: dubious one-bit signed bitfield

While at it make width unsigned, too.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

cd57c777

ARM: imx: new helper function imx_add_platform_device · 253ff1fa

Uwe Kleine-König authored Jun 15, 2010

This should be a globally available function, see

	http://thread.gmane.org/gmane.linux.kernel/998881/focus=998882

Until this hits mainline create a similar function available for imx
platforms only.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

253ff1fa

ARM: imx: new Kconfig symbol and feature test macro for DMA on mx1 and mx2 · 9f72ffed

Uwe Kleine-König authored Jun 14, 2010

This should be used instead of hard coding the corresponding platforms.
The feature test macro is needed to support different SOCs in a single
kernel image.  While at it rename dma-mx1-mx2 to dma-v1 as mx25 doesn't
use it and so the mx2 part is wrong and move the header to
arch/arm/mach-imx.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

9f72ffed

ARM: imx: prepare deprecating ARCH_MX1, MACH_MX2, MACH_MX21 and MACH_MX27 · e780d239

Uwe Kleine-König authored Jun 14, 2010

MACH_... is reserved for machine support, so use SOC as prefix, not MACH.

This introduces new symbols SOC_IMX1, SOC_IMX21 and SOC_IMX27. They are
selected by the old symbols for now. There is no substitute for MACH_MX2
as most usages of MX2 only means MX21 + MX27 but not MX25.

Later the choice about CPU and CPU family should go away and the individual
machines should select the right SOC symbol. This is a precondition to
support more than one SOC in a single kernel image.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

e780d239

ARM: imx: Kconfig: use an if block instead of a depend for many symbols · b6b06be0
Uwe Kleine-König authored Jun 14, 2010
```
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
```
b6b06be0
ARM: imx: move mx1 support to mach-imx · 07469495
Uwe Kleine-König authored Jun 14, 2010
```
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
```
07469495
ARM: imx: rename mxc_uart_devicex to follow a common naming scheme · 551823e7
Uwe Kleine-König authored Jun 11, 2010
```
Addionally remove an unneeded include.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
```
551823e7

24 Jun, 2010 18 commits

ARM: imx1: rename imx_uart[12]_device to follow a common naming scheme · 3e876935

Uwe Kleine-König authored Jun 10, 2010

Note that these devices are specific for imx1 as only here three irqs are
used.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

3e876935

ARM: imx1: rename imx_i2c_device to follow a common naming scheme · 8f785e85
Uwe Kleine-König authored Jun 10, 2010
```
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
```
8f785e85
ARM: imx1: rename imx_csi_device to match its .name · 68a9c5ba
Uwe Kleine-König authored Jun 10, 2010
```
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
```
68a9c5ba

ARM: imx: fold serial.c into devices.c · e9ec2a17

Uwe Kleine-König authored Jun 10, 2010

... and use cpp magic to reduce repetition.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

e9ec2a17

ARM: imx: get rid of mxc_gpio_init · 9a763bfb

Uwe Kleine-König authored Jun 10, 2010

This function is defined once for each imx family and so is in the way
when compiling a kernel for more than one SoC.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

9a763bfb

ARM: imx/mx1: fold crm_regs.h into its only consumer · 3aad49e1

Uwe Kleine-König authored Jun 10, 2010

As crm_regs.h is GPL-v2 only don't allow "(at your option) any later
version" for clock.c any more.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

3aad49e1

ARM: imx: rename mach dir for mx21 and mx27 to mach-imx · d109167b

Uwe Kleine-König authored Jun 10, 2010

Finally all imx code should end up there, start with mach-mx2.  While
touching all files rename some files to use a hyphen instead of an
underscore.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

d109167b

ARM: mxc: grammar fix · f1d4cbef
Uwe Kleine-König authored Mar 08, 2010
```
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
```
f1d4cbef
ARM: mx3/mx31ads: fold board header in its only user · ccfa7c26
Uwe Kleine-König authored Mar 08, 2010
```
Moreover remove unused definitions.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
```
ccfa7c26
ARM: mx3/mx31_3ds: fold board header in its only user · b396dc45
Uwe Kleine-König authored Mar 08, 2010
```
Moreover remove unused definitions.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
```
b396dc45

ARM: mx3/qong: get rid of nearly empty header · d57351a3

Uwe Kleine-König authored Mar 08, 2010

board-qong.h only defined a single symbol that was used only once.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

d57351a3

ARM: mx2/mx27ads: fold board header in its only user · 1faeaab2
Uwe Kleine-König authored Mar 08, 2010
```
Moreover remove unused definitions.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
```
1faeaab2
ARM: mx2/mx21ads: fold board header in its only user · d393d43f
Uwe Kleine-König authored Mar 08, 2010
```
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
```
d393d43f
ARM: mx3/kzm_arm11_01: fold board header in its only user · 7b562d0f
Uwe Kleine-König authored Mar 08, 2010
```
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
```
7b562d0f
ARM: imx: remove empty and unused board headers · 5d3a136a
Uwe Kleine-König authored Mar 08, 2010
```
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
```
5d3a136a
ARM: mx2/mx27_3ds: document alternative names and remove empty header · 8fdca37a
Uwe Kleine-König authored Mar 08, 2010
```
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
```
8fdca37a

ARM: mx1/scb9328: fix type of uart1_mxc_exit to make compiler happy · a02b0420

Uwe Kleine-König authored Mar 05, 2010

This fixes:

	arch/arm/mach-mx1/mach-scb9328.c:120: warning: initialization from incompatible pointer type
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

a02b0420

ARM: mx1: don't use deprecated symbol names · 05a3185c
Uwe Kleine-König authored Mar 04, 2010
```
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
```
05a3185c

02 Jun, 2010 2 commits
- ARM: mx25: rename mach-mx25pdk.c to mach-mx25_3ds.c matching its arch number · c10ea4d6
  Uwe Kleine-König authored Mar 04, 2010
```
Additionally document all known names of that machine.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
```
  c10ea4d6
- ARM: mx3: rename mach-mx35pdk.c to mach-mx35_3ds.c matching its arch number · 767c38b2
  Uwe Kleine-König authored Mar 04, 2010
```
Additional document all known names of that machine.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
```
  767c38b2
30 May, 2010 2 commits

Linux 2.6.35-rc1 · 67a3e12b
Linus Torvalds authored May 30, 2010
```
.. and thus endeth the merge window.
```
67a3e12b

Merge branch 'slub/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 · 3b03117c

Linus Torvalds authored May 30, 2010

* 'slub/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
  SLUB: Allow full duplication of kmalloc array for 390
  slub: move kmem_cache_node into it's own cacheline

3b03117c