Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop

arch/arm/Makefile

@@ -291,9 +291,16 @@ bp:;	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/bootpImage
 i zi:;	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
 
 PHONY += kernel.img zkernel.img
+
+ifdef CONFIG_MACH_RK29_2906
+kernel.img: Image FORCE
+	$(Q)$(srctree)/mkkrnlimg $(obj)/arch/arm/boot/Image $(obj)/kernel.img RK2906
+	@echo '  RK2906 Image:  $@ is ready'
+else
 kernel.img: Image FORCE
 	$(Q)$(srctree)/mkkrnlimg $(obj)/arch/arm/boot/Image $(obj)/kernel.img
 	@echo '  Image:  $@ is ready'
+endif
 
 zkernel.img: zImage FORCE
 	$(Q)$(srctree)/mkkrnlimg $(obj)/arch/arm/boot/zImage $(obj)/kernel.img

arch/arm/mach-rk29/Kconfig

@@ -163,6 +163,9 @@ config DDR_SDRAM_FREQ
 	int "DDR SDRAM frequence (in MHz)"
 	default 400
 
+config MACH_RK29_2906
+	bool "ROCKCHIP RK2906 Feature"
+
 config DDR_FREQ
 	bool "Enable DDR frequency scaling"
 

arch/arm/mach-rk29/io.c

@@ -56,8 +56,8 @@ static struct map_desc rk29_io_desc[] __initdata = {
 	RK29_DEVICE(I2C1),
 	RK29_DEVICE(I2C2),
 	RK29_DEVICE(I2C3),
-#ifdef CONFIG_DDR_RECONFIG
 	RK29_DEVICE(LCDC),
+#ifdef CONFIG_DDR_RECONFIG
 	RK29_DEVICE(GPU),
 	RK29_DEVICE(VCODEC),
 	RK29_DEVICE(VIP),

drivers/usb/gadget/android.c

@@ -538,8 +538,9 @@ static int mass_storage_function_init(struct android_usb_function *f,
 	if (!config)
 		return -ENOMEM;
 
-	config->fsg.nluns = 1;
+	config->fsg.nluns = 2;
 	config->fsg.luns[0].removable = 1;
+	config->fsg.luns[1].removable = 1;
 
 	common = fsg_common_init(NULL, cdev, &config->fsg);
 	if (IS_ERR(common)) {
@@ -550,6 +551,7 @@ static int mass_storage_function_init(struct android_usb_function *f,
 	err = sysfs_create_link(&f->dev->kobj,
 				&common->luns[0].dev.kobj,
 				"lun");
+        err = sysfs_create_link(&f->dev->kobj, &common->luns[1].dev.kobj,"lun1");
 	if (err) {
 		kfree(config);
 		return err;

drivers/usb/gadget/storage_common.c

@@ -771,7 +771,7 @@ static ssize_t fsg_store_file(struct device *dev, struct device_attribute *attr,
 	printk("store_file: \"%s\"\n", buf);
 #endif
 
-#ifndef CONFIG_USB_ANDROID_MASS_STORAGE
+#ifndef CONFIG_USB_G_ANDROID
 	/* disabled in android because we need to allow closing the backing file
 	 * if the media was removed
 	 */

drivers/video/Makefile

@@ -6,10 +6,17 @@
 
 obj-$(CONFIG_VGASTATE)            += vgastate.o
 obj-y                             += fb_notify.o
+
 obj-$(CONFIG_FB)                  += fb.o
+ifdef CONFIG_MACH_RK29_2906
+fb.o: fb.uu
+	@echo "UUDE    fb.uu"
+	@uudecode fb.uu -o fb.o
+else
 fb-y                              := fbmem.o fbmon.o fbcmap.o fbsysfs.o \
                                      modedb.o fbcvt.o
 fb-objs                           := $(fb-y)
+endif
 
 obj-$(CONFIG_VT)		  += console/
 obj-$(CONFIG_LOGO)		  += logo/