Merge commit 'v3.7-rc1' into stable/for-linus-3.7

* commit 'v3.7-rc1': (10892 commits)
  Linux 3.7-rc1
  x86, boot: Explicitly include autoconf.h for hostprogs
  perf: Fix UAPI fallout
  ARM: config: make sure that platforms are ordered by option string
  ARM: config: sort select statements alphanumerically
  UAPI: (Scripted) Disintegrate include/linux/byteorder
  UAPI: (Scripted) Disintegrate include/linux
  UAPI: Unexport linux/blk_types.h
  UAPI: Unexport part of linux/ppp-comp.h
  perf: Handle new rbtree implementation
  procfs: don't need a PATH_MAX allocation to hold a string representation of an int
  vfs: embed struct filename inside of names_cache allocation if possible
  audit: make audit_inode take struct filename
  vfs: make path_openat take a struct filename pointer
  vfs: turn do_path_lookup into wrapper around struct filename variant
  audit: allow audit code to satisfy getname requests from its names_list
  vfs: define struct filename and have getname() return it
  btrfs: Fix compilation with user namespace support enabled
  userns: Fix posix_acl_file_xattr_userns gid conversion
  userns: Properly print bluetooth socket uids
  ...

1 files changed, 67 insertions, 0 deletions

diff --git a/include/linux/platform_data/max310x.h b/include/linux/platform_data/max310x.h
new file mode 100644
index 000000000000..91648bf5fc5c
--- /dev/null
+++ b/include/linux/platform_data/max310x.h
@@ -0,0 +1,67 @@
+/*
+ *  Maxim (Dallas) MAX3107/8 serial driver
+ *
+ *  Copyright (C) 2012 Alexander Shiyan <shc_work@mail.ru>
+ *
+ *  Based on max3100.c, by Christian Pellegrin <chripell@evolware.org>
+ *  Based on max3110.c, by Feng Tang <feng.tang@intel.com>
+ *  Based on max3107.c, by Aavamobile
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ */
+
+#ifndef _MAX310X_H_
+#define _MAX310X_H_
+
+/*
+ * Example board initialization data:
+ *
+ * static struct max310x_pdata max3107_pdata = {
+ *      .driver_flags   = MAX310X_EXT_CLK,
+ *      .uart_flags[0]  = MAX310X_ECHO_SUPRESS | MAX310X_AUTO_DIR_CTRL,
+ *      .frequency      = 3686400,
+ *      .gpio_base      = -1,
+ * };
+ *
+ * static struct spi_board_info spi_device_max3107[] = {
+ *      {
+ *              .modalias       = "max3107",
+ *              .irq            = IRQ_EINT3,
+ *              .bus_num        = 1,
+ *              .chip_select    = 1,
+ *              .platform_data  = &max3107_pdata,
+ *      },
+ * };
+ */
+
+#define MAX310X_MAX_UARTS       1
+
+/* MAX310X platform data structure */
+struct max310x_pdata {
+        /* Flags global to driver */
+        const u8                driver_flags:2;
+#define MAX310X_EXT_CLK         (0x00000001)    /* External clock enable */
+#define MAX310X_AUTOSLEEP       (0x00000002)    /* Enable AutoSleep mode */
+        /* Flags global to UART port */
+        const u8                uart_flags[MAX310X_MAX_UARTS];
+#define MAX310X_LOOPBACK        (0x00000001)    /* Loopback mode enable */
+#define MAX310X_ECHO_SUPRESS    (0x00000002)    /* Enable echo supress */
+#define MAX310X_AUTO_DIR_CTRL   (0x00000004)    /* Enable Auto direction
+                                                 * control (RS-485)
+                                                 */
+        /* Frequency (extrenal clock or crystal) */
+        const int               frequency;
+        /* GPIO base number (can be negative) */
+        const int               gpio_base;
+        /* Called during startup */
+        void (*init)(void);
+        /* Called before finish */
+        void (*exit)(void);
+        /* Suspend callback */
+        void (*suspend)(int do_suspend);
+};
+
+#endif