usb: move struct usb_mass_storage_platform_data to board_xxx.c

diff --git a/arch/arm/mach-rk2818/board-infoit50.c b/arch/arm/mach-rk2818/board-infoit50.c
index 7402275ca88347f025a0cfd315886b8d46cd5d62..3fee09d264ada2ef77980f06bc25d3818731030f 100755 (executable)
--- 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 80b7e5bfb27783e836661cd87a58a907df5a9922..21fc9eb376a2f49bfdf1ee7ad2895c2e963deca2 100755 (executable)
--- 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 153fbbe34dfab967415d22102649110a7d551f47..e8a51dfb519be013b3637cc4af97b5f4c12c3536 100755 (executable)
--- 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 5f386acc890962bfd8d0357a84fb8621a91756e7..b10c62d6dd54e982891f7400a3a0101bde8d1fb2 100755 (executable)
--- 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 (file)
new mode 100755 (executable)
index 560b0d8..ae0dc43
--- 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;