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

Commit 2142baba authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm: (45 commits)
  [ARM] 5489/1: ARM errata: Data written to the L2 cache can be overwritten with stale data
  [ARM] 5490/1: ARM errata: Processor deadlock when a false hazard is created
  [ARM] 5487/1: ARM errata: Stale prediction on replaced interworking branch
  [ARM] 5488/1: ARM errata: Invalidation of the Instruction Cache operation can fail
  davinci: DM644x: NAND: update partitioning
  davinci: update DM644x support in preparation for more SoCs
  davinci: DM644x: rename board file
  davinci: update pin-multiplexing support
  davinci: serial: generalize for more SoCs
  davinci: DM355 IRQ Definitions
  davinci: DM646x: add interrupt number and priorities
  davinci: PSC: Clear bits in MDCTL reg before setting new bits
  davinci: gpio bugfixes
  davinci: add EDMA driver
  davinci: timers: use clk_get_rate()
  [ARM] pxa/littleton: add missing da9034 touchscreen support
  [ARM] pxa/zylonite: configure GPIO18/19 correctly, used by 2 GPIO expanders
  [ARM] pxa/zylonite: fix the issue of unused SDATA_IN_1 pin get AC97 not working
  [ARM] pxa: make ads7846 on corgi and spitz to sync on HSYNC
  [ARM] pxa: remove unused CPU_FREQ_PXA Kconfig symbol
  ...
parents bb402c4f 0516e464

arch/arm/Kconfig

+52 −8
Original line number Diff line number Diff line
@@ -486,8 +486,6 @@ config ARCH_PXA 
	select HAVE_CLK

	select COMMON_CLKDEV

	select ARCH_REQUIRE_GPIOLIB

	select HAVE_CLK

	select COMMON_CLKDEV

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select TICK_ONESHOT
@@ -585,6 +583,8 @@ config ARCH_DAVINCI 
	select ARCH_REQUIRE_GPIOLIB

	select HAVE_CLK

	select ZONE_DMA

	select HAVE_IDE

	select COMMON_CLKDEV

	help

	  Support for TI's DaVinci platform.
@@ -740,6 +740,56 @@ if !MMU 
source "arch/arm/Kconfig-nommu"

endif



config ARM_ERRATA_411920

	bool "ARM errata: Invalidation of the Instruction Cache operation can fail"

	depends on CPU_V6 && !SMP

	help

	  Invalidation of the Instruction Cache operation can

	  fail. This erratum is present in 1136 (before r1p4), 1156 and 1176.

	  It does not affect the MPCore. This option enables the ARM Ltd.

	  recommended workaround.



config ARM_ERRATA_430973

	bool "ARM errata: Stale prediction on replaced interworking branch"

	depends on CPU_V7

	help

	  This option enables the workaround for the 430973 Cortex-A8

	  (r1p0..r1p2) erratum. If a code sequence containing an ARM/Thumb

	  interworking branch is replaced with another code sequence at the

	  same virtual address, whether due to self-modifying code or virtual

	  to physical address re-mapping, Cortex-A8 does not recover from the

	  stale interworking branch prediction. This results in Cortex-A8

	  executing the new code sequence in the incorrect ARM or Thumb state.

	  The workaround enables the BTB/BTAC operations by setting ACTLR.IBE

	  and also flushes the branch target cache at every context switch.

	  Note that setting specific bits in the ACTLR register may not be

	  available in non-secure mode.



config ARM_ERRATA_458693

	bool "ARM errata: Processor deadlock when a false hazard is created"

	depends on CPU_V7

	help

	  This option enables the workaround for the 458693 Cortex-A8 (r2p0)

	  erratum. For very specific sequences of memory operations, it is

	  possible for a hazard condition intended for a cache line to instead

	  be incorrectly associated with a different cache line. This false

	  hazard might then cause a processor deadlock. The workaround enables

	  the L1 caching of the NEON accesses and disables the PLD instruction

	  in the ACTLR register. Note that setting specific bits in the ACTLR

	  register may not be available in non-secure mode.



config ARM_ERRATA_460075

	bool "ARM errata: Data written to the L2 cache can be overwritten with stale data"

	depends on CPU_V7

	help

	  This option enables the workaround for the 460075 Cortex-A8 (r2p0)

	  erratum. Any asynchronous access to the L2 cache may encounter a

	  situation in which recent store transactions to the L2 cache are lost

	  and overwritten with stale memory contents from external memory. The

	  workaround disables the write-allocate mode for the L2 cache via the

	  ACTLR register. Note that setting specific bits in the ACTLR register

	  may not be available in non-secure mode.



endmenu



source "arch/arm/common/Kconfig"
@@ -1171,12 +1221,6 @@ config CPU_FREQ_IMX 


	  If in doubt, say N.



config CPU_FREQ_PXA

	bool

	depends on CPU_FREQ && ARCH_PXA && PXA25x

	default y

	select CPU_FREQ_DEFAULT_GOV_USERSPACE



endif



source "drivers/cpuidle/Kconfig"

arch/arm/configs/davinci_all_defconfig

0 → 100644
+1784 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/arm/configs/viper_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -298,7 +298,6 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=m 
CONFIG_CPU_FREQ_GOV_USERSPACE=m

CONFIG_CPU_FREQ_GOV_ONDEMAND=m

CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m

CONFIG_CPU_FREQ_PXA=y



#

# Floating point emulation

arch/arm/mach-davinci/Kconfig

+42 −5
Original line number Diff line number Diff line
@@ -4,19 +4,56 @@ menu "TI DaVinci Implementations" 


comment "DaVinci Core Type"



config ARCH_DAVINCI644x

	default y

config ARCH_DAVINCI_DM644x

	bool "DaVinci 644x based system"



comment "DaVinci Board Type"



config MACH_DAVINCI_EVM

	bool "TI DaVinci EVM"

	bool "TI DM644x EVM"

	default y

	depends on ARCH_DAVINCI644x

	depends on ARCH_DAVINCI_DM644x

	help

	  Configure this option to specify the whether the board used

	  for development is a DaVinci EVM

	  for development is a DM644x EVM





config DAVINCI_MUX

	bool "DAVINCI multiplexing support"

	depends on ARCH_DAVINCI

	default y

	help

	  Pin multiplexing support for DAVINCI boards. If your bootloader

	  sets the multiplexing correctly, say N. Otherwise, or if unsure,

	  say Y.



config DAVINCI_MUX_DEBUG

        bool "Multiplexing debug output"

        depends on DAVINCI_MUX

        help

          Makes the multiplexing functions print out a lot of debug info.

          This is useful if you want to find out the correct values of the

          multiplexing registers.



config DAVINCI_MUX_WARNINGS

        bool "Warn about pins the bootloader didn't set up"

        depends on DAVINCI_MUX

        help

          Choose Y here to warn whenever driver initialization logic needs

          to change the pin multiplexing setup.  When there are no warnings

          printed, it's safe to deselect DAVINCI_MUX for your product.



config DAVINCI_RESET_CLOCKS

	bool "Reset unused clocks during boot"

	depends on ARCH_DAVINCI

	help

	  Say Y if you want to reset unused clocks during boot.

	  This option saves power, but assumes all drivers are

	  using the clock framework. Broken drivers that do not

	  yet use clock framework may not work with this option.

	  If you are booting from another operating system, you

	  probably do not want this option enabled until your

	  device drivers work properly.



endmenu

arch/arm/mach-davinci/Makefile

+7 −2
Original line number Diff line number Diff line
@@ -5,7 +5,12 @@ 


# Common objects

obj-y 			:= time.o irq.o clock.o serial.o io.o id.o psc.o \

			   gpio.o mux.o devices.o usb.o

			   gpio.o devices.o dma.o usb.o



obj-$(CONFIG_DAVINCI_MUX)		+= mux.o



# Chip specific

obj-$(CONFIG_ARCH_DAVINCI_DM644x)       += dm644x.o



# Board specific

obj-$(CONFIG_MACH_DAVINCI_EVM)  += board-evm.o
 
obj-$(CONFIG_MACH_DAVINCI_EVM)  	+= board-dm644x-evm.o