Squashed commit of the following:

commit 67d90e0a69024227236db95c9a0b5126847c3595
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 11:58:02 2014 +0100

    ARM: tegra: Add DT support for Tegra30 EMC tables

    Implements function to parse EMC tables from
    device tree.

    This fixes compilation errors for board-grouper-memory.c

commit 517dbeec64c2d26b4a6c6118a8211ef6b39f2853
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 11:50:28 2014 +0100

    arm: tegra: grouper: Fix remaining grouper board error

    This was a simple syntax error again.

commit df76ff44a45db0c7aefca60d2faab9e9623ccf6f
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 11:41:54 2014 +0100

    arm: tegra: grouper: Fix syntax errors in grouper board files

commit 20a3816ca0b8f8636c97355a46f941f285aef98f
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 11:37:33 2014 +0100

    arm: tegra: grouper: Remove an enormous amount of errors

    removed int i from kbc as it's unused, and add in another include
    which gets rid of most errors.

commit 159e4a9203f61a98290bc6b4ef691ca44bcd3d34
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 11:32:24 2014 +0100

    ARM: tegra: TMR8/TMR9 not to be used for watchdog

    TMR7 is used for watchdog. TMR10 is used for suspend/resume
    recovery only.

commit 60116f4ea5aa574750693cdf852d34b2edb77503
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 11:30:57 2014 +0100

    arm: tegra: fuse: Registered tegra-fuse device in T30 board files

    Registered tegra-fuse platform device in grouper board file

commit b85aac5a241c66daa7b7482e83d511befb8f28f0
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 11:30:19 2014 +0100

    arm: tegra: Add raydium touch clock names

    Add the clock names for the raydium touch driver. Also remove
    clk_enable()s as the raydium driver now properly enables the touch
    clock.

commit 2a695b96d2048c2c56b2da28cf46ced53c292033
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 11:28:14 2014 +0100

    ARM: tegra: grouper: Fix potential build issue

    Kai has build issue, the cherry-pick from rel_16 has a stale variable.
    Remove the stale variable to fix this issue.

    Better safe than sorry so let's assume this is the same for grouper.

commit 5f637a6eac9bc00e5f22d0c23af393a2c442ce2c
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 11:27:24 2014 +0100

    arm: tegra: board: Add support for odm data for modem

    Cardhu and Kai to use the odm data to register usb interface on which
    modem is connected.
    Also set the hotplug flag to true.

    Assuming this is also true for grouper

commit 9f7f274526fb88f55f3575c97a03daa9dbc769ef
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 11:24:03 2014 +0100

    Replace "kai" with "grouper" in board files again

commit 67983ef25b90b82decd0225fdac1924951e4a5d4
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 11:23:37 2014 +0100

    ARM: tegra: Remove DT code when DT not supported

    L4T and some SoCs does not have support device trees, but the kernel
    configuration still enables CONFIG_USE_OF.

    Disable CONFIG_USE_OF in Kconfig. It is enabled already by all
    defconfigs where DT is really supported. This allows drivers to
    migrate to device trees gracefully. Also adds CONFIG_USE_OF back to
    tegra3_android_defconfig as it was accidentally removed.

commit 9b5fc80ad76884b28f4f3fb019cd07b5b8d5bfa5
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 11:22:21 2014 +0100

    touch: raydium: Update to board files

    Nvidia updates to
    add names for platform id, clocks to data
    descriptors. Correct 1.8V and 3.3V names
    for touch screen.

commit c277be24940b6bb7b022eac1083334948c82a5cb
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 11:17:22 2014 +0100

    ARM: tegra3: remove <board>-throttle_list_init functions

commit 3010053df9ba791a753ab13c48f6c92b00f45875
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 11:16:39 2014 +0100

    ARM: tegra: thermal: Remove tegra therm dependency

    Removed the use of the Tegra thermal layer. All management
    is now done via Linux thermal framework via thermal_zone_devices
    and thermal_cooling_zones.

commit 25af4208cb1bf702d06f9069136c0f0796fbe13f
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 11:12:37 2014 +0100

    arm: tegra: grouper: supply device name for regulator

    Supply the appropriate device name for battery charging regulator

commit 5bb6febdfac1cacbccace104bd7114f4b0256335
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 11:10:51 2014 +0100

    ARM: tegra: move uart debug port initialization into common file.

    There is lots of duplicate code for initializing
    the debug port for all platform.
    Move this to board-common file so that duplicate code
    can be avoided.

    Completed for grouper also. Hopefully all these new includes
    will mean reduced errors.

commit 4f04fadae9752feefd1345153bdc35943eb22189
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 11:07:13 2014 +0100

    touch: Raydium: Remove hex blob data structures from board files.

commit 41af9800dfd102663cb0b977ddb3a0af80a7b098
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 11:05:57 2014 +0100

    touch: Radyium: Move panel config structures to board files.

commit b31d4c3093f2f3c381e4616a28e2f758db9f7941
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 10:13:29 2014 +0100

    Arm: tegra: grouper: replaced "kai" with "grouper" everywhere

    This should fix potential dum woopsies

commit 081dd9991b6d935cd47db34419b6e053093156cd
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 10:12:20 2014 +0100

    arm: tegra: soc device registration

    soc_device_register() for getting soc machine, family,revision
    and soc_id.

    soc_id format is Revision:SKU:PackageID

commit 00aaab2e06166cc1864f022dcccea94a452b1ebf
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 10:10:25 2014 +0100

    arm: tegra: add device tree support

    Enable device tree support for grouper by adding board compatible tables.

    Hopefully this works with the .dts stuff from 3.1.10. If not then
    we have even more work on our hands than I thought.

commit e3d83d5a68508856657715a8f869907fbf0fcbbf
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 10:07:00 2014 +0100

    ARM: tegra: thermal: Refactored thermals

    1) Removed skin thermals from tegra_thermal layer
    2) Removed throttle initialization from tegra_thermal layer
    3) Simplified thermal device interface
    4) Create a therm estimator device as a platform device

    There were lots of errors here, lets hope this drastically reduces
    them.

commit ce59fc52af7e8ff73ef3bdf098860a716dea7a2b
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 10:03:12 2014 +0100

    arm: tegra: board: remove board specific vbus initializers

    Removed the board dependency for the vbus regulators and the vbus gpio in
    tegra platforms. Vbus need not be specified from the board files any more.

commit e5bff49cf05d1a8f80e6be31507e93370d61c496
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 10:02:06 2014 +0100

    ARM: tegra: rt5640: remove passing of regulator name

    Hardcode the regulator name based on device pin names and
    passing correct information through platform data.

commit 9a42575dda2226b862c160bd74060de4dbfd47c0
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 09:58:37 2014 +0100

    ARM: Tegra: Add audio regulators for Grouper

    Add regulator id in platform data
    Pass this info to ALSA driver using platform data

commit 9502af8ac8fc0a698f7a58f6c687b40e1e99b86d
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 09:56:55 2014 +0100

    ARM: tegra: thermal: Thermal Refactor

    Removed all edp and throttling specific code in the tegra
    thermal framework.

commit c48951505457243d7c1be4e22b6b063816748b1f
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 09:54:34 2014 +0100

    ARM: tegra: thermal: Cleaned up thermal framework

    Removed shutdown and tc1,tc2,passive delay parameters from
    thermal state.

commit fbff9b66e9ca36cd4ee81aab41b37ffeea253c49
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 09:51:14 2014 +0100

    ARM: tegra: thermal: Separate skin from thermals

    Started seperating skin thermal logic from generic
    thermal logic.

commit 30e073e3b93a6cccb533eb4f06127bac45fbf0b6
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 09:49:46 2014 +0100

    ARM: tegra: thermal: Cleanup thermal dependencies

    Cleaned up dependencies related to thermals:

    1) Added TEGRA_THERMAL Kconfig option which enables
    Tegra Thermal Framework

    2) Removed unnecessary ifdefs from board files and thermal
    files

    Of course this has already been done, just cleaned up for grouper
    too now.

commit a4767af4b017735540bb4e0130ba6ef5569c0875
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 09:48:29 2014 +0100

    ARM: tegra: integration of slave mode support.

    Add configurability support for i2s parameters accross all board.

    Nvidia need to make theie minds up.

commit 06d2ed5fe43b937324fd9bbd0729b81fb8382481
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 09:45:14 2014 +0100

    ARM: tegra: Create IOMMU map at board_init w/ PLATFORM_IOMMUABLE

    Create IOMMU map at board_init with CONFIG_PLATFORM_IOMMUABLE enabled.

commit 203c602f37b424c16e6540dd0f0c2bf8d334cdc3
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 09:43:28 2014 +0100

    Revert "ARM: tegra: integration of slave mode support."

    This reverts commit aea96f42f969704331d7547fd7864dabebcb9bcc.

commit aea96f42f969704331d7547fd7864dabebcb9bcc
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 09:40:31 2014 +0100

    ARM: tegra: integration of slave mode support.

    Add configurability support for i2s parameters accross all board.

    And now grouper

commit 96119e3efa2dc846519b9814ba238f08efd7973f
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 09:37:45 2014 +0100

    arm: tegra: sd: enable sd dpd

    This is a WAR solution that allows for the turning on
    SD DPD feature.

    The original issue is that enabling SD DPD immediately after device comes
    out of LP0 causes ULPI disconnect. The root cause of that is
    not known.

    The WAR is to delay the enabling of SD DPD for 100ms after
    device comes out of LP0.

    Enabled for grouper now

commit dde4ad97c4a68b9f065f72a43969cddf3122cb67
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 09:35:54 2014 +0100

    arm: tegra: grouper: use regulator to control vbus

    Use regulator instead of USB OTG callback to control USB VBUS.

commit e774a1def2055811a7f8f5dc89c91625d33948c9
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 09:32:53 2014 +0100

    arm: tegra: grouper: Added more includes

    Could've sworn I already had these in

commit 2bd16bdf3d0657463dd8b934a126cfde35849496
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 09:31:06 2014 +0100

    ARM: tegra: fiq_dbg: Enable FIQ serial debug

    Add platform callback to initialize and enable FIQ serial
    debugger

commit 242860a38263e4213b26dc6e3ff58ee569440d78
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 09:28:53 2014 +0100

    ARM: tegra: wdt: Replace legacy WDT with CPU WDTs

    Tegra3 adds new CPU watchdog timers. Replace legacy WDT with
    CPU WDTs in all Tegra3 platforms.

    COmpleted this for grouper as well now.

commit f481d72dd2ccd5c9ab29a3f7f8aaca18ea239134
Author: enssorcel <callumross12@gmail.com>
Date:   Tue Jun 24 09:26:20 2014 +0100

    ARM: tegra: grouper: Add platform data to spi_device1

    Adding platform data to spi_device1 and limiting
    buffer to 128

commit d95cb3a0acb972f019591e3c95e5bf14d7bfd648
Author: enssorcel <callumross12@gmail.com>
Date:   Mon Jun 23 22:38:34 2014 +0100

    drivers: skin: Skin prediction algorithm

    Added skin prediction algorithm.

commit 2218cf837c3f0eb5dfd9203e3ea3532db4e059fa
Author: enssorcel <callumross12@gmail.com>
Date:   Mon Jun 23 22:07:30 2014 +0100

    arm: tegra: board-files: remove usage of TEGRA_GPIO_TO_IRQ

    we've moved to IRQ domains, and need to use gpio_to_irq
    instead of TEGRA_GPIO_TO_IRQ to get correct results.

commit e971589a2f2e4c39f2a16b8538c26cadd7670d4e
Merge: d99049b 20ead2b
Author: enssorcel <callumross12@gmail.com>
Date:   Mon Jun 23 21:45:14 2014 +0100

    Merge branch 'board-grouper-testing' of https://github.com/enssorcel/Grouper-3.4 into board-grouper-testing

commit d99049bd81f58f77f338ec9f651f53bbc7b7dd98
Author: enssorcel <callumross12@gmail.com>
Date:   Mon Jun 23 21:43:24 2014 +0100

    Remove accidental duplication of closing braces in board-grouper.c

    I wasn't careful enough in the last commit, so here's some mess
    cleaned up hopefully removing future stupid errors.

commit 20ead2bf20388509e2d49696e8a3ddbf5455746b
Merge: 5e2c1fa c87b3ad
Author: enssorcel <enssorcel@users.noreply.github.com>
Date:   Mon Jun 23 19:26:58 2014 +0100

    Merge pull request #2 from souljaboy11792/board-grouper-testing

    include/linux: Add earlysuspend.h and interrupt_keys.h

commit c87b3adba395bf69519ae11c07c5831ec28627f8
Author: souljaboy11792 <fayad.chowdhury@gmail.com>
Date:   Mon Jun 23 11:05:56 2014 +0200

    include/linux: Also add interrupt_keys.h

commit 5131b3d32ec1a76acb01de555b3ea916b42eb36c
Author: souljaboy11792 <fayad.chowdhury@gmail.com>
Date:   Mon Jun 23 09:30:26 2014 +0200

    include/linux: Add earlysuspend.h

commit c1bee57b2be2f8a626d0814970f4e3dc7f267041
Author: enssorcel <callumross12@gmail.com>
Date:   Sun Jun 22 22:27:34 2014 +0100

    ARM: SoC: Tegra: Convert Tegra to SoC descriptor

    Convert all the remaining boards which are not present upstream to SoC
    descriptor

    (But for real this time, because grouper is now updated)

commit c768be0fad76864027a4b2f48d1d1b9846eda796
Author: enssorcel <callumross12@gmail.com>
Date:   Sun Jun 22 22:25:18 2014 +0100

    ARM: Tegra: Grouper: Move Raydium init declaration

    Move Raydium touch init declaration from board-specific
    board-grouper.h to generic board-touch.h

commit d8c1ecffb318288b81c973351f896f239504b44f
Author: enssorcel <callumross12@gmail.com>
Date:   Sun Jun 22 22:24:02 2014 +0100

    ARM: tegra: grouper: Remove tegra_gpio_enable/disable

    Removing tegra_gpio_enable and disable calls
    from board files as they are supported thorugh
    set direction calls in the driver

commit 03ef53cc730981baccf3e45bf7566474182407dc
Author: enssorcel <callumross12@gmail.com>
Date:   Sun Jun 22 22:04:01 2014 +0100

    arm: tegra: grouper: disable hotplug for usb instance 1

    Kai's USB1 instance is used for modem, so disabling
    the hotplug.

    I don't know about grouper, but it's worth a try.

commit 5e2c1fa49d14a1128ed79f4afb43649a510b1960
Author: enssorcel <callumross12@gmail.com>
Date:   Sun Jun 22 21:56:20 2014 +0100

    usb: tegra: modify USB platform data structures

    Modify USB structures of platform data. Based on the new
    platform data structures modifying the initialization in
    board files.

    Again this should work fine on grouper as everything was the same as
    on kai.

commit a24f95d4d4ba6b9a044a049b3117e20951324290
Author: enssorcel <callumross12@gmail.com>
Date:   Sun Jun 22 21:45:47 2014 +0100

    arm: thermal: Removed nonTEGRA_THERMAL_SYSFS logic

    All throttling must go through the Linux thermal sysfs
    framework now.

    Of course this is old so won't work now, but I'm building up the
    grouper board files gradually. Therefore this is here for
    continuity's sake.

commit a4a389b1ab1693bf6809c61ebdf39acd98183403
Author: enssorcel <callumross12@gmail.com>
Date:   Sun Jun 22 21:38:12 2014 +0100

    arm: tegra: grouper: Switch to external temperature sensor

    Disable internal temperature sensor and enable external temperature
    sensor.

    This may need to be modified further down the line to work fully
    for grouper, but for now it might hopefully fix some compilation
    errors.

commit 28dfed644c0143562478e85c15759840bd74d64e
Author: enssorcel <callumross12@gmail.com>
Date:   Sun Jun 22 21:26:56 2014 +0100

    ARM: tegra: usb: grouper: pmu int not required

    vbus int can be generated from pmu and directly from port
    when host mode is reqruied, we use vbus int and pmu int
    is not required as usb clock is not disabled.

commit 12f92235cd5a8bc8e0c482f27b06adc42bbc746d
Author: enssorcel <callumross12@gmail.com>
Date:   Sun Jun 22 21:24:00 2014 +0100

    arm: tegra: grouper: addition of charger regulator

    Use SMB349 regulator instead of irq to control USB1 VBUS

commit 60734f9f6106ae3cc1ee449caf28c4b01b76e11a
Author: enssorcel <callumross12@gmail.com>
Date:   Sun Jun 22 21:12:37 2014 +0100

    arm: tegra: Change DDC freq to 10KHz

commit 557552196e13d94771765d672935f62305ff3e88
Author: enssorcel <callumross12@gmail.com>
Date:   Sun Jun 22 20:55:43 2014 +0100

    arm: tegra: grouper: enable correct gpio for NFC

    I'm not sure if this is required for grouper, but just for consistencies
    sake I'm applying it anyway. It can always be removed if needs be.

commit a69575fd4b3500110176c9bf63e30f7f8052fcf5
Author: enssorcel <callumross12@gmail.com>
Date:   Sun Jun 22 20:51:16 2014 +0100

    ARM: tegra: register pinmux and gpio devices before pinmux init

    In the original commit, it looks like some of this commit was
    reverted so I've only added the line to the board-grouper.c file.
    Indeed it looks like this is fine as that line is still in
    board-kai.c. This should mean everything will have sorted itself
    out once the rest is updated

commit 673c8e6389832727c6adfe2e1ff0624c3755755a
Author: enssorcel <callumross12@gmail.com>
Date:   Sun Jun 22 20:19:03 2014 +0100

    arm: fixup: include pinmux-tegra30.h (board-grouper.c)

commit b3695cff333faa50d9fea2f252c4690f15327a44
Author: enssorcel <callumross12@gmail.com>
Date:   Sun Jun 22 20:16:23 2014 +0100

    k3.3: grouper: Updates to board files

    Beginning to remove the structs etc. which caused errors, and update
    them according to Nvidia's commits to the kai board. This is similar
    enough to grouper that hopefully the vast majority of errors can be
    removed and at least get the kernel compiling with grouper support.

commit d62232b3eba810a642e1cfa347335ba770acf72e
Author: enssorcel <callumross12@gmail.com>
Date:   Sun Jun 22 18:41:35 2014 +0100

    arm: tegra: grouper: Update board-touch-grouper-synaptics-spi.c to fix compilation error

    Use the synaptics_touchpad_gpio_setup() function from board-touch-kai-synaptics-spi.c
    to remove the compilation error due to out of date prototypes used in the initial
    board-touch-grouper-synaptics-spi.c file.

    include <mach/gpio-tegra.h> as this contains the new prototypes needed.

commit 988d87454566b3a22be87ab14eceab2a82383c60
Author: paris_yeh <paris_yeh@asus.com>
Date:   Mon Mar 19 15:13:45 2012 +0800

    arm: config: tegra3_android: Add grouper.

    Change-Id: Iff688f66c2db9b1390dd9c87dafb7d990cfeed72
    Reviewed-on: http://mcrd1-5.corpnet.asus/code-review/master/45107
    Reviewed-by: Yeh Paris <paris_yeh@asus.com>
    Tested-by: Yeh Paris <paris_yeh@asus.com>
    Reviewed-by: Sam hblee <Sam_hblee@asus.com>

    Conflicts:
    	arch/arm/configs/tegra3_android_defconfig

commit 16e646009ff855ee490ec1262b90608743df0d77
Author: paris_yeh <paris_yeh@asus.com>
Date:   Mon Mar 26 15:07:46 2012 +0800

    arm: tegra: grouper: Create board files and machine ID for grouper

    Create initial board files and config files and add machine number
    for grouper.

    Change-Id: I9855bbe11f1076467c87696a25d2a752663c34a7
    Reviewed-on: http://mcrd1-5.corpnet.asus/code-review/master/45106
    Reviewed-by: Yeh Paris <paris_yeh@asus.com>
    Tested-by: Yeh Paris <paris_yeh@asus.com>
    Reviewed-by: Sam hblee <Sam_hblee@asus.com>

    Conflicts:
    	arch/arm/mach-tegra/Kconfig
    	arch/arm/tools/mach-types