Merge tag 'driver-core-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core updates from Greg Kroah-Hartman:
 "Here's the driver core, and other driver subsystems, pull request for
  the 3.5-rc1 merge window.

  Outside of a few minor driver core changes, we ended up with the
  following different subsystem and core changes as well, due to
  interdependancies on the driver core:
   - hyperv driver updates
   - drivers/memory being created and some drivers moved into it
   - extcon driver subsystem created out of the old Android staging
     switch driver code
   - dynamic debug updates
   - printk rework, and /dev/kmsg changes

  All of this has been tested in the linux-next releases for a few weeks
  with no reported problems.

  Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"

Fix up conflicts in drivers/extcon/extcon-max8997.c where git noticed
that a patch to the deleted drivers/misc/max8997-muic.c driver needs to
be applied to this one.

* tag 'driver-core-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (90 commits)
  uio_pdrv_genirq: get irq through platform resource if not set otherwise
  memory: tegra{20,30}-mc: Remove empty *_remove()
  printk() - isolate KERN_CONT users from ordinary complete lines
  sysfs: get rid of some lockdep false positives
  Drivers: hv: util: Properly handle version negotiations.
  Drivers: hv: Get rid of an unnecessary check in vmbus_prep_negotiate_resp()
  memory: tegra{20,30}-mc: Use dev_err_ratelimited()
  driver core: Add dev_*_ratelimited() family
  Driver Core: don't oops with unregistered driver in driver_find_device()
  printk() - restore prefix/timestamp printing for multi-newline strings
  printk: add stub for prepend_timestamp()
  ARM: tegra30: Make MC optional in Kconfig
  ARM: tegra20: Make MC optional in Kconfig
  ARM: tegra30: MC: Remove unnecessary BUG*()
  ARM: tegra20: MC: Remove unnecessary BUG*()
  printk: correctly align __log_buf
  ARM: tegra30: Add Tegra Memory Controller(MC) driver
  ARM: tegra20: Add Tegra Memory Controller(MC) driver
  printk() - restore timestamp printing at console output
  printk() - do not merge continuation lines of different threads
  ...

10 files changed, 587 insertions, 28 deletions

diff --git a/include/linux/device.h b/include/linux/device.h
index 5ad17cccdd71..e04f5776f6d0 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -23,6 +23,7 @@
 #include <linux/mutex.h>
 #include <linux/pm.h>
 #include <linux/atomic.h>
+#include <linux/ratelimit.h>
 #include <asm/device.h>
 
 struct device;
@@ -502,7 +503,10 @@ ssize_t device_store_int(struct device *dev, struct device_attribute *attr,
                 { __ATTR(_name, _mode, device_show_ulong, device_store_ulong), &(_var) }
 #define DEVICE_INT_ATTR(_name, _mode, _var) \
         struct dev_ext_attribute dev_attr_##_name = \
-                { __ATTR(_name, _mode, device_show_ulong, device_store_ulong), &(_var) }
+                { __ATTR(_name, _mode, device_show_int, device_store_int), &(_var) }
+#define DEVICE_ATTR_IGNORE_LOCKDEP(_name, _mode, _show, _store) \
+        struct device_attribute dev_attr_##_name =              \
+                __ATTR_IGNORE_LOCKDEP(_name, _mode, _show, _store)
 
 extern int device_create_file(struct device *device,
                               const struct device_attribute *entry);
@@ -541,6 +545,8 @@ extern void *devres_remove(struct device *dev, dr_release_t release,
                            dr_match_t match, void *match_data);
 extern int devres_destroy(struct device *dev, dr_release_t release,
                           dr_match_t match, void *match_data);
+extern int devres_release(struct device *dev, dr_release_t release,
+                          dr_match_t match, void *match_data);
 
 /* devres group */
 extern void * __must_check devres_open_group(struct device *dev, void *id,
@@ -931,6 +937,32 @@ int _dev_info(const struct device *dev, const char *fmt, ...)
 
 #endif
 
+#define dev_level_ratelimited(dev_level, dev, fmt, ...)                 \
+do {                                                                    \
+        static DEFINE_RATELIMIT_STATE(_rs,                              \
+                                      DEFAULT_RATELIMIT_INTERVAL,       \
+                                      DEFAULT_RATELIMIT_BURST);         \
+        if (__ratelimit(&_rs))                                          \
+                dev_level(dev, fmt, ##__VA_ARGS__);                     \
+} while (0)
+
+#define dev_emerg_ratelimited(dev, fmt, ...)                            \
+        dev_level_ratelimited(dev_emerg, dev, fmt, ##__VA_ARGS__)
+#define dev_alert_ratelimited(dev, fmt, ...)                            \
+        dev_level_ratelimited(dev_alert, dev, fmt, ##__VA_ARGS__)
+#define dev_crit_ratelimited(dev, fmt, ...)                             \
+        dev_level_ratelimited(dev_crit, dev, fmt, ##__VA_ARGS__)
+#define dev_err_ratelimited(dev, fmt, ...)                              \
+        dev_level_ratelimited(dev_err, dev, fmt, ##__VA_ARGS__)
+#define dev_warn_ratelimited(dev, fmt, ...)                             \
+        dev_level_ratelimited(dev_warn, dev, fmt, ##__VA_ARGS__)
+#define dev_notice_ratelimited(dev, fmt, ...)                           \
+        dev_level_ratelimited(dev_notice, dev, fmt, ##__VA_ARGS__)
+#define dev_info_ratelimited(dev, fmt, ...)                             \
+        dev_level_ratelimited(dev_info, dev, fmt, ##__VA_ARGS__)
+#define dev_dbg_ratelimited(dev, fmt, ...)                              \
+        dev_level_ratelimited(dev_dbg, dev, fmt, ##__VA_ARGS__)
+
 /*
  * Stupid hackaround for existing uses of non-printk uses dev_info
  *
diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h
index 7e3c53a900d8..c18257b0fa72 100644
--- a/include/linux/dynamic_debug.h
+++ b/include/linux/dynamic_debug.h
@@ -17,8 +17,8 @@ struct _ddebug {
         const char *format;
         unsigned int lineno:18;
         /*
-         * The flags field controls the behaviour at the callsite.
-         * The bits here are changed dynamically when the user
+         * The flags field controls the behaviour at the callsite.
+         * The bits here are changed dynamically when the user
          * writes commands to <debugfs>/dynamic_debug/control
          */
 #define _DPRINTK_FLAGS_NONE     0
@@ -44,6 +44,9 @@ extern int ddebug_remove_module(const char *mod_name);
 extern __printf(2, 3)
 int __dynamic_pr_debug(struct _ddebug *descriptor, const char *fmt, ...);
 
+extern int ddebug_dyndbg_module_param_cb(char *param, char *val,
+                                        const char *modname);
+
 struct device;
 
 extern __printf(3, 4)
@@ -94,11 +97,26 @@ do {								\
 
 #else
 
+#include <linux/string.h>
+#include <linux/errno.h>
+
 static inline int ddebug_remove_module(const char *mod)
 {
         return 0;
 }
 
+static inline int ddebug_dyndbg_module_param_cb(char *param, char *val,
+                                                const char *modname)
+{
+        if (strstr(param, "dyndbg")) {
+                /* avoid pr_warn(), which wants pr_fmt() fully defined */
+                printk(KERN_WARNING "dyndbg param is supported only in "
+                        "CONFIG_DYNAMIC_DEBUG builds\n");
+                return 0; /* allow and ignore */
+        }
+        return -EINVAL;
+}
+
 #define dynamic_pr_debug(fmt, ...)                                      \
         do { if (0) printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__); } while (0)
 #define dynamic_dev_dbg(dev, fmt, ...)                                  \
diff --git a/include/linux/extcon.h b/include/linux/extcon.h
new file mode 100644
index 000000000000..cdd401477656
--- /dev/null
+++ b/include/linux/extcon.h
@@ -0,0 +1,324 @@
+/*
+ *  External connector (extcon) class driver
+ *
+ * Copyright (C) 2012 Samsung Electronics
+ * Author: Donggeun Kim <dg77.kim@samsung.com>
+ * Author: MyungJoo Ham <myungjoo.ham@samsung.com>
+ *
+ * based on switch class driver
+ * Copyright (C) 2008 Google, Inc.
+ * Author: Mike Lockwood <lockwood@android.com>
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+*/
+
+#ifndef __LINUX_EXTCON_H__
+#define __LINUX_EXTCON_H__
+
+#include <linux/notifier.h>
+
+#define SUPPORTED_CABLE_MAX     32
+#define CABLE_NAME_MAX          30
+
+/*
+ * The standard cable name is to help support general notifier
+ * and notifee device drivers to share the common names.
+ * Please use standard cable names unless your notifier device has
+ * a very unique and abnormal cable or
+ * the cable type is supposed to be used with only one unique
+ * pair of notifier/notifee devices.
+ *
+ * Please add any other "standard" cables used with extcon dev.
+ *
+ * You may add a dot and number to specify version or specification
+ * of the specific cable if it is required. (e.g., "Fast-charger.18"
+ * and "Fast-charger.10" for 1.8A and 1.0A chargers)
+ * However, the notifee and notifier should be able to handle such
+ * string and if the notifee can negotiate the protocol or idenify,
+ * you don't need such convention. This convention is helpful when
+ * notifier can distinguish but notifiee cannot.
+ */
+enum extcon_cable_name {
+        EXTCON_USB = 0,
+        EXTCON_USB_HOST,
+        EXTCON_TA, /* Travel Adaptor */
+        EXTCON_FAST_CHARGER,
+        EXTCON_SLOW_CHARGER,
+        EXTCON_CHARGE_DOWNSTREAM, /* Charging an external device */
+        EXTCON_HDMI,
+        EXTCON_MHL,
+        EXTCON_DVI,
+        EXTCON_VGA,
+        EXTCON_DOCK,
+        EXTCON_LINE_IN,
+        EXTCON_LINE_OUT,
+        EXTCON_MIC_IN,
+        EXTCON_HEADPHONE_OUT,
+        EXTCON_SPDIF_IN,
+        EXTCON_SPDIF_OUT,
+        EXTCON_VIDEO_IN,
+        EXTCON_VIDEO_OUT,
+        EXTCON_MECHANICAL,
+};
+extern const char *extcon_cable_name[];
+
+struct extcon_cable;
+
+/**
+ * struct extcon_dev - An extcon device represents one external connector.
+ * @name        The name of this extcon device. Parent device name is used
+ *              if NULL.
+ * @supported_cable     Array of supported cable name ending with NULL.
+ *                      If supported_cable is NULL, cable name related APIs
+ *                      are disabled.
+ * @mutually_exclusive  Array of mutually exclusive set of cables that cannot
+ *                      be attached simultaneously. The array should be
+ *                      ending with NULL or be NULL (no mutually exclusive
+ *                      cables). For example, if it is { 0x7, 0x30, 0}, then,
+ *                      {0, 1}, {0, 1, 2}, {0, 2}, {1, 2}, or {4, 5} cannot
+ *                      be attached simulataneously. {0x7, 0} is equivalent to
+ *                      {0x3, 0x6, 0x5, 0}. If it is {0xFFFFFFFF, 0}, there
+ *                      can be no simultaneous connections.
+ * @print_name  An optional callback to override the method to print the
+ *              name of the extcon device.
+ * @print_state An optional callback to override the method to print the
+ *              status of the extcon device.
+ * @dev         Device of this extcon. Do not provide at register-time.
+ * @state       Attach/detach state of this extcon. Do not provide at
+ *              register-time
+ * @nh  Notifier for the state change events from this extcon
+ * @entry       To support list of extcon devices so that uses can search
+ *              for extcon devices based on the extcon name.
+ * @lock
+ * @max_supported       Internal value to store the number of cables.
+ * @extcon_dev_type     Device_type struct to provide attribute_groups
+ *                      customized for each extcon device.
+ * @cables      Sysfs subdirectories. Each represents one cable.
+ *
+ * In most cases, users only need to provide "User initializing data" of
+ * this struct when registering an extcon. In some exceptional cases,
+ * optional callbacks may be needed. However, the values in "internal data"
+ * are overwritten by register function.
+ */
+struct extcon_dev {
+        /* --- Optional user initializing data --- */
+        const char      *name;
+        const char **supported_cable;
+        const u32       *mutually_exclusive;
+
+        /* --- Optional callbacks to override class functions --- */
+        ssize_t (*print_name)(struct extcon_dev *edev, char *buf);
+        ssize_t (*print_state)(struct extcon_dev *edev, char *buf);
+
+        /* --- Internal data. Please do not set. --- */
+        struct device   *dev;
+        u32             state;
+        struct raw_notifier_head nh;
+        struct list_head entry;
+        spinlock_t lock; /* could be called by irq handler */
+        int max_supported;
+
+        /* /sys/class/extcon/.../cable.n/... */
+        struct device_type extcon_dev_type;
+        struct extcon_cable *cables;
+        /* /sys/class/extcon/.../mutually_exclusive/... */
+        struct attribute_group attr_g_muex;
+        struct attribute **attrs_muex;
+        struct device_attribute *d_attrs_muex;
+};
+
+/**
+ * struct extcon_cable  - An internal data for each cable of extcon device.
+ * @edev        The extcon device
+ * @cable_index Index of this cable in the edev
+ * @attr_g      Attribute group for the cable
+ * @attr_name   "name" sysfs entry
+ * @attr_state  "state" sysfs entry
+ * @attrs       Array pointing to attr_name and attr_state for attr_g
+ */
+struct extcon_cable {
+        struct extcon_dev *edev;
+        int cable_index;
+
+        struct attribute_group attr_g;
+        struct device_attribute attr_name;
+        struct device_attribute attr_state;
+
+        struct attribute *attrs[3]; /* to be fed to attr_g.attrs */
+};
+
+/**
+ * struct extcon_specific_cable_nb - An internal data for
+ *                              extcon_register_interest().
+ * @internal_nb a notifier block bridging extcon notifier and cable notifier.
+ * @user_nb     user provided notifier block for events from a specific cable.
+ * @cable_index the target cable.
+ * @edev        the target extcon device.
+ * @previous_value      the saved previous event value.
+ */
+struct extcon_specific_cable_nb {
+        struct notifier_block internal_nb;
+        struct notifier_block *user_nb;
+        int cable_index;
+        struct extcon_dev *edev;
+        unsigned long previous_value;
+};
+
+#if IS_ENABLED(CONFIG_EXTCON)
+
+/*
+ * Following APIs are for notifiers or configurations.
+ * Notifiers are the external port and connection devices.
+ */
+extern int extcon_dev_register(struct extcon_dev *edev, struct device *dev);
+extern void extcon_dev_unregister(struct extcon_dev *edev);
+extern struct extcon_dev *extcon_get_extcon_dev(const char *extcon_name);
+
+/*
+ * get/set/update_state access the 32b encoded state value, which represents
+ * states of all possible cables of the multistate port. For example, if one
+ * calls extcon_set_state(edev, 0x7), it may mean that all the three cables
+ * are attached to the port.
+ */
+static inline u32 extcon_get_state(struct extcon_dev *edev)
+{
+        return edev->state;
+}
+
+extern int extcon_set_state(struct extcon_dev *edev, u32 state);
+extern int extcon_update_state(struct extcon_dev *edev, u32 mask, u32 state);
+
+/*
+ * get/set_cable_state access each bit of the 32b encoded state value.
+ * They are used to access the status of each cable based on the cable_name
+ * or cable_index, which is retrived by extcon_find_cable_index
+ */
+extern int extcon_find_cable_index(struct extcon_dev *sdev,
+                                   const char *cable_name);
+extern int extcon_get_cable_state_(struct extcon_dev *edev, int cable_index);
+extern int extcon_set_cable_state_(struct extcon_dev *edev, int cable_index,
+                                   bool cable_state);
+
+extern int extcon_get_cable_state(struct extcon_dev *edev,
+                                  const char *cable_name);
+extern int extcon_set_cable_state(struct extcon_dev *edev,
+                                  const char *cable_name, bool cable_state);
+
+/*
+ * Following APIs are for notifiees (those who want to be notified)
+ * to register a callback for events from a specific cable of the extcon.
+ * Notifiees are the connected device drivers wanting to get notified by
+ * a specific external port of a connection device.
+ */
+extern int extcon_register_interest(struct extcon_specific_cable_nb *obj,
+                                    const char *extcon_name,
+                                    const char *cable_name,
+                                    struct notifier_block *nb);
+extern int extcon_unregister_interest(struct extcon_specific_cable_nb *nb);
+
+/*
+ * Following APIs are to monitor every action of a notifier.
+ * Registerer gets notified for every external port of a connection device.
+ * Probably this could be used to debug an action of notifier; however,
+ * we do not recommend to use this at normal 'notifiee' device drivers who
+ * want to be notified by a specific external port of the notifier.
+ */
+extern int extcon_register_notifier(struct extcon_dev *edev,
+                                    struct notifier_block *nb);
+extern int extcon_unregister_notifier(struct extcon_dev *edev,
+                                      struct notifier_block *nb);
+#else /* CONFIG_EXTCON */
+static inline int extcon_dev_register(struct extcon_dev *edev,
+                                      struct device *dev)
+{
+        return 0;
+}
+
+static inline void extcon_dev_unregister(struct extcon_dev *edev) { }
+
+static inline u32 extcon_get_state(struct extcon_dev *edev)
+{
+        return 0;
+}
+
+static inline int extcon_set_state(struct extcon_dev *edev, u32 state)
+{
+        return 0;
+}
+
+static inline int extcon_update_state(struct extcon_dev *edev, u32 mask,
+                                       u32 state)
+{
+        return 0;
+}
+
+static inline int extcon_find_cable_index(struct extcon_dev *edev,
+                                          const char *cable_name)
+{
+        return 0;
+}
+
+static inline int extcon_get_cable_state_(struct extcon_dev *edev,
+                                          int cable_index)
+{
+        return 0;
+}
+
+static inline int extcon_set_cable_state_(struct extcon_dev *edev,
+                                          int cable_index, bool cable_state)
+{
+        return 0;
+}
+
+static inline int extcon_get_cable_state(struct extcon_dev *edev,
+                        const char *cable_name)
+{
+        return 0;
+}
+
+static inline int extcon_set_cable_state(struct extcon_dev *edev,
+                        const char *cable_name, int state)
+{
+        return 0;
+}
+
+static inline struct extcon_dev *extcon_get_extcon_dev(const char *extcon_name)
+{
+        return NULL;
+}
+
+static inline int extcon_register_notifier(struct extcon_dev *edev,
+                                           struct notifier_block *nb)
+{
+        return 0;
+}
+
+static inline int extcon_unregister_notifier(struct extcon_dev *edev,
+                                             struct notifier_block *nb)
+{
+        return 0;
+}
+
+static inline int extcon_register_interest(struct extcon_specific_cable_nb *obj,
+                                           const char *extcon_name,
+                                           const char *cable_name,
+                                           struct notifier_block *nb)
+{
+        return 0;
+}
+
+static inline int extcon_unregister_interest(struct extcon_specific_cable_nb
+                                                    *obj)
+{
+        return 0;
+}
+#endif /* CONFIG_EXTCON */
+#endif /* __LINUX_EXTCON_H__ */
diff --git a/include/linux/extcon/extcon_gpio.h b/include/linux/extcon/extcon_gpio.h
new file mode 100644
index 000000000000..a2129b73dcb1
--- /dev/null
+++ b/include/linux/extcon/extcon_gpio.h
@@ -0,0 +1,52 @@
+/*
+ *  External connector (extcon) class generic GPIO driver
+ *
+ * Copyright (C) 2012 Samsung Electronics
+ * Author: MyungJoo Ham <myungjoo.ham@samsung.com>
+ *
+ * based on switch class driver
+ * Copyright (C) 2008 Google, Inc.
+ * Author: Mike Lockwood <lockwood@android.com>
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+*/
+#ifndef __EXTCON_GPIO_H__
+#define __EXTCON_GPIO_H__ __FILE__
+
+#include <linux/extcon.h>
+
+/**
+ * struct gpio_extcon_platform_data - A simple GPIO-controlled extcon device.
+ * @name        The name of this GPIO extcon device.
+ * @gpio        Corresponding GPIO.
+ * @debounce    Debounce time for GPIO IRQ in ms.
+ * @irq_flags   IRQ Flags (e.g., IRQF_TRIGGER_LOW).
+ * @state_on    print_state is overriden with state_on if attached. If Null,
+ *              default method of extcon class is used.
+ * @state_off   print_state is overriden with state_on if dettached. If Null,
+ *              default method of extcon class is used.
+ *
+ * Note that in order for state_on or state_off to be valid, both state_on
+ * and state_off should be not NULL. If at least one of them is NULL,
+ * the print_state is not overriden.
+ */
+struct gpio_extcon_platform_data {
+        const char *name;
+        unsigned gpio;
+        unsigned long debounce;
+        unsigned long irq_flags;
+
+        /* if NULL, "0" or "1" will be printed */
+        const char *state_on;
+        const char *state_off;
+};
+
+#endif /* __EXTCON_GPIO_H__ */
diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h
index 6af8738ae7e9..68ed7f7e1fc9 100644
--- a/include/linux/hyperv.h
+++ b/include/linux/hyperv.h
@@ -1062,8 +1062,10 @@ struct hyperv_service_callback {
         void (*callback) (void *context);
 };
 
+#define MAX_SRV_VER     0x7ffffff
 extern void vmbus_prep_negotiate_resp(struct icmsg_hdr *,
-                                      struct icmsg_negotiate *, u8 *);
+                                        struct icmsg_negotiate *, u8 *, int,
+                                        int);
 
 int hv_kvp_init(struct hv_util_service *);
 void hv_kvp_deinit(void);
diff --git a/include/linux/mfd/max8997.h b/include/linux/mfd/max8997.h
index 28726dd540f2..b40c08cd30bc 100644
--- a/include/linux/mfd/max8997.h
+++ b/include/linux/mfd/max8997.h
@@ -99,34 +99,11 @@ struct max8997_muic_reg_data {
 
 /**
  * struct max8997_muic_platform_data
- * @usb_callback: callback function for USB
- *                inform callee of USB type (HOST or DEVICE)
- *                and attached state(true or false)
- * @charger_callback: callback function for charger
- *                inform callee of charger_type
- *                and attached state(true or false)
- * @deskdock_callback: callback function for desk dock
- *                inform callee of attached state(true or false)
- * @cardock_callback: callback function for car dock
- *                inform callee of attached state(true or false)
- * @mhl_callback: callback function for MHL (Mobile High-definition Link)
- *                inform callee of attached state(true or false)
- * @uart_callback: callback function for JIG UART
- *                 inform callee of attached state(true or false)
  * @init_data: array of max8997_muic_reg_data
  *             used for initializing registers of MAX8997 MUIC device
  * @num_init_data: array size of init_data
  */
 struct max8997_muic_platform_data {
-        void (*usb_callback)(enum max8997_muic_usb_type usb_type,
-                bool attached);
-        void (*charger_callback)(bool attached,
-                enum max8997_muic_charger_type charger_type);
-        void (*deskdock_callback) (bool attached);
-        void (*cardock_callback) (bool attached);
-        void (*mhl_callback) (bool attached);
-        void (*uart_callback) (bool attached);
-
         struct max8997_muic_reg_data *init_data;
         int num_init_data;
 };
diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
index ea36486378d8..1b14d25162cb 100644
--- a/include/linux/moduleparam.h
+++ b/include/linux/moduleparam.h
@@ -320,7 +320,8 @@ extern int parse_args(const char *name,
                       unsigned num,
                       s16 level_min,
                       s16 level_max,
-                      int (*unknown)(char *param, char *val));
+                      int (*unknown)(char *param, char *val,
+                              const char *doing));
 
 /* Called by module remove. */
 #ifdef CONFIG_SYSFS
diff --git a/include/linux/platform_data/emif_plat.h b/include/linux/platform_data/emif_plat.h
new file mode 100644
index 000000000000..03378ca84061
--- /dev/null
+++ b/include/linux/platform_data/emif_plat.h
@@ -0,0 +1,128 @@
+/*
+ * Definitions for TI EMIF device platform data
+ *
+ * Copyright (C) 2012 Texas Instruments, Inc.
+ *
+ * Aneesh V <aneesh@ti.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef __EMIF_PLAT_H
+#define __EMIF_PLAT_H
+
+/* Low power modes - EMIF_PWR_MGMT_CTRL */
+#define EMIF_LP_MODE_DISABLE                            0
+#define EMIF_LP_MODE_CLOCK_STOP                         1
+#define EMIF_LP_MODE_SELF_REFRESH                       2
+#define EMIF_LP_MODE_PWR_DN                             4
+
+/* Hardware capabilities */
+#define EMIF_HW_CAPS_LL_INTERFACE                       0x00000001
+
+/*
+ * EMIF IP Revisions
+ *      EMIF4D  - Used in OMAP4
+ *      EMIF4D5 - Used in OMAP5
+ */
+#define EMIF_4D                                         1
+#define EMIF_4D5                                        2
+
+/*
+ * PHY types
+ *      ATTILAPHY  - Used in OMAP4
+ *      INTELLIPHY - Used in OMAP5
+ */
+#define EMIF_PHY_TYPE_ATTILAPHY                         1
+#define EMIF_PHY_TYPE_INTELLIPHY                        2
+
+/* Custom config requests */
+#define EMIF_CUSTOM_CONFIG_LPMODE                       0x00000001
+#define EMIF_CUSTOM_CONFIG_TEMP_ALERT_POLL_INTERVAL     0x00000002
+
+#ifndef __ASSEMBLY__
+/**
+ * struct ddr_device_info - All information about the DDR device except AC
+ *              timing parameters
+ * @type:       Device type (LPDDR2-S4, LPDDR2-S2 etc)
+ * @density:    Device density
+ * @io_width:   Bus width
+ * @cs1_used:   Whether there is a DDR device attached to the second
+ *              chip-select(CS1) of this EMIF instance
+ * @cal_resistors_per_cs: Whether there is one calibration resistor per
+ *              chip-select or whether it's a single one for both
+ * @manufacturer: Manufacturer name string
+ */
+struct ddr_device_info {
+        u32     type;
+        u32     density;
+        u32     io_width;
+        u32     cs1_used;
+        u32     cal_resistors_per_cs;
+        char    manufacturer[10];
+};
+
+/**
+ * struct emif_custom_configs - Custom configuration parameters/policies
+ *              passed from the platform layer
+ * @mask:       Mask to indicate which configs are requested
+ * @lpmode:     LPMODE to be used in PWR_MGMT_CTRL register
+ * @lpmode_timeout_performance: Timeout before LPMODE entry when higher
+ *              performance is desired at the cost of power (typically
+ *              at higher OPPs)
+ * @lpmode_timeout_power: Timeout before LPMODE entry when better power
+ *              savings is desired and performance is not important
+ *              (typically at lower loads indicated by lower OPPs)
+ * @lpmode_freq_threshold: The DDR frequency threshold to identify between
+ *              the above two cases:
+ *              timeout = (freq >= lpmode_freq_threshold) ?
+ *                      lpmode_timeout_performance :
+ *                      lpmode_timeout_power;
+ * @temp_alert_poll_interval_ms: LPDDR2 MR4 polling interval at nominal
+ *              temperature(in milliseconds). When temperature is high
+ *              polling is done 4 times as frequently.
+ */
+struct emif_custom_configs {
+        u32 mask;
+        u32 lpmode;
+        u32 lpmode_timeout_performance;
+        u32 lpmode_timeout_power;
+        u32 lpmode_freq_threshold;
+        u32 temp_alert_poll_interval_ms;
+};
+
+/**
+ * struct emif_platform_data - Platform data passed on EMIF platform
+ *                              device creation. Used by the driver.
+ * @hw_caps:            Hw capabilities of the EMIF IP in the respective SoC
+ * @device_info:        Device info structure containing information such
+ *                      as type, bus width, density etc
+ * @timings:            Timings information from device datasheet passed
+ *                      as an array of 'struct lpddr2_timings'. Can be NULL
+ *                      if if default timings are ok
+ * @timings_arr_size:   Size of the timings array. Depends on the number
+ *                      of different frequencies for which timings data
+ *                      is provided
+ * @min_tck:            Minimum value of some timing parameters in terms
+ *                      of number of cycles. Can be NULL if default values
+ *                      are ok
+ * @custom_configs:     Custom configurations requested by SoC or board
+ *                      code and the data for them. Can be NULL if default
+ *                      configurations done by the driver are ok. See
+ *                      documentation for 'struct emif_custom_configs' for
+ *                      more details
+ */
+struct emif_platform_data {
+        u32 hw_caps;
+        struct ddr_device_info *device_info;
+        const struct lpddr2_timings *timings;
+        u32 timings_arr_size;
+        const struct lpddr2_min_tck *min_tck;
+        struct emif_custom_configs *custom_configs;
+        u32 ip_rev;
+        u32 phy_type;
+};
+#endif /* __ASSEMBLY__ */
+
+#endif /* __LINUX_EMIF_H */
diff --git a/include/linux/printk.h b/include/linux/printk.h
index 0525927f203f..1bec2f7a2d42 100644
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -95,8 +95,19 @@ extern int printk_needs_cpu(int cpu);
 extern void printk_tick(void);
 
 #ifdef CONFIG_PRINTK
+asmlinkage __printf(5, 0)
+int vprintk_emit(int facility, int level,
+                 const char *dict, size_t dictlen,
+                 const char *fmt, va_list args);
+
 asmlinkage __printf(1, 0)
 int vprintk(const char *fmt, va_list args);
+
+asmlinkage __printf(5, 6) __cold
+asmlinkage int printk_emit(int facility, int level,
+                           const char *dict, size_t dictlen,
+                           const char *fmt, ...);
+
 asmlinkage __printf(1, 2) __cold
 int printk(const char *fmt, ...);
 
@@ -289,6 +300,8 @@ extern void dump_stack(void) __cold;
         no_printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
 #endif
 
+extern const struct file_operations kmsg_fops;
+
 enum {
         DUMP_PREFIX_NONE,
         DUMP_PREFIX_ADDRESS,
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
index 0010009b2f00..381f06db2fe5 100644
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
@@ -27,6 +27,7 @@ struct attribute {
         const char              *name;
         umode_t                 mode;
 #ifdef CONFIG_DEBUG_LOCK_ALLOC
+        bool                    ignore_lockdep:1;
         struct lock_class_key   *key;
         struct lock_class_key   skey;
 #endif
@@ -80,6 +81,17 @@ struct attribute_group {
 
 #define __ATTR_NULL { .attr = { .name = NULL } }
 
+#ifdef CONFIG_DEBUG_LOCK_ALLOC
+#define __ATTR_IGNORE_LOCKDEP(_name, _mode, _show, _store) {    \
+        .attr = {.name = __stringify(_name), .mode = _mode,     \
+                        .ignore_lockdep = true },               \
+        .show           = _show,                                \
+        .store          = _store,                               \
+}
+#else
+#define __ATTR_IGNORE_LOCKDEP   __ATTR
+#endif
+
 #define attr_name(_attr) (_attr).attr.name
 
 struct file;