Merge tag 'omap-for-v4.8/legacy-signed' of git://git.kernel.org/pub/scm/linux/kernel...

Merge "drop last omap3 board files for v4.8" from Tony Lindgren:

Remove the last two legacy board-*.c files for omap3 for legacy
booting for v4.8 to allow making mach-omap2 device tree only for
v4.9.

We've had Nokia N900 and omap3 LDP board-*.c files remaining
while other omap3 devices have been device tree only for quite
a while now. Also N900 and LDP have had device tree based booting
working for years now, but few drivers for N900 were still only
working in legacy only mode until recently. With the remaining
issues out of the way, we discussed on the mailing lists that
we're finally OK to remove the remaining board-*.c files.

For the timing of this pull request, I wanted to wait until
v4.8-rc1 is out to make sure the legacy booting still works fine
after the merge window before doing it.

And for v4.8, let's not touch any other platform data in case we
still need to revert for some reason. This makes the revert just a
question of adding back the legacy board-*.c files.

Then if no issues, we can remove the unused remaining platform
data later on for v4.9.

* tag 'omap-for-v4.8/legacy-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: Drop legacy board file for LDP
  ARM: OMAP2+: Drop legacy board file for n900

diff --combined arch/arm/mach-omap2/Kconfig
index 5a0b380a8166fde7e8a5a0489698b6624b3bf148,9f15235ab138c673bca1933f590f76c689e7e5e9..a9afeebd59f222c0db294858d50f2c2f8a3889e2
--- 1/arch/arm/mach-omap2/Kconfig
--- 2/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@@ -17,7 -17,6 +17,7 @@@ config ARCH_OMAP
        select PM_OPP if PM
        select PM if CPU_IDLE
        select SOC_HAS_OMAP2_SDRC
 +      select ARM_ERRATA_430973
  
  config ARCH_OMAP4
        bool "TI OMAP4"
@@@ -37,7 -36,6 +37,7 @@@
        select PM if CPU_IDLE
        select ARM_ERRATA_754322
        select ARM_ERRATA_775420
 +      select OMAP_INTERCONNECT
  
  config SOC_OMAP5
        bool "TI OMAP5"
@@@ -69,8 -67,6 +69,8 @@@ config SOC_AM43X
        select HAVE_ARM_SCU
        select GENERIC_CLOCKEVENTS_BROADCAST
        select HAVE_ARM_TWD
 +      select ARM_ERRATA_754322
 +      select ARM_ERRATA_775420
  
  config SOC_DRA7XX
        bool "TI DRA7XX"
@@@ -92,9 -88,9 +92,9 @@@ config ARCH_OMAP2PLU
        select ARCH_HAS_BANDGAP
        select ARCH_HAS_HOLES_MEMORYMODEL
        select ARCH_OMAP
 -      select ARCH_REQUIRE_GPIOLIB
        select CLKSRC_MMIO
        select GENERIC_IRQ_CHIP
 +      select GPIOLIB
        select MACH_OMAP_GENERIC
        select MEMORY
        select MFD_SYSCON
@@@ -192,12 -188,6 +192,6 @@@ config MACH_OMAP2_TUSB601
        depends on ARCH_OMAP2 && SOC_OMAP2420
        default y if MACH_NOKIA_N8X0
  
- config MACH_OMAP_LDP
-       bool "OMAP3 LDP board"
-       depends on ARCH_OMAP3
-       default y
-       select OMAP_PACKAGE_CBB
- 
  config MACH_OMAP3517EVM
        bool "OMAP3517/ AM3517 EVM board"
        depends on ARCH_OMAP3
@@@ -222,12 -212,6 +216,6 @@@ config MACH_NOKIA_N8X
        select MACH_NOKIA_N810
        select MACH_NOKIA_N810_WIMAX
  
- config MACH_NOKIA_RX51
-       bool "Nokia N900 (RX-51) phone"
-       depends on ARCH_OMAP3
-       default y
-       select OMAP_PACKAGE_CBB
- 
  config OMAP3_SDRC_AC_TIMING
        bool "Enable SDRC AC timing register changes"
        depends on ARCH_OMAP3
@@@ -244,12 -228,4 +232,12 @@@ endmen
  
  endif
  
 +config OMAP5_ERRATA_801819
 +      bool "Errata 801819: An eviction from L1 data cache might stall indefinitely"
 +      depends on SOC_OMAP5 || SOC_DRA7XX
 +      help
 +        A livelock can occur in the L2 cache arbitration that might prevent
 +        a snoop from completing. Under certain conditions this can cause the
 +        system to deadlock.
 +
  endmenu

diff --combined arch/arm/mach-omap2/Makefile
index a7f2d051f5240411d76fd80b7b572d310e7f30df,7ab35eb159c56c4a31aaad59ee9d59ec2f1e0dda..5b37ec29996e9de4451a918b9dccb894a138ec02
--- 1/arch/arm/mach-omap2/Makefile
--- 2/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@@ -8,7 -8,7 +8,7 @@@ ccflags-y := -I$(srctree)/$(src)/includ
  # Common support
  obj-y := id.o io.o control.o mux.o devices.o fb.o serial.o timer.o pm.o \
         common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \
 -       omap_device.o sram.o drm.o
 +       omap_device.o omap-headsmp.o sram.o drm.o
  
  hwmod-common                          = omap_hwmod.o omap_hwmod_reset.o \
                                          omap_hwmod_common_data.o
@@@ -32,7 -32,7 +32,7 @@@ obj-$(CONFIG_SOC_HAS_OMAP2_SDRC)      += sdr
  
  # SMP support ONLY available for OMAP4
  
 -smp-$(CONFIG_SMP)                     += omap-smp.o omap-headsmp.o
 +smp-$(CONFIG_SMP)                     += omap-smp.o
  smp-$(CONFIG_HOTPLUG_CPU)             += omap-hotplug.o
  omap-4-5-common                               =  omap4-common.o omap-wakeupgen.o
  obj-$(CONFIG_ARCH_OMAP4)              += $(omap-4-5-common) $(smp-y) sleep44xx.o
@@@ -78,16 -78,13 +78,16 @@@ obj-$(CONFIG_ARCH_OMAP4)           += opp4xxx_da
  endif
  
  # Power Management
 +omap-4-5-pm-common                    = omap-mpuss-lowpower.o
 +obj-$(CONFIG_ARCH_OMAP4)              += $(omap-4-5-pm-common)
 +obj-$(CONFIG_ARCH_OMAP5)              += $(omap-4-5-pm-common)
  obj-$(CONFIG_OMAP_PM_NOOP)            += omap-pm-noop.o
  
  ifeq ($(CONFIG_PM),y)
  obj-$(CONFIG_ARCH_OMAP2)              += pm24xx.o
  obj-$(CONFIG_ARCH_OMAP2)              += sleep24xx.o
  obj-$(CONFIG_ARCH_OMAP3)              += pm34xx.o sleep34xx.o
 -omap-4-5-pm-common                    =  pm44xx.o omap-mpuss-lowpower.o
 +omap-4-5-pm-common                    += pm44xx.o
  obj-$(CONFIG_ARCH_OMAP4)              += $(omap-4-5-pm-common)
  obj-$(CONFIG_SOC_OMAP5)                       += $(omap-4-5-pm-common)
  obj-$(CONFIG_SOC_DRA7XX)              += $(omap-4-5-pm-common)
@@@ -231,11 -228,7 +231,7 @@@ obj-$(CONFIG_SOC_OMAP2420)                += msdi.
  
  # Specific board support
  obj-$(CONFIG_MACH_OMAP_GENERIC)               += board-generic.o pdata-quirks.o
- obj-$(CONFIG_MACH_OMAP_LDP)           += board-ldp.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
  
  # Platform specific device init code