smdk4412: bulk update from i9300 update 9

Change-Id: Icd3e7b601f3f4c8b3dcf053fed5819fb7caf5296

6 files changed, 20 insertions, 6 deletions

diff --git a/include/linux/battery/samsung_battery.h b/include/linux/battery/samsung_battery.h
index f58c839..2293fce 100644
--- a/include/linux/battery/samsung_battery.h
+++ b/include/linux/battery/samsung_battery.h
@@ -115,6 +115,7 @@ struct battery_info {
 	unsigned int cable_type;
 	unsigned int cable_sub_type;
 	unsigned int cable_pwr_type;
+	int online_prop;
 
 	/* For SAMSUNG charge spec */
 	unsigned int vf_state;
@@ -205,6 +206,12 @@ extern bool is_jig_attached;
 #undef EXTENDED_ONLINE_TYPE
 #endif
 
+enum online_property {
+	ONLINE_PROP_UNKNOWN = 0,
+	ONLINE_PROP_AC,
+	ONLINE_PROP_USB,
+};
+
 /* use 2step charge termination */
 #if defined(CONFIG_MACH_T0)
 #define USE_2STEP_TERM
@@ -269,7 +276,11 @@ enum status_full_type {
 
 /* WORKAROUND: define audio dock current */
 #define DOCK_TYPE_AUDIO_CURR		1000
+#if defined(CONFIG_MACH_T0)
 #define DOCK_TYPE_SMART_NOTG_CURR	1700
+#else
+#define DOCK_TYPE_SMART_NOTG_CURR	1000
+#endif
 #define DOCK_TYPE_SMART_OTG_CURR	1000
 #define DOCK_TYPE_LOW_CURR		475
 
diff --git a/include/linux/mfd/max77693-private.h b/include/linux/mfd/max77693-private.h
index 7a2c536..ad0ccf8 100644
--- a/include/linux/mfd/max77693-private.h
+++ b/include/linux/mfd/max77693-private.h
@@ -413,7 +413,7 @@ enum {
 #if defined(CONFIG_SWITCH_DUAL_MODEM)
 	CP_ESC_USB_MODE,
 #endif
-
+	OPEN_USB_MODE
 };
 
 enum {
diff --git a/include/linux/mfd/max77693.h b/include/linux/mfd/max77693.h
index 274693a..dc26961 100644
--- a/include/linux/mfd/max77693.h
+++ b/include/linux/mfd/max77693.h
@@ -150,8 +150,4 @@ struct max77693_muic_data {
 extern int max7693_muic_cp_usb_state(void);
 #endif
 
-#if defined(CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK)
-extern void max77693_muic_attach_audio_dock(void);
-#endif /* CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK */
-
 #endif				/* __LINUX_MFD_MAX77693_H */
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index 5eb40a9..8cbcc95 100644
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -94,6 +94,7 @@ struct mmc_ext_csd {
 
 	unsigned int            feature_support;
 #define MMC_DISCARD_FEATURE	BIT(0)                  /* CMD38 feature */
+#define MMC_POWEROFF_NOTIFY_FEATURE	BIT(1)		/* PON feature */
 };
 
 struct sd_scr {
@@ -244,8 +245,12 @@ struct mmc_card {
 
 	struct dentry		*debugfs_root;
 	unsigned int		movi_ops;
+	unsigned int		movi_fwver;
+	unsigned int		movi_fwdate;
 };
 
+#define MMC_MOVI_VER_VHX0	(1<<4)
+#define MMC_MOVI_VER_VMX0	(1<<5)
 /*
  *  The world is not perfect and supplies us with broken mmc/sdio devices.
  *  For at least some of these bugs we need a work-around.
diff --git a/include/linux/mmc/ioctl.h b/include/linux/mmc/ioctl.h
index 5baf298..8f8204b 100644
--- a/include/linux/mmc/ioctl.h
+++ b/include/linux/mmc/ioctl.h
@@ -50,5 +50,5 @@ struct mmc_ioc_cmd {
  * is enforced per ioctl call.  For larger data transfers, use the normal
  * block device operations.
  */
-#define MMC_IOC_MAX_BYTES  (512L * 256)
+#define MMC_IOC_MAX_BYTES  (512L * 512)
 #endif  /* LINUX_MMC_IOCTL_H */
diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h
index bc047b4..ac13431 100644
--- a/include/linux/mmc/mmc.h
+++ b/include/linux/mmc/mmc.h
@@ -84,6 +84,8 @@
 #define MMC_APP_CMD              55   /* ac   [31:16] RCA        R1  */
 #define MMC_GEN_CMD              56   /* adtc [0] RD/WR          R1  */
 
+#define MMC_IOC_CLOCK		120
+
 static inline bool mmc_op_multi(u32 opcode)
 {
 	return opcode == MMC_WRITE_MULTIPLE_BLOCK ||