Skip to content

more imx patches for 2.6.34

Uwe Kleine-König linux-arm-kernel 1 version New

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest39 patches 0 repliesNew

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/39arm/mx2: use cpp magic to create spi_imx devicesarch/arm/mach-mx2/devices.c arch/arm/mach-mx2/devices.h+24 -560 replies
2/39arm/mx2: use cpp magic to create imx_gpt devicesarch/arm/mach-mx2/devices.c arch/arm/mach-mx2/devices.h+26 -940 replies
3/39arm/mx2: use cpp magic to create imx-i2c devicesarch/arm/mach-mx2/devices.c arch/arm/mach-mx2/devices.h+22 -340 replies
4/39arm/mx2: use cpp magic to create imx-mmc devicesarch/arm/mach-mx2/devices.c+31 -560 replies
5/39arm/mx2: use cpp magic to create imx-ssi devicesarch/arm/mach-mx2/devices.c+32 -750 replies
6/39arm/mx2/devices: use SoC-prefixed names where possiblearch/arm/mach-mx2/devices.c+55 -550 replies
7/39arm/mx2: define seperate imx_nand devices for imx21 and imx27arch/arm/mach-mx2/devices.c arch/arm/mach-mx2/devices.h+36 -180 replies
8/39arm/mx2: use per-SOC nand devicearch/arm/mach-mx2/devices.h arch/arm/mach-mx2/mach-cpuimx27.c arch/arm/mach-mx2/mach-mx21ads.c +4 more+7 -100 replies
9/39arm/mx2: define seperate gpio port descriptions for imx21 and imx27arch/arm/mach-mx2/devices.c+44 -280 replies
10/39arm/mx2/devices: no need for IMX_NEEDS_DEPRECATED_SYMBOLS any morearch/arm/mach-mx2/Makefile+0 -10 replies
11/39arm/mx2: split generic.c into mm-imx2[17].carch/arm/mach-mx2/Makefile arch/arm/mach-mx2/mm-imx21.c arch/arm/mach-mx2/mm-imx27.c+34 -630 replies
12/39arm/imx/gpio: GPIO_INT_{HIGH, LOW}_LEV are not necessarily constantarch/arm/plat-mxc/gpio.c+3 -60 replies
13/39arm/imx: use generic_handle_irq instead of open-coding itarch/arm/plat-mxc/gpio.c+1 -20 replies
14/39arm/imx/gpio: use fls to find set bits in the irq status registerarch/arm/plat-mxc/gpio.c+9 -110 replies
15/39arm/imx/gpio: remove a BUG_ON in hot patharch/arm/plat-mxc/gpio.c+0 -20 replies
16/39arm/imx/audmux-v1: use SoC-prefixed namesarch/arm/plat-mxc/Makefile arch/arm/plat-mxc/audmux-v1.c+12 -30 replies
17/39arm/imx/audmux-v2: use SoC-prefixed namesarch/arm/plat-mxc/Makefile arch/arm/plat-mxc/audmux-v2.c+5 -50 replies
18/39arm/imx: remove "NO_PAD_CTRL" from Copyright statementsarch/arm/plat-mxc/include/mach/iomux-mx25.h arch/arm/plat-mxc/include/mach/iomux-mx35.h+2 -20 replies
19/39arm/imx: let ARCH_MXC select COMMON_CLKDEV instead of each subfamilyarch/arm/Kconfig arch/arm/plat-mxc/Kconfig+1 -50 replies
20/39arm/imx: don't explicitly select GENERIC_GPIOarch/arm/Kconfig+0 -10 replies
21/39arm/imx: remove MTD_XIP supportarch/arm/Kconfig arch/arm/plat-mxc/include/mach/mtd-xip.h+0 -350 replies
22/39arm/imx: remove #ifndef CONFIG_COMMON_CLKDEV blockarch/arm/plat-mxc/include/mach/clock.h+0 -70 replies
23/39arm/imx: don't depend on ARCH_MXC twicearch/arm/plat-mxc/Kconfig+0 -30 replies
24/39arm/imx/irq: order definitions of MXC_GPIO_IRQS numericallyarch/arm/plat-mxc/include/mach/irqs.h+6 -50 replies
25/39arm/imx: choose sane CONSISTENT_DMA_SIZE if video is enabled for both mx1 and mx3arch/arm/plat-mxc/include/mach/memory.h+7 -80 replies
26/39arm/imx/dma-v1: don't use deprecated symbols DMA_BASE and MXC_INT_DMACH0arch/arm/plat-mxc/Makefile arch/arm/plat-mxc/dma-mx1-mx2.c+90 -710 replies
27/39arm/imx/dma-v1: protect #ifdef'd blocks additionally by cpu_is_...arch/arm/plat-mxc/dma-mx1-mx2.c+30 -230 replies
28/39arm/imx/iomux-v1: rename source file and reorganize Kconfig stuffarch/arm/plat-mxc/Kconfig arch/arm/plat-mxc/Makefile arch/arm/plat-mxc/iomux-v1.c+14 -90 replies
29/39arm/imx/iomux-v1: make base address a runtime choicearch/arm/plat-mxc/include/mach/iomux.h arch/arm/plat-mxc/iomux-v1.c+127 -670 replies
30/39arm/imx/iomux-mx1: unify style and comment cleanuparch/arm/plat-mxc/include/mach/iomux-mx1.h+150 -1590 replies
31/39arm/imx/iomux-mx21: unify stylearch/arm/plat-mxc/include/mach/iomux-mx21.h+100 -1030 replies
32/39arm/imx/iomux-mx25: unify style and comment cleanuparch/arm/plat-mxc/include/mach/iomux-mx25.h+3 -170 replies
33/39arm/imx/iomux-mx27: unify style and commentsarch/arm/plat-mxc/include/mach/iomux-mx27.h+182 -1830 replies
34/39arm/imx/iomux-mx2x: unify stylearch/arm/plat-mxc/include/mach/iomux-mx2x.h+209 -2120 replies
35/39arm/imx/iomux-mx3.h: unify style and commentsarch/arm/plat-mxc/include/mach/iomux-mx3.h+35 -360 replies
36/39arm/mx25: don't include iomux.h which is for iomux-v1 machinesarch/arm/mach-mx25/mach-mx25pdk.c arch/arm/plat-mxc/include/mach/iomux.h+1 -50 replies
37/39arm/imx/iomux-v1: rename header filearch/arm/plat-mxc/include/mach/iomux-mx1.h arch/arm/plat-mxc/include/mach/iomux-mx21.h arch/arm/plat-mxc/include/mach/iomux-mx27.h +4 more+126 -1270 replies
38/39arm/imx: let platform files include the SoC-specific iomux headerarch/arm/mach-mx1/mach-mx1ads.c arch/arm/mach-mx1/mach-scb9328.c arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c +9 more+12 -120 replies
39/39arm/imx/iomux-v1: check for invalid modes in mxc_gpio_modearch/arm/plat-mxc/Makefile arch/arm/plat-mxc/include/mach/iomux-mx3.h arch/arm/plat-mxc/include/mach/iomux-v1.h +1 more+54 -460 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 00/39] more imx patches for 2.6.34

Hello,

I put some more effort into bringing arch-mx2 into shape to support a kernel built for mx21 and mx27. Now this is nearly complete. The only things missing are:

1) runtime physoffset support (patch sent[1])
2) reorganize Kconfig stuff to allow selecting both mx21 and mx27

    (depends on 1).

This series conflicts with Sascha's mxc-master, so I merged the two branches and resolved the conflicts. The result is available at

git://git.pengutronix.de/git/ukl/linux-2.6.git imx/master-merged

Best regards
Uwe

The following changes since commit 94d32f99c6aba8b702a9cf78cb328aeb7882b1e5:
Andy Green (1):
imx-serial-excessive-status-clearing-on-break.patch

are available in the git repository at:

git://git.pengutronix.de/git/ukl/linux-2.6.git imx/master

Uwe Kleine-K?nig (39):
arm/mx2: use cpp magic to create spi_imx devices
arm/mx2: use cpp magic to create imx_gpt devices
arm/mx2: use cpp magic to create imx-i2c devices
arm/mx2: use cpp magic to create imx-mmc devices
arm/mx2: use cpp magic to create imx-ssi devices
arm/mx2/devices: use SoC-prefixed names where possible
arm/mx2: define seperate imx_nand devices for imx21 and imx27 arm/mx2: use per-SOC nand device
arm/mx2: define seperate gpio port descriptions for imx21 and imx27 arm/mx2/devices: no need for IMX_NEEDS_DEPRECATED_SYMBOLS any more arm/mx2: split generic.c into mm-imx2[17].c
arm/imx/gpio: GPIO_INT_{HIGH,LOW}_LEV are not necessarily constant arm/imx: use generic_handle_irq instead of open-coding it arm/imx/gpio: use fls to find set bits in the irq status register arm/imx/gpio: remove a BUG_ON in hot path
arm/imx/audmux-v1: use SoC-prefixed names
arm/imx/audmux-v2: use SoC-prefixed names
arm/imx: remove "NO_PAD_CTRL" from Copyright statements
arm/imx: let ARCH_MXC select COMMON_CLKDEV instead of each subfamily arm/imx: don't explicitly select GENERIC_GPIO
arm/imx: remove MTD_XIP support
arm/imx: remove #ifndef CONFIG_COMMON_CLKDEV block
arm/imx: don't depend on ARCH_MXC twice
arm/imx/irq: order definitions of MXC_GPIO_IRQS numerically arm/imx: choose sane CONSISTENT_DMA_SIZE if video is enabled for both mx1 and mx3 arm/imx/dma-v1: don't use deprecated symbols DMA_BASE and MXC_INT_DMACH0 arm/imx/dma-v1: protect #ifdef'd blocks additionally by cpu_is_... arm/imx/iomux-v1: rename source file and reorganize Kconfig stuff arm/imx/iomux-v1: make base address a runtime choice arm/imx/iomux-mx1: unify style and comment cleanup arm/imx/iomux-mx21: unify style
arm/imx/iomux-mx25: unify style and comment cleanup arm/imx/iomux-mx27: unify style and comments
arm/imx/iomux-mx2x: unify style
arm/imx/iomux-mx3.h: unify style and comments
arm/mx25: don't include iomux.h which is for iomux-v1 machines arm/imx/iomux-v1: rename header file
arm/imx: let platform files include the SoC-specific iomux header arm/imx/iomux-v1: check for invalid modes in mxc_gpio_mode

 arch/arm/Kconfig                             |    3 +-
 arch/arm/mach-mx1/mach-mx1ads.c              |    2 +-
 arch/arm/mach-mx1/mach-scb9328.c             |    2 +-
 arch/arm/mach-mx2/Makefile                   |    8 +-
 arch/arm/mach-mx2/devices.c                  |  643 ++++++++++----------------
 arch/arm/mach-mx2/devices.h                  |   13 +-
 arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c |    2 +-
 arch/arm/mach-mx2/mach-cpuimx27.c            |    5 +-
 arch/arm/mach-mx2/mach-imx27lite.c           |    2 +-
 arch/arm/mach-mx2/mach-mx21ads.c             |    4 +-
 arch/arm/mach-mx2/mach-mx27_3ds.c            |    2 +-
 arch/arm/mach-mx2/mach-mx27ads.c             |    4 +-
 arch/arm/mach-mx2/mach-mxt_td60.c            |    4 +-
 arch/arm/mach-mx2/mach-pca100.c              |    4 +-
 arch/arm/mach-mx2/mach-pcm038.c              |    4 +-
 arch/arm/mach-mx2/{generic.c => mm-imx21.c}  |   46 +--
 arch/arm/mach-mx2/{generic.c => mm-imx27.c}  |   44 +--
 arch/arm/mach-mx2/pcm970-baseboard.c         |    2 +-
 arch/arm/mach-mx25/mach-mx25pdk.c            |    2 +-
 arch/arm/plat-mxc/Kconfig                    |   13 +-
 arch/arm/plat-mxc/Makefile                   |    9 +-
 arch/arm/plat-mxc/audmux-v1.c                |   14 +-
 arch/arm/plat-mxc/audmux-v2.c                |    9 +-
 arch/arm/plat-mxc/dma-mx1-mx2.c              |  207 +++++----
 arch/arm/plat-mxc/gpio.c                     |   30 +-
 arch/arm/plat-mxc/include/mach/clock.h       |    7 -
 arch/arm/plat-mxc/include/mach/iomux-mx1.h   |  313 ++++++-------
 arch/arm/plat-mxc/include/mach/iomux-mx21.h  |  210 ++++-----
 arch/arm/plat-mxc/include/mach/iomux-mx25.h  |   22 +-
 arch/arm/plat-mxc/include/mach/iomux-mx27.h  |  372 ++++++++--------
 arch/arm/plat-mxc/include/mach/iomux-mx2x.h  |  425 +++++++++---------
 arch/arm/plat-mxc/include/mach/iomux-mx3.h   |   76 ++--
 arch/arm/plat-mxc/include/mach/iomux-mx35.h  |    2 +-
 arch/arm/plat-mxc/include/mach/iomux-v1.h    |  103 ++++
 arch/arm/plat-mxc/include/mach/iomux.h       |  128 +-----
 arch/arm/plat-mxc/include/mach/irqs.h        |   11 +-
 arch/arm/plat-mxc/include/mach/memory.h      |   15 +-
 arch/arm/plat-mxc/include/mach/mtd-xip.h     |   34 --
 arch/arm/plat-mxc/iomux-mx1-mx2.c            |  157 -------
 arch/arm/plat-mxc/iomux-v1.c                 |  238 ++++++++++
 40 files changed, 1513 insertions(+), 1678 deletions(-)
 copy arch/arm/mach-mx2/{generic.c => mm-imx21.c} (66%)
 rename arch/arm/mach-mx2/{generic.c => mm-imx27.c} (67%)
 create mode 100644 arch/arm/plat-mxc/include/mach/iomux-v1.h
 delete mode 100644 arch/arm/plat-mxc/include/mach/mtd-xip.h
 delete mode 100644 arch/arm/plat-mxc/iomux-mx1-mx2.c
 create mode 100644 arch/arm/plat-mxc/iomux-v1.c

[1] http://thread.gmane.org/gmane.linux.ports.arm.kernel/74675
Russell doesn't want to merge it for 2.6.34, he havn't given reasons up to now though.

Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |