From 627911b0ecc89d4b4a98205c6100814a0b2c6399 Mon Sep 17 00:00:00 2001
From: lyx <lyx@rock-chips.com>
Date: Sun, 19 Sep 2010 04:57:53 -0700
Subject: [PATCH] usb: move struct usb_mass_storage_platform_data to
 board_xxx.c

---
 arch/arm/mach-rk2818/board-infoit50.c | 10 +++++++++-
 arch/arm/mach-rk2818/board-infosdk.c  | 10 +++++++++-
 arch/arm/mach-rk2818/board-raho.c     | 10 +++++++++-
 arch/arm/mach-rk2818/devices.c        |  7 -------
 arch/arm/mach-rk2818/devices.h        |  1 +
 5 files changed, 28 insertions(+), 10 deletions(-)
 mode change 100644 => 100755 arch/arm/mach-rk2818/devices.h

diff --git a/arch/arm/mach-rk2818/board-infoit50.c b/arch/arm/mach-rk2818/board-infoit50.c
index 7402275ca883..3fee09d264ad 100755
--- a/arch/arm/mach-rk2818/board-infoit50.c
+++ b/arch/arm/mach-rk2818/board-infoit50.c
@@ -22,6 +22,7 @@
 #include <linux/i2c.h>
 #include <linux/spi/spi.h>
 #include <linux/mmc/host.h>
+#include <linux/usb/android_composite.h>
 
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
@@ -1243,7 +1244,14 @@ struct rk2818_nand_platform_data rk2818_nand_data = {
 };
 
 
-/*****************************************/
+/******************usb***********************/
+struct usb_mass_storage_platform_data mass_storage_pdata = {
+	.nluns		= 2,
+	.vendor		= "RockChip",
+	.product	= "rk2818 sdk",
+	.release	= 0x0100,
+};
+
 
 static struct platform_device *devices[] __initdata = {
 #ifdef CONFIG_UART0_RK2818	
diff --git a/arch/arm/mach-rk2818/board-infosdk.c b/arch/arm/mach-rk2818/board-infosdk.c
index 80b7e5bfb277..21fc9eb376a2 100755
--- a/arch/arm/mach-rk2818/board-infosdk.c
+++ b/arch/arm/mach-rk2818/board-infosdk.c
@@ -22,6 +22,7 @@
 #include <linux/i2c.h>
 #include <linux/spi/spi.h>
 #include <linux/mmc/host.h>
+#include <linux/usb/android_composite.h>
 
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
@@ -1536,7 +1537,14 @@ struct rk2818_nand_platform_data rk2818_nand_data = {
 };
 
 
-/*****************************************/
+/******************usb***********************/
+struct usb_mass_storage_platform_data mass_storage_pdata = {
+	.nluns		= 2,
+	.vendor		= "RockChip",
+	.product	= "rk2818 sdk",
+	.release	= 0x0100,
+};
+
 
 static struct platform_device *devices[] __initdata = {
 #ifdef CONFIG_UART0_RK2818	
diff --git a/arch/arm/mach-rk2818/board-raho.c b/arch/arm/mach-rk2818/board-raho.c
index 153fbbe34dfa..e8a51dfb519b 100755
--- a/arch/arm/mach-rk2818/board-raho.c
+++ b/arch/arm/mach-rk2818/board-raho.c
@@ -24,6 +24,7 @@
 #include <linux/mmc/host.h>
 #include <linux/circ_buf.h>
 #include <linux/miscdevice.h>
+#include <linux/usb/android_composite.h>
 
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
@@ -1842,7 +1843,14 @@ struct rk2818_nand_platform_data rk2818_nand_data = {
 };
 
 
-/*****************************************/
+/********************usb*********************/
+struct usb_mass_storage_platform_data mass_storage_pdata = {
+	.nluns		= 1,
+	.vendor		= "RockChip",
+	.product	= "rk2818 sdk",
+	.release	= 0x0100,
+};
+
 
 static struct platform_device *devices[] __initdata = {
 #ifdef CONFIG_BT
diff --git a/arch/arm/mach-rk2818/devices.c b/arch/arm/mach-rk2818/devices.c
index 5f386acc8909..b10c62d6dd54 100755
--- a/arch/arm/mach-rk2818/devices.c
+++ b/arch/arm/mach-rk2818/devices.c
@@ -624,13 +624,6 @@ struct platform_device android_usb_device = {
 	},
 };
 
-static struct usb_mass_storage_platform_data mass_storage_pdata = {
-	.nluns		= 1,
-	.vendor		= "RockChip",
-	.product	= "rk2818 sdk",
-	.release	= 0x0100,
-};
-
 //static 
 struct platform_device usb_mass_storage_device = {
 	.name	= "usb_mass_storage",
diff --git a/arch/arm/mach-rk2818/devices.h b/arch/arm/mach-rk2818/devices.h
old mode 100644
new mode 100755
index 560b0d82ab1f..ae0dc43f3847
--- a/arch/arm/mach-rk2818/devices.h
+++ b/arch/arm/mach-rk2818/devices.h
@@ -63,6 +63,7 @@ extern struct platform_device rk2818_nand_device;
 extern struct platform_device rk2818_device_dwc_otg;
 extern struct platform_device rk2818_device_host11;
 extern struct platform_device android_usb_device;
+extern struct usb_mass_storage_platform_data mass_storage_pdata;
 extern struct platform_device usb_mass_storage_device;
 extern struct platform_device rk28_device_vibrator;
 extern struct timed_gpio_platform_data rk28_vibrator_info;
-- 
2.34.1