Signed-off-by: NSundar Iyer <sundar.iyer@stericsson.com>
[Minor fixups to GPIO enumerators]
Signed-off-by: NLinus Walleij <linus.walleij@stericsson.com>

Move keylayouts to a dedicated file and plug these keylayouts
for input platform data. This will make addition of new and custom
keylayouts localized.
Signed-off-by: NSundar Iyer <sundar.iyer@stericsson.com>
Signed-off-by: NLinus Walleij <linus.walleij@stericsson.com>

Acked-by: NSamuel Ortiz <sameo@linux.intel.com>
Signed-off-by: NSundar Iyer <sundar.iyer@stericsson.com>
Signed-off-by: NLinus Walleij <linus.walleij@stericsson.com>

Skip putting the GPIO module into a reset during the chip init.  This makes
sure to preserve any existing GPIO configurations done by pre-kernel boot code.
Acked-by: NSamuel Ortiz <sameo@linux.intel.com>
Signed-off-by: NSundar Iyer <sundar.iyer@stericsson.com>
Signed-off-by: NLinus Walleij <linus.walleij@stericsson.com>

On the TC35892, a random delayed interrupt clear (GPIO IC) write locks up the
child interrupts. In such a case, the original interrupt is active and not yet
acknowledged. Re-check the IRQST bit for any pending interrupts and handle
those.
Acked-by: NSamuel Ortiz <sameo@linux.intel.com>
Signed-off-by: NSundar Iyer <sundar.iyer@stericsson.com>
Signed-off-by: NLinus Walleij <linus.walleij@stericsson.com>

Add block identifier to be able to add multiple mfd clients
to the mfd core
Acked-by: NSamuel Ortiz <sameo@linux.intel.com>
Signed-off-by: NSundar Iyer <sundar.iyer@stericsson.com>
Signed-off-by: NLinus Walleij <linus.walleij@stericsson.com>

Most of the register layout, client IRQ numbers on the TC35892 is shared also
by other variants. Make this generic as tc3589x
Acked-by: NSamuel Ortiz <sameo@linux.intel.com>
Signed-off-by: NSundar Iyer <sundar.iyer@stericsson.com>
Signed-off-by: NLinus Walleij <linus.walleij@stericsson.com>

Rename the tc35892 core/gpio drivers to tc3589x to include
new variants in the same mfd core
Acked-by: NSamuel Ortiz <sameo@linux.intel.com>
Signed-off-by: NSundar Iyer <sundar.iyer@stericsson.com>
Signed-off-by: NLinus Walleij <linus.walleij@stericsson.com>

Rename the header file to include further variants within
the same mfd core driver
Acked-by: NSamuel Ortiz <sameo@linux.intel.com>
Signed-off-by: NSundar Iyer <sundar.iyer@stericsson.com>
Signed-off-by: NLinus Walleij <linus.walleij@stericsson.com>

Acked-by: NSamuel Ortiz <sameo@linux.intel.com>
Signed-off-by: NSundar Iyer <sundar.iyer@stericsson.com>
Signed-off-by: NLinus Walleij <linus.walleij@stericsson.com>

Signed-off-by: NMartin Persson <martin.persson@stericsson.com>
Signed-off-by: NLinus Walleij <linus.walleij@stericsson.com>

Adds support in PRCMU driver to handle CPU and APE operating points.
Signed-off-by: NMartin Persson <martin.persson@stericsson.com>
Signed-off-by: NLinus Walleij <linus.walleij@stericsson.com>

The DB5500 PER6 clock rate is the same as the DB8500 one, i.e. 133.33 MHz.
Signed-off-by: NRabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: NLinus Walleij <linus.walleij@stericsson.com>

Remove the irq number macros which don't specify which SoC they're for.
Signed-off-by: NRabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: NLinus Walleij <linus.walleij@stericsson.com>

Rework gpio registration to remove build-time
changing macros.
Signed-off-by: NRabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: NLinus Walleij <linus.walleij@stericsson.com>

Platforms may choose not to provide an additional name for the GPIO
block.
Signed-off-by: NRabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: NLinus Walleij <linus.walleij@stericsson.com>

The uncompress code for zImage uses the UART to print status messages,
this was hard coded to use UART2 for the U8500 platform. This patch
checks at run time which platform it is run on. U5500 uses UART0 as
console UART.
Signed-off-by: NCarl-Johan Irekvist <carl-johan.irekvist@stericsson.com>
Signed-off-by: NRabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: NLinus Walleij <linus.walleij@stericsson.com>

Add basic DMA configuration for u5500 supporting memcpy.
Make way for SDI0 dma support by setting SDI0 to -1,
indicating it will be configured in runtime.
Signed-off-by: NPer Forlin <per.forlin@linaro.org>
Signed-off-by: NLinus Walleij <linus.walleij@stericsson.com>

U5500 now boots from sdi0 (onboard eMMC).
Change machine type to U5500.
Adjust uart and sdi0 clock rates for u5500.
All necessary clocks must be enabled before Linux starts because
there is no clock tree support in u5500 yet.
Signed-off-by: NPer Forlin <per.forlin@linaro.org>
Signed-off-by: NLinus Walleij <linus.walleij@stericsson.com>

PRCMU driver only supports u8500. Don't
initialize prcmu if running on u5500.
Signed-off-by: NPer Forlin <per.forlin@linaro.org>
Signed-off-by: NLinus Walleij <linus.walleij@stericsson.com>

Signed-off-by: NSundar Iyer <sundar.iyer@stericsson.com>
Signed-off-by: NLinus Walleij <linus.walleij@stericsson.com>

PRCM_TCR enables the various timers in the system. This must be achieved
before any of the MTUs are usable for kernel usage. Explicit enabling of
this in the kernel makes it independent of bootloader actions.
Signed-off-by: NSundar Iyer <sundar.iyer@stericsson.com>
Signed-off-by: NLinus Walleij <linus.walleij@stericsson.com>

In the nomadik GPIO pin configuration, allow the sleep mode direction
and pull configurations to differ from the ones for the normal state.
PIN_SLPM_PULL_*, PIN_SLPM_INPUT, PIN_SLPM_OUTPUT* macros are provided
for this.

Since the hardware does not allow seperate configurations for sleep mode
and normal mode, this is implemented by having software remux the
configurations as necessary.
Reviewed-by: NSrinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
Signed-off-by: NRabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: NMian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
Signed-off-by: NLinus Walleij <linus.walleij@stericsson.com>

A small fixup for the v1(.0) ASIC.
Signed-off-by: NLinus Walleij <linus.walleij@stericsson.com>

This patch removes the dublicated define for number of
interrupts and instead include the needed header file.
Signed-off-by: NMattias Wallin <mattias.wallin@stericsson.com>
Signed-off-by: NLinus Walleij <linus.walleij@stericsson.com>

This patch adds support for db8500 chip version 2.
The TCDM memory address of the PRCMU is changed and
dynamic detection of that is added.
Signed-off-by: NMattias Wallin <mattias.wallin@stericsson.com>
Acked-by: NLinus Walleij <linus.walleij@stericsson.com>

Change the Ux500 devices to be dynamically allocated and added by
calling functions instead of referencing structures, thereby allowing
5500 and other derivatives' support to be added without having to
duplicate structures, use fixup functions, or use compile-time macros.
Signed-off-by: NRabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: NLinus Walleij <linus.walleij@stericsson.com>

Similar to the patch to MMCI this silences similar messages from
the platform code.
Signed-off-by: NLinus Walleij <linus.walleij@stericsson.com>

Acked-by: NLinus Walleij <linus.walleij@stericsson.com>
Signed-off-by: NRabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: NLinus Walleij <linus.walleij@stericsson.com>

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Use call_rcu_sched() for pagetables

PowerPC relies on IRQ-disable to guard against RCU quiecent states,
use the appropriate RCU call version.
Signed-off-by: NPeter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>

This reverts commit e0fdace1.

On-list discussion seems to suggest that the robustness fixes for printk
make this unnecessary and DaveM has also agreed in person at Kernel Summit
and on list.

The main problem with this code is once we hit a lockdep splat we always
keep oops_in_progress set, the console layer uses oops_in_progress with KMS
to decide when it should be showing the oops and not showing X, so it causes
problems around suspend/resume time when a userspace resume can cause a console
switch away from X, only if oops_in_progress is set (which is what we want
if an oops actually is in progress, but not because we had a lockdep splat
2 days prior).

Cc: David S Miller <davem@davemloft.net>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: NDave Airlie <airlied@redhat.com>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  tpm: Autodetect itpm devices

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (27 commits)
  af_unix: limit recursion level
  pch_gbe driver: The wrong of initializer entry
  pch_gbe dreiver: chang author
  ucc_geth: fix ucc halt problem in half duplex mode
  inet: Fix __inet_inherit_port() to correctly increment bsockets and num_owners
  ehea: Add some info messages and fix an issue
  hso: fix disable_net
  NET: wan/x25_asy, move lapb_unregister to x25_asy_close_tty
  cxgb4vf: fix setting unicast/multicast addresses ...
  net, ppp: Report correct error code if unit allocation failed
  DECnet: don't leak uninitialized stack byte
  au1000_eth: fix invalid address accessing the MAC enable register
  dccp: fix error in updating the GAR
  tcp: restrict net.ipv4.tcp_adv_win_scale (#20312)
  netns: Don't leak others' openreq-s in proc
  Net: ceph: Makefile: Remove unnessary code
  vhost/net: fix rcu check usage
  econet: fix CVE-2010-3848
  econet: fix CVE-2010-3850
  econet: disallow NULL remote addr for sendmsg(), fixes CVE-2010-3849
  ...

Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
  OMAP2+: PM/serial: hold console semaphore while OMAP UARTs are disabled
  OMAP: UART: don't resume UARTs that are not enabled.

Some Lenovos have TPMs that require a quirk to function correctly. This can
be autodetected by checking whether the device has a _HID of INTC0102. This
is an invalid PNPid, and as such is discarded by the pnp layer - however
it's still present in the ACPI code, so we can pull it out that way. This
means that the quirk won't be automatically applied on non-ACPI systems,
but without ACPI we don't have any way to identify the chip anyway so I
don't think that's a great concern.
Signed-off-by: NMatthew Garrett <mjg@redhat.com>
Acked-by: NRajiv Andrade <srajiv@linux.vnet.ibm.com>
Tested-by: NJiri Kosina <jkosina@suse.cz>
Tested-by: NAndy Isaacson <adi@hexapodia.org>
Signed-off-by: NJames Morris <jmorris@namei.org>

* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: (24 commits)
  Btrfs: don't use migrate page without CONFIG_MIGRATION
  Btrfs: deal with DIO bios that span more than one ordered extent
  Btrfs: setup blank root and fs_info for mount time
  Btrfs: fix fiemap
  Btrfs - fix race between btrfs_get_sb() and umount
  Btrfs: update inode ctime when using links
  Btrfs: make sure new inode size is ok in fallocate
  Btrfs: fix typo in fallocate to make it honor actual size
  Btrfs: avoid NULL pointer deref in try_release_extent_buffer
  Btrfs: make btrfs_add_nondir take parent inode as an argument
  Btrfs: hold i_mutex when calling btrfs_log_dentry_safe
  Btrfs: use dget_parent where we can UPDATED
  Btrfs: fix more ESTALE problems with NFS
  Btrfs: handle NFS lookups properly
  btrfs: make 1-bit signed fileds unsigned
  btrfs: Show device attr correctly for symlinks
  btrfs: Set file size correctly in file clone
  btrfs: Check if dest_offset is block-size aligned before cloning file
  Btrfs: handle the space_cache option properly
  btrfs: Fix early enospc because 'unused' calculated with wrong sign.
  ...

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  EDAC: Fix typos in Documentation/edac.txt
  EDAC, MCE: Fix edac_init_mce_inject error handling
  EDAC: Remove deprecated kbuild goal definitions

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
  GFS2: Userland expects quota limit/warn/usage in 512b blocks