Merge tag 'tegra-for-3.7-drivers-i2c' of git://git.kernel.org/pub/scm/linux/kernel...

From Stephen Warren:

ARM: tegra: i2c driver enhancements mostly related to clocking

This branch contains a number of fixes and cleanups to the Tegra I2C
driver related to clocks. These are based on the common clock conversion
in order to avoid duplicating the clock driver changes before and after
the conversion. Finally, a bug-fix related to I2C_M_NOSTART is included.

This branch is based on previous pull request tegra-for-3.7-common-clk.

* tag 'tegra-for-3.7-drivers-i2c' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
  i2c: tegra: dynamically control fast clk
  i2c: tegra: I2_M_NOSTART functionality not supported in Tegra20
  ARM: tegra: clock: remove unused clock entry for i2c
  ARM: tegra: clock: add connection name in i2c clock entry
  i2c: tegra: pass proper name for getting clock
  ARM: tegra: clock: add i2c fast clock entry in clock table
  ARM: Tegra: Add smp_twd clock for Tegra20
  ARM: tegra: cpu-tegra: explicitly manage re-parenting
  ARM: tegra: fix overflow in tegra20_pll_clk_round_rate()
  ARM: tegra: Fix data type for io address
  ARM: tegra: remove tegra_timer from tegra_list_clks
  ARM: tegra30: clocks: fix the wrong tegra_audio_sync_clk_ops name
  ARM: tegra: clocks: separate tegra_clk_32k_ops from Tegra20 and Tegra30
  ARM: tegra: Remove duplicate code
  ARM: tegra: Port tegra to generic clock framework
  ARM: tegra: Add clk_tegra structure and helper functions
  ARM: tegra: Rename tegra20 clock file
  ARM: tegra20: Separate out clk ops and clk data
  ARM: tegra30: Separate out clk ops and clk data
  ARM: tegra: fix U16 divider range check
  ...
  + sync to v3.6-rc4

Resolved remove/modify conflict in arch/arm/mach-sa1100/leds-hackkit.c
caused by the sync with v3.6-rc4.

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --combined arch/arm/Kconfig
index ac353cf0180bb17056957dbfe6881fb989f26ef7,b23213d2764ee42c74a465fe59aa24f2baf71f6d..aad7400e0913141288022d7784eb375d204e63f1
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -38,7 -38,6 +38,6 @@@ config AR
        select HARDIRQS_SW_RESEND
        select GENERIC_IRQ_PROBE
        select GENERIC_IRQ_SHOW
-       select GENERIC_IRQ_PROBE
        select ARCH_WANT_IPC_PARSE_VERSION
        select HARDIRQS_SW_RESEND
        select CPU_PM if (SUSPEND || CPU_IDLE)
@@@ -126,11 -125,6 +125,6 @@@ config TRACE_IRQFLAGS_SUPPOR
        bool
        default y
  
- config GENERIC_LOCKBREAK
-       bool
-       default y
-       depends on SMP && PREEMPT
- 
  config RWSEM_GENERIC_SPINLOCK
        bool
        default y
@@@ -692,6 -686,7 +686,7 @@@ config ARCH_TEGR
        select NEED_MACH_IO_H if PCI
        select ARCH_HAS_CPUFREQ
        select USE_OF
+       select COMMON_CLK
        help
          This enables support for NVIDIA Tegra based systems (Tegra APX,
          Tegra 6xx and Tegra 2 series).
@@@ -1787,6 -1782,59 +1782,6 @@@ config FORCE_MAX_ZONEORDE
          This config option is actually maximum order plus one. For example,
          a value of 11 means that the largest free memory block is 2^10 pages.
  
 -config LEDS
 -      bool "Timer and CPU usage LEDs"
 -      depends on ARCH_CDB89712 || ARCH_EBSA110 || \
 -                 ARCH_EBSA285 || ARCH_INTEGRATOR || \
 -                 ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \
 -                 ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \
 -                 ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \
 -                 ARCH_AT91 || ARCH_DAVINCI || \
 -                 ARCH_KS8695 || MACH_RD88F5182 || ARCH_REALVIEW
 -      help
 -        If you say Y here, the LEDs on your machine will be used
 -        to provide useful information about your current system status.
 -
 -        If you are compiling a kernel for a NetWinder or EBSA-285, you will
 -        be able to select which LEDs are active using the options below. If
 -        you are compiling a kernel for the EBSA-110 or the LART however, the
 -        red LED will simply flash regularly to indicate that the system is
 -        still functional. It is safe to say Y here if you have a CATS
 -        system, but the driver will do nothing.
 -
 -config LEDS_TIMER
 -      bool "Timer LED" if (!ARCH_CDB89712 && !ARCH_OMAP) || \
 -                          OMAP_OSK_MISTRAL || MACH_OMAP_H2 \
 -                          || MACH_OMAP_PERSEUS2
 -      depends on LEDS
 -      depends on !GENERIC_CLOCKEVENTS
 -      default y if ARCH_EBSA110
 -      help
 -        If you say Y here, one of the system LEDs (the green one on the
 -        NetWinder, the amber one on the EBSA285, or the red one on the LART)
 -        will flash regularly to indicate that the system is still
 -        operational. This is mainly useful to kernel hackers who are
 -        debugging unstable kernels.
 -
 -        The LART uses the same LED for both Timer LED and CPU usage LED
 -        functions. You may choose to use both, but the Timer LED function
 -        will overrule the CPU usage LED.
 -
 -config LEDS_CPU
 -      bool "CPU usage LED" if (!ARCH_CDB89712 && !ARCH_EBSA110 && \
 -                      !ARCH_OMAP) \
 -                      || OMAP_OSK_MISTRAL || MACH_OMAP_H2 \
 -                      || MACH_OMAP_PERSEUS2
 -      depends on LEDS
 -      help
 -        If you say Y here, the red LED will be used to give a good real
 -        time indication of CPU usage, by lighting whenever the idle task
 -        is not currently executing.
 -
 -        The LART uses the same LED for both Timer LED and CPU usage LED
 -        functions. You may choose to use both, but the Timer LED function
 -        will overrule the CPU usage LED.
 -
  config ALIGNMENT_TRAP
        bool
        depends on CPU_CP15_MMU
@@@ -2097,6 -2145,7 +2092,7 @@@ source "drivers/cpufreq/Kconfig
  config CPU_FREQ_IMX
        tristate "CPUfreq driver for i.MX CPUs"
        depends on ARCH_MXC && CPU_FREQ
+       select CPU_FREQ_TABLE
        help
          This enables the CPUfreq driver for i.MX CPUs.
  

diff --combined arch/arm/mach-integrator/core.c
index 208c05d9e68564c354f356c40c599813398494de,3fa6c51390da0723ab904e17aed5a2dc7b869afe..2af5034ea29e5eb69a611040089949f255e8e04c
--- 1/arch/arm/mach-integrator/core.c
--- 2/arch/arm/mach-integrator/core.c
+++ b/arch/arm/mach-integrator/core.c
@@@ -11,6 -11,7 +11,7 @@@
  #include <linux/kernel.h>
  #include <linux/init.h>
  #include <linux/device.h>
+ #include <linux/export.h>
  #include <linux/spinlock.h>
  #include <linux/interrupt.h>
  #include <linux/irq.h>
@@@ -27,6 -28,7 +28,6 @@@
  #include <mach/cm.h>
  #include <mach/irqs.h>
  
 -#include <asm/leds.h>
  #include <asm/mach-types.h>
  #include <asm/mach/time.h>
  #include <asm/pgtable.h>
@@@ -126,6 -128,8 +127,6 @@@ static struct amba_pl010_data integrato
        .set_mctrl = integrator_uart_set_mctrl,
  };
  
 -#define CM_CTRL       IO_ADDRESS(INTEGRATOR_HDR_CTRL)
 -
  static DEFINE_RAW_SPINLOCK(cm_lock);
  
  /**

diff --combined drivers/mtd/nand/Kconfig
index 0d93407989542a7744b513dc26ae8a3c0f9c792d,8ca417614c5751f12354cff4b11a7aa94aaa4fcf..598cd0a3adeeabf7953344bc95dc7898b0559abe
--- 1/drivers/mtd/nand/Kconfig
--- 2/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@@ -406,6 -406,46 +406,6 @@@ config MTD_NAND_ATME
        help
          Enables support for NAND Flash / Smart Media Card interface
          on Atmel AT91 and AVR32 processors.
 -choice
 -      prompt "ECC management for NAND Flash / SmartMedia on AT91 / AVR32"
 -      depends on MTD_NAND_ATMEL
 -
 -config MTD_NAND_ATMEL_ECC_HW
 -      bool "Hardware ECC"
 -      depends on ARCH_AT91SAM9263 || ARCH_AT91SAM9260 || AVR32
 -      help
 -        Use hardware ECC instead of software ECC when the chip
 -        supports it.
 -
 -        The hardware ECC controller is capable of single bit error
 -        correction and 2-bit random detection per page.
 -
 -        NB : hardware and software ECC schemes are incompatible.
 -        If you switch from one to another, you'll have to erase your
 -        mtd partition.
 -
 -        If unsure, say Y
 -
 -config MTD_NAND_ATMEL_ECC_SOFT
 -      bool "Software ECC"
 -      help
 -        Use software ECC.
 -
 -        NB : hardware and software ECC schemes are incompatible.
 -        If you switch from one to another, you'll have to erase your
 -        mtd partition.
 -
 -config MTD_NAND_ATMEL_ECC_NONE
 -      bool "No ECC (testing only, DANGEROUS)"
 -      depends on DEBUG_KERNEL
 -      help
 -        No ECC will be used.
 -        It's not a good idea and it should be reserved for testing
 -        purpose only.
 -
 -        If unsure, say N
 -
 -endchoice
  
  config MTD_NAND_PXA3xx
        tristate "Support for NAND flash devices on PXA3xx"
@@@ -440,7 -480,7 +440,7 @@@ config MTD_NAND_NANDSI
  
  config MTD_NAND_GPMI_NAND
          bool "GPMI NAND Flash Controller driver"
-         depends on MTD_NAND && (SOC_IMX23 || SOC_IMX28 || SOC_IMX6Q)
+         depends on MTD_NAND && MXS_DMA
          help
         Enables NAND Flash support for IMX23 or IMX28.
         The GPMI controller is very powerful, with the help of BCH