From: Huang, Tao <huangtao@rock-chips.com>
Date: Tue, 5 May 2015 02:51:31 +0000 (+0800)
Subject: Merge tag 'lsk-v3.10-15.04-android'
X-Git-Tag: firefly_0821_release~4158^2~125
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f07d7eb59119a4e72372fa60a2198f20f5302f95;p=firefly-linux-kernel-4.4.55.git

Merge tag 'lsk-v3.10-15.04-android'

Conflicts:
	drivers/base/cpu.c
	drivers/misc/Kconfig
	drivers/misc/Makefile
---

f07d7eb59119a4e72372fa60a2198f20f5302f95
diff --cc drivers/base/cpu.c
index 4200ca5e36a8,607efe6b7dc8..7acaf9a57a4f
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@@ -319,8 -319,7 +319,8 @@@ int __cpuinit register_cpu(struct cpu *
  	cpu->dev.id = num;
  	cpu->dev.bus = &cpu_subsys;
  	cpu->dev.release = cpu_device_release;
 +	cpu->dev.of_node = of_get_cpu_node(num, NULL);
- #ifdef CONFIG_ARCH_HAS_CPU_AUTOPROBE
+ #ifdef CONFIG_HAVE_CPU_AUTOPROBE
  	cpu->dev.bus->uevent = cpu_uevent;
  #endif
  	error = device_register(&cpu->dev);
diff --cc drivers/misc/Kconfig
index e25c8bbfa570,181fc59fec04..fc5fe5926c3f
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@@ -531,14 -531,12 +531,20 @@@ config SRA
  	  the genalloc API. It is supposed to be used for small on-chip SRAM
  	  areas found on many SoCs.
  
+ config UID_CPUTIME
+ 	tristate "Per-UID cpu time statistics"
+ 	depends on PROFILING
+ 	help
+ 	  Per UID based cpu time statistics exported to /proc/uid_cputime
+ 
 +config 5V_EN
 +	bool "5v en power control for otg and hdmi"
 +	default y
 +	help
 +	  This driver is control enable 5v power when startup and disable it
 +	  when suspend and no insert otg. if your board is control this power
 +	  by a gpio please select it. 
 +
  source "drivers/misc/c2port/Kconfig"
  source "drivers/misc/eeprom/Kconfig"
  source "drivers/misc/cb710/Kconfig"
diff --cc drivers/misc/Makefile
index c78c5d78653b,89435c9a182c..fae4038627fb
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@@ -53,7 -53,5 +53,8 @@@ obj-$(CONFIG_ALTERA_STAPL)	+=altera-sta
  obj-$(CONFIG_INTEL_MEI)		+= mei/
  obj-$(CONFIG_VMWARE_VMCI)	+= vmw_vmci/
  obj-$(CONFIG_LATTICE_ECP3_CONFIG)	+= lattice-ecp3-config.o
 +obj-y += inv_mpu/
  obj-$(CONFIG_SRAM)		+= sram.o
+ obj-$(CONFIG_UID_CPUTIME) += uid_cputime.o
 +
 +obj-$(CONFIG_5V_EN)	+= 5v_en.o
diff --cc drivers/usb/gadget/android.c
index 8027ec940f96,61c5e582bf47..f1264747677e
mode 100755,100644..100755
--- a/drivers/usb/gadget/android.c
+++ b/drivers/usb/gadget/android.c
@@@ -48,9 -49,15 +49,15 @@@ MODULE_VERSION("1.0")
  static const char longname[] = "Gadget Android";
  
  /* Default vendor and product IDs, overridden by userspace */
 -#define VENDOR_ID		0x18D1
 -#define PRODUCT_ID		0x0001
 +#define VENDOR_ID		0x2207
 +#define PRODUCT_ID		0x2910
  
+ /* f_midi configuration */
+ #define MIDI_INPUT_PORTS    1
+ #define MIDI_OUTPUT_PORTS   1
+ #define MIDI_BUFFER_SIZE    256
+ #define MIDI_QUEUE_LENGTH   32
+ 
  struct android_usb_function {
  	char *name;
  	void *config;