Skip to content

More omap header moves for common zImage support

Tony Lindgren alsa-devel linux-arm-kernel linux-fbdev linux-input linux-mtd linux-omap linux-spi 1 version In review

Get series with b4
b4 am 20120919205732.28074.43697.stgit@muffinssi

Versions newest first

  1. v1 Latest29 patches 7 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/29ARM: OMAP: Remove unused param.harch/arm/plat-omap/include/plat/param.h+0 -80 replies
2/29ARM: OMAP: Remove smp.harch/arm/mach-omap1/include/mach/smp.h arch/arm/mach-omap2/include/mach/smp.h+0 -100 replies
3/29ARM: OMAP1: Make plat/mux.h omap1 onlyarch/arm/mach-omap1/board-ams-delta.c arch/arm/mach-omap1/board-fsample.c arch/arm/mach-omap1/board-generic.c +33 more+84 -1261 reply
4/29ARM: OMAP1: Move board-ams-delta.h from plat to macharch/arm/mach-omap1/ams-delta-fiq-handler.S arch/arm/mach-omap1/ams-delta-fiq.c arch/arm/mach-omap1/board-ams-delta.c +5 more+7 -74 replies
5/29ARM: OMAP2+: Make id.h localarch/arm/mach-omap2/board-devkit8000.c arch/arm/mach-omap2/id.c arch/arm/mach-omap2/id.h+2 -20 replies
6/29ARM: OMAP1: Move keypad.h from plat to macharch/arm/mach-omap1/board-ams-delta.c arch/arm/mach-omap1/board-fsample.c arch/arm/mach-omap1/board-h2.c +12 more+14 -140 replies
6/29ARM: OMAP1: Move keypad.h from plat to mach+0 -00 replies
7/29ARM: OMAP1: Move lcd_mipid.h from plat to macharch/arm/mach-omap1/board-nokia770.c arch/arm/mach-omap1/include/mach/lcd_mipid.h drivers/video/omap/lcd_mipid.c+2 -20 replies
7/29ARM: OMAP1: Move lcd_mipid.h from plat to mach+0 -00 replies
8/29ARM: OMAP2+: Make board-zoom.h localarch/arm/mach-omap2/board-3630sdp.c arch/arm/mach-omap2/board-ldp.c arch/arm/mach-omap2/board-zoom-debugboard.c +5 more+7 -213 replies
9/29ARM: OMAP2+: Make am35xx.h localarch/arm/mach-omap2/am35xx-emac.c arch/arm/mach-omap2/am35xx.h arch/arm/mach-omap2/board-am3517evm.c +3 more+5 -50 replies
10/29ARM: OMAP2+: Make board-rx51.h localarch/arm/mach-omap2/board-rx51-peripherals.c arch/arm/mach-omap2/board-rx51-video.c arch/arm/mach-omap2/board-rx51.h+2 -20 replies
11/29ARM: OMAP2+: Make ctrl_module_core_44xx.h localarch/arm/mach-omap2/control.h arch/arm/mach-omap2/ctrl_module_core_44xx.h+1 -10 replies
12/29ARM: OMAP2+: Make ctrl_module_pad_core_44xx.h localarch/arm/mach-omap2/control.h arch/arm/mach-omap2/ctrl_module_pad_core_44xx.h+1 -10 replies
13/29ARM: OMAP2+: Make ctrl_module_pad_wkup_44xx.h localarch/arm/mach-omap2/control.h arch/arm/mach-omap2/ctrl_module_pad_wkup_44xx.h+1 -10 replies
14/29ARM: OMAP2+: Make ctrl_module_wkup_44xx.h localarch/arm/mach-omap2/control.h arch/arm/mach-omap2/ctrl_module_wkup_44xx.h+1 -10 replies
15/29ARM: OMAP2+: Make omap-secure.h localarch/arm/mach-omap2/omap-secure.c arch/arm/mach-omap2/omap-secure.h arch/arm/mach-omap2/omap-smp.c +2 more+4 -40 replies
16/29ARM: OMAP2+: Make omap-wakeupgen.h localarch/arm/mach-omap2/omap-hotplug.c arch/arm/mach-omap2/omap-smp.c arch/arm/mach-omap2/omap-wakeupgen.c +2 more+4 -40 replies
17/29ARM: OMAP1: Move board-sx1.h from plat to macharch/arm/mach-omap1/board-sx1-mmc.c arch/arm/mach-omap1/board-sx1.c arch/arm/mach-omap1/include/mach/board-sx1.h+2 -20 replies
18/29ARM: OMAP1: Move board-voiceblue.h from plat to macharch/arm/mach-omap1/board-voiceblue.c arch/arm/mach-omap1/include/mach/board-voiceblue.h+1 -10 replies
19/29ARM: OMAP2+: Make debug-devices.h localarch/arm/mach-omap2/board-h4.c arch/arm/mach-omap2/debug-devices.h+1 -10 replies
20/29ARM: OMAP1: Move flash.h from plat to macharch/arm/mach-omap1/board-fsample.c arch/arm/mach-omap1/board-h2.c arch/arm/mach-omap1/board-h3.c +10 more+12 -120 replies
21/29ARM: OMAP2+: Make gpmc-smc91x.h localarch/arm/mach-omap2/board-2430sdp.c arch/arm/mach-omap2/board-3430sdp.c arch/arm/mach-omap2/board-3630sdp.c +3 more+5 -50 replies
22/29ARM: OMAP2+: Make gpmc-smsc911x.h localarch/arm/mach-omap2/board-cm-t35.c arch/arm/mach-omap2/board-igep0020.c arch/arm/mach-omap2/board-ldp.c +7 more+9 -90 replies
23/29ARM: OMAP2+: Make hdq1w.h localarch/arm/mach-omap2/hdq1w.c arch/arm/mach-omap2/hdq1w.h arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c+2 -20 replies
24/29ARM: OMAP1: Move irda.h from plat to macharch/arm/mach-omap1/board-h2.c arch/arm/mach-omap1/board-palmte.c arch/arm/mach-omap1/board-palmtt.c +3 more+5 -50 replies
25/29ARM: OMAP2+: Make l3_2xxx.h localarch/arm/mach-omap2/l3_2xxx.h arch/arm/mach-omap2/omap_hwmod_2420_data.c arch/arm/mach-omap2/omap_hwmod_2430_data.c +1 more+3 -30 replies
26/29ARM: OMAP2+: Make l3_3xxx.h localarch/arm/mach-omap2/l3_3xxx.h arch/arm/mach-omap2/omap_hwmod_3xxx_data.c+1 -10 replies
27/29ARM: OMAP2+: Make l4_2xxx.h localarch/arm/mach-omap2/l4_2xxx.h arch/arm/mach-omap2/omap_hwmod_2420_data.c arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c+2 -20 replies
28/29ARM: OMAP2+: Make l4_3xxx.h localarch/arm/mach-omap2/l4_3xxx.h arch/arm/mach-omap2/omap_hwmod_3xxx_data.c+1 -10 replies
29/29ARM: OMAP2+: Make omap4-keypad.h localarch/arm/mach-omap2/board-4430sdp.c arch/arm/mach-omap2/devices.c arch/arm/mach-omap2/omap4-keypad.h+2 -20 replies

Reviews trailers per patch

3 of 31 patches have a Reviewed-by or Acked-by.

PatchMark BrownJanusz KrzysztofikFelipe Balbi
1/29
2/29
3/29A-b
4/29A-b Akced-by
5/29
6/29
6/29
7/29
7/29
8/29A-b
9/29
10/29
11/29
12/29
13/29
14/29
15/29
16/29
17/29
18/29
19/29
20/29
21/29
22/29
23/29
24/29
25/29
26/29
27/29
28/29
29/29

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v1 thread

Cover letter [PATCH 00/29] More omap header moves for common zImage support

Hi all,

Here's a series of mostly automated patches to make more omap headers local for the common zImage support.

I'd like to merge this as a late series via arm-soc after the other changes are merged to avoid further merge conflicts. I can easily regenerate this series on top of the other multiarch changes as needed.

Regards,

Tony

---

Tony Lindgren (29):
ARM: OMAP: Remove unused param.h
ARM: OMAP: Remove smp.h
ARM: OMAP1: Make plat/mux.h omap1 only
ARM: OMAP1: Move board-ams-delta.h from plat to mach
ARM: OMAP2+: Make id.h local
ARM: OMAP1: Move keypad.h from plat to mach
ARM: OMAP1: Move lcd_mipid.h from plat to mach
ARM: OMAP2+: Make board-zoom.h local
ARM: OMAP2+: Make am35xx.h local
ARM: OMAP2+: Make board-rx51.h local
ARM: OMAP2+: Make ctrl_module_core_44xx.h local
ARM: OMAP2+: Make ctrl_module_pad_core_44xx.h local
ARM: OMAP2+: Make ctrl_module_pad_wkup_44xx.h local
ARM: OMAP2+: Make ctrl_module_wkup_44xx.h local
ARM: OMAP2+: Make omap-secure.h local
ARM: OMAP2+: Make omap-wakeupgen.h local
ARM: OMAP1: Move board-sx1.h from plat to mach
ARM: OMAP1: Move board-voiceblue.h from plat to mach
ARM: OMAP2+: Make debug-devices.h local
ARM: OMAP1: Move flash.h from plat to mach
ARM: OMAP2+: Make gpmc-smc91x.h local
ARM: OMAP2+: Make gpmc-smsc911x.h local
ARM: OMAP2+: Make hdq1w.h local
ARM: OMAP1: Move irda.h from plat to mach
ARM: OMAP2+: Make l3_2xxx.h local
ARM: OMAP2+: Make l3_3xxx.h local
ARM: OMAP2+: Make l4_2xxx.h local
ARM: OMAP2+: Make l4_3xxx.h local
ARM: OMAP2+: Make omap4-keypad.h local

 arch/arm/mach-omap1/ams-delta-fiq-handler.S        |    2 
 arch/arm/mach-omap1/ams-delta-fiq.c                |    2 
 arch/arm/mach-omap1/board-ams-delta.c              |    6 +
 arch/arm/mach-omap1/board-fsample.c                |    6 +
 arch/arm/mach-omap1/board-generic.c                |    2 
 arch/arm/mach-omap1/board-h2.c                     |    8 +-
 arch/arm/mach-omap1/board-h3.c                     |    6 +
 arch/arm/mach-omap1/board-htcherald.c              |    2 
 arch/arm/mach-omap1/board-innovator.c              |    6 +
 arch/arm/mach-omap1/board-nokia770.c               |    6 +
 arch/arm/mach-omap1/board-osk.c                    |    6 +
 arch/arm/mach-omap1/board-palmte.c                 |    8 +-
 arch/arm/mach-omap1/board-palmtt.c                 |    8 +-
 arch/arm/mach-omap1/board-palmz71.c                |    8 +-
 arch/arm/mach-omap1/board-perseus2.c               |    6 +
 arch/arm/mach-omap1/board-sx1-mmc.c                |    2 
 arch/arm/mach-omap1/board-sx1.c                    |   10 +-
 arch/arm/mach-omap1/board-voiceblue.c              |    6 +
 arch/arm/mach-omap1/devices.c                      |    2 
 arch/arm/mach-omap1/flash.c                        |    2 
 arch/arm/mach-omap1/i2c.c                          |    2 
 arch/arm/mach-omap1/include/mach/board-ams-delta.h |    0 
 arch/arm/mach-omap1/include/mach/board-sx1.h       |    0 
 arch/arm/mach-omap1/include/mach/board-voiceblue.h |    0 
 arch/arm/mach-omap1/include/mach/flash.h           |    0 
 arch/arm/mach-omap1/include/mach/irda.h            |    0 
 arch/arm/mach-omap1/include/mach/keypad.h          |    0 
 arch/arm/mach-omap1/include/mach/lcd_mipid.h       |    0 
 arch/arm/mach-omap1/include/mach/mux.h             |    0 
 arch/arm/mach-omap1/include/mach/smp.h             |    5 -
 arch/arm/mach-omap1/io.c                           |    2 
 arch/arm/mach-omap1/mcbsp.c                        |    2 
 arch/arm/mach-omap1/mux.c                          |   58 ++++++++++++-
 arch/arm/mach-omap1/pm.c                           |    2 
 arch/arm/mach-omap1/serial.c                       |    2 
 arch/arm/mach-omap1/usb.c                          |    2 
 arch/arm/mach-omap2/am35xx-emac.c                  |    2 
 arch/arm/mach-omap2/am35xx.h                       |    0 
 arch/arm/mach-omap2/board-2430sdp.c                |    2 
 arch/arm/mach-omap2/board-3430sdp.c                |    2 
 arch/arm/mach-omap2/board-3630sdp.c                |    4 -
 arch/arm/mach-omap2/board-4430sdp.c                |    2 
 arch/arm/mach-omap2/board-am3517evm.c              |    2 
 arch/arm/mach-omap2/board-cm-t35.c                 |    2 
 arch/arm/mach-omap2/board-cm-t3517.c               |    2 
 arch/arm/mach-omap2/board-devkit8000.c             |    2 
 arch/arm/mach-omap2/board-h4.c                     |    2 
 arch/arm/mach-omap2/board-igep0020.c               |    2 
 arch/arm/mach-omap2/board-ldp.c                    |    4 -
 arch/arm/mach-omap2/board-omap3evm.c               |    2 
 arch/arm/mach-omap2/board-omap3logic.c             |    2 
 arch/arm/mach-omap2/board-omap3stalker.c           |    2 
 arch/arm/mach-omap2/board-overo.c                  |    2 
 arch/arm/mach-omap2/board-rx51-peripherals.c       |    4 -
 arch/arm/mach-omap2/board-rx51-video.c             |    2 
 arch/arm/mach-omap2/board-rx51.h                   |    0 
 arch/arm/mach-omap2/board-zoom-debugboard.c        |    4 -
 arch/arm/mach-omap2/board-zoom-display.c           |    2 
 arch/arm/mach-omap2/board-zoom-peripherals.c       |   16 ----
 arch/arm/mach-omap2/board-zoom.c                   |    2 
 arch/arm/mach-omap2/board-zoom.h                   |    0 
 arch/arm/mach-omap2/common.c                       |    1 
 arch/arm/mach-omap2/control.h                      |    8 +-
 arch/arm/mach-omap2/ctrl_module_core_44xx.h        |    0 
 arch/arm/mach-omap2/ctrl_module_pad_core_44xx.h    |    0 
 arch/arm/mach-omap2/ctrl_module_pad_wkup_44xx.h    |    0 
 arch/arm/mach-omap2/ctrl_module_wkup_44xx.h        |    0 
 arch/arm/mach-omap2/debug-devices.h                |    0 
 arch/arm/mach-omap2/devices.c                      |    2 
 arch/arm/mach-omap2/gpmc-smc91x.c                  |    2 
 arch/arm/mach-omap2/gpmc-smc91x.h                  |    0 
 arch/arm/mach-omap2/gpmc-smsc911x.c                |    2 
 arch/arm/mach-omap2/gpmc-smsc911x.h                |    0 
 arch/arm/mach-omap2/hdq1w.c                        |    2 
 arch/arm/mach-omap2/hdq1w.h                        |    0 
 arch/arm/mach-omap2/hsmmc.c                        |    1 
 arch/arm/mach-omap2/id.c                           |    2 
 arch/arm/mach-omap2/id.h                           |    0 
 arch/arm/mach-omap2/include/mach/smp.h             |    5 -
 arch/arm/mach-omap2/l3_2xxx.h                      |    0 
 arch/arm/mach-omap2/l3_3xxx.h                      |    0 
 arch/arm/mach-omap2/l4_2xxx.h                      |    0 
 arch/arm/mach-omap2/l4_3xxx.h                      |    0 
 arch/arm/mach-omap2/omap-hotplug.c                 |    2 
 arch/arm/mach-omap2/omap-secure.c                  |    2 
 arch/arm/mach-omap2/omap-secure.h                  |    0 
 arch/arm/mach-omap2/omap-smp.c                     |    4 -
 arch/arm/mach-omap2/omap-wakeupgen.c               |    4 -
 arch/arm/mach-omap2/omap-wakeupgen.h               |    0 
 arch/arm/mach-omap2/omap4-common.c                 |    2 
 arch/arm/mach-omap2/omap4-keypad.h                 |    0 
 arch/arm/mach-omap2/omap_hwmod_2420_data.c         |    4 -
 arch/arm/mach-omap2/omap_hwmod_2430_data.c         |    2 
 .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c |    2 
 .../mach-omap2/omap_hwmod_2xxx_interconnect_data.c |    4 -
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c         |    6 +
 arch/arm/mach-omap2/sleep44xx.S                    |    2 
 arch/arm/mach-omap2/usb-musb.c                     |    2 
 arch/arm/plat-omap/Makefile                        |    2 
 arch/arm/plat-omap/i2c.c                           |    1 
 arch/arm/plat-omap/include/plat/omap-serial.h      |    2 
 arch/arm/plat-omap/include/plat/param.h            |    8 --
 arch/arm/plat-omap/mux.c                           |   90 --------------------
 drivers/input/keyboard/omap-keypad.c               |    2 
 drivers/input/serio/ams_delta_serio.c              |    2 
 drivers/mtd/nand/ams-delta.c                       |    2 
 drivers/pcmcia/omap_cf.c                           |    2 
 drivers/spi/spi-omap-uwire.c                       |    2 
 drivers/usb/host/ohci-omap.c                       |    2 
 drivers/usb/musb/tusb6010_omap.c                   |    1 
 drivers/usb/otg/isp1301_omap.c                     |    2 
 drivers/video/backlight/omap1_bl.c                 |    2 
 drivers/video/omap/lcd_ams_delta.c                 |    2 
 drivers/video/omap/lcd_mipid.c                     |    2 
 drivers/video/omap/lcd_osk.c                       |    2 
 sound/soc/omap/ams-delta.c                         |    2 
 sound/soc/omap/zoom2.c                             |    2 
 117 files changed, 181 insertions(+), 255 deletions(-)
 rename arch/arm/{plat-omap/include/plat/board-ams-delta.h => mach-omap1/include/mach/board-ams-delta.h} (100%)
 rename arch/arm/{plat-omap/include/plat/board-sx1.h => mach-omap1/include/mach/board-sx1.h} (100%)
 rename arch/arm/{plat-omap/include/plat/board-voiceblue.h => mach-omap1/include/mach/board-voiceblue.h} (100%)
 rename arch/arm/{plat-omap/include/plat/flash.h => mach-omap1/include/mach/flash.h} (100%)
 rename arch/arm/{plat-omap/include/plat/irda.h => mach-omap1/include/mach/irda.h} (100%)
 rename arch/arm/{plat-omap/include/plat/keypad.h => mach-omap1/include/mach/keypad.h} (100%)
 rename arch/arm/{plat-omap/include/plat/lcd_mipid.h => mach-omap1/include/mach/lcd_mipid.h} (100%)
 rename arch/arm/{plat-omap/include/plat/mux.h => mach-omap1/include/mach/mux.h} (100%)
 delete mode 100644 arch/arm/mach-omap1/include/mach/smp.h
 rename arch/arm/mach-omap2/{include/mach/am35xx.h => am35xx.h} (100%)
 rename arch/arm/mach-omap2/{include/mach/board-rx51.h => board-rx51.h} (100%)
 rename arch/arm/mach-omap2/{include/mach/board-zoom.h => board-zoom.h} (100%)
 rename arch/arm/mach-omap2/{include/mach/ctrl_module_core_44xx.h => ctrl_module_core_44xx.h} (100%)
 rename arch/arm/mach-omap2/{include/mach/ctrl_module_pad_core_44xx.h => ctrl_module_pad_core_44xx.h} (100%)
 rename arch/arm/mach-omap2/{include/mach/ctrl_module_pad_wkup_44xx.h => ctrl_module_pad_wkup_44xx.h} (100%)
 rename arch/arm/mach-omap2/{include/mach/ctrl_module_wkup_44xx.h => ctrl_module_wkup_44xx.h} (100%)
 rename arch/arm/{plat-omap/include/plat/debug-devices.h => mach-omap2/debug-devices.h} (100%)
 rename arch/arm/{plat-omap/include/plat/gpmc-smc91x.h => mach-omap2/gpmc-smc91x.h} (100%)
 rename arch/arm/{plat-omap/include/plat/gpmc-smsc911x.h => mach-omap2/gpmc-smsc911x.h} (100%)
 rename arch/arm/{plat-omap/include/plat/hdq1w.h => mach-omap2/hdq1w.h} (100%)
 rename arch/arm/mach-omap2/{include/mach/id.h => id.h} (100%)
 delete mode 100644 arch/arm/mach-omap2/include/mach/smp.h
 rename arch/arm/{plat-omap/include/plat/l3_2xxx.h => mach-omap2/l3_2xxx.h} (100%)
 rename arch/arm/{plat-omap/include/plat/l3_3xxx.h => mach-omap2/l3_3xxx.h} (100%)
 rename arch/arm/{plat-omap/include/plat/l4_2xxx.h => mach-omap2/l4_2xxx.h} (100%)
 rename arch/arm/{plat-omap/include/plat/l4_3xxx.h => mach-omap2/l4_3xxx.h} (100%)
 rename arch/arm/mach-omap2/{include/mach/omap-secure.h => omap-secure.h} (100%)
 rename arch/arm/mach-omap2/{include/mach/omap-wakeupgen.h => omap-wakeupgen.h} (100%)
 rename arch/arm/{plat-omap/include/plat/omap4-keypad.h => mach-omap2/omap4-keypad.h} (100%)
 delete mode 100644 arch/arm/plat-omap/include/plat/param.h
 delete mode 100644 arch/arm/plat-omap/mux.c
Signature · 1 line
Signature