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

Commit 2ed25580 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v4.2/clean' of... 

Merge tag 'omap-for-v4.2/clean' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup

Merge "Clean-up for omaps for v4.2 merge window" from Tony Lindgren:

Drop more omap3 legacy board-*.c files for v4.2. This time we're
dropping the board files for beagle, overo and cm-t35.

The reason for dropping these now rather than later is that now
we can simply revert the patches in case of unexpected issues as
we are not dropping any platform data at this point.

This leaves us with only the following board-*.c files:

BOARD                   REASON NEEDED
board-ldp.c             Still used in RMKs boot test system
board-omap3logic.c      Getting a .dts file for v4.2
board-omap3pandora.c    Got a .dts file for v4.1
board-rx51-*.c          Needs /proc/atags support for user space

I'm hoping we can drop the remaining board-*.c for v4.3 merge
window, then keep the platform data around for one more merge
window in case of reverting needed, then drop the platform data
too for v4.4 if no issues needing reverting are found.

Also, few patches to clean-up the usage of Linux generic
macros:

- Use define for console loglevel

- Use const for struct irq_domain_ops

- Use PTR_ERR_OR_ZERO instead of PTR_RET

* tag 'omap-for-v4.2/clean' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  mach-omap2: Remove use of deprecated marco, PTR_RET in devices.c
  ARM: OMAP2+: Remove calls to deprecacted marco,PTR_RET in the files,fb.c and pmu.c
  ARM: OMAP2+: Constify irq_domain_ops
  ARM: OMAP2+: use symbolic defines for console loglevels instead of numbers
  ARM: OMAP2+: Remove legacy booting support for Beagleboards
  ARM: OMAP2+: Remove legacy booting support for Overo
  ARM: OMAP2+: Remove legacy booting support for cm-t35
parents cbdf76ab fd0dbc83

arch/arm/mach-omap2/Kconfig

+0 −22
Original line number Diff line number Diff line
@@ -171,12 +171,6 @@ config MACH_OMAP2_TUSB6010 
	depends on ARCH_OMAP2 && SOC_OMAP2420

	default y if MACH_NOKIA_N8X0



config MACH_OMAP3_BEAGLE

	bool "OMAP3 BEAGLE board"

	depends on ARCH_OMAP3

	default y

	select OMAP_PACKAGE_CBB



config MACH_OMAP_LDP

	bool "OMAP3 LDP board"

	depends on ARCH_OMAP3
@@ -203,12 +197,6 @@ config MACH_OMAP3_TORPEDO 
	 for full description please see the products webpage at

	 http://www.logicpd.com/products/development-kits/zoom-omap35x-torpedo-development-kit



config MACH_OVERO

	bool "Gumstix Overo board"

	depends on ARCH_OMAP3

	default y

	select OMAP_PACKAGE_CBB



config MACH_OMAP3517EVM

	bool "OMAP3517/ AM3517 EVM board"

	depends on ARCH_OMAP3
@@ -240,16 +228,6 @@ config MACH_NOKIA_RX51 
	default y

	select OMAP_PACKAGE_CBB



config MACH_CM_T35

	bool "CompuLab CM-T35/CM-T3730 modules"

	depends on ARCH_OMAP3

	default y

	select MACH_CM_T3730

	select OMAP_PACKAGE_CUS



config MACH_CM_T3730

       bool



config OMAP3_SDRC_AC_TIMING

	bool "Enable SDRC AC timing register changes"

	depends on ARCH_OMAP3

arch/arm/mach-omap2/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -242,17 +242,14 @@ obj-$(CONFIG_SOC_OMAP2420) += msdi.o 


# Specific board support

obj-$(CONFIG_MACH_OMAP_GENERIC)		+= board-generic.o pdata-quirks.o

obj-$(CONFIG_MACH_OMAP3_BEAGLE)		+= board-omap3beagle.o

obj-$(CONFIG_MACH_OMAP_LDP)		+= board-ldp.o

obj-$(CONFIG_MACH_OMAP3530_LV_SOM)      += board-omap3logic.o

obj-$(CONFIG_MACH_OMAP3_TORPEDO)        += board-omap3logic.o

obj-$(CONFIG_MACH_OVERO)		+= board-overo.o

obj-$(CONFIG_MACH_OMAP3_PANDORA)	+= board-omap3pandora.o

obj-$(CONFIG_MACH_NOKIA_N8X0)		+= board-n8x0.o

obj-$(CONFIG_MACH_NOKIA_RX51)		+= board-rx51.o sdram-nokia.o

obj-$(CONFIG_MACH_NOKIA_RX51)		+= board-rx51-peripherals.o

obj-$(CONFIG_MACH_NOKIA_RX51)		+= board-rx51-video.o

obj-$(CONFIG_MACH_CM_T35)		+= board-cm-t35.o



# Platform specific device init code

arch/arm/mach-omap2/board-cm-t35.c

deleted100644 → 0
+0 −769

File deleted.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-omap2/board-omap3beagle.c

deleted100644 → 0
+0 −595

File deleted.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-omap2/board-overo.c

deleted100644 → 0
+0 −571

File deleted.

Preview size limit exceeded, changes collapsed.