From 1179059c3290fe53fb164b3da8e744743b3bdbea Mon Sep 17 00:00:00 2001
From: "Huang, Tao" <huangtao@rock-chips.com>
Date: Wed, 20 May 2015 21:30:05 +0800
Subject: [PATCH] usb: dwc_otg: build driver depends on arm or arm64
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
---
drivers/usb/dwc_otg_310/dwc_otg_driver.c | 6 ++++++
drivers/usb/dwc_otg_310/usbdev_rk30.c | 3 ++-
drivers/usb/dwc_otg_310/usbdev_rk3036.c | 2 ++
drivers/usb/dwc_otg_310/usbdev_rk3126.c | 3 ++-
drivers/usb/dwc_otg_310/usbdev_rk32.c | 3 ++-
drivers/usb/dwc_otg_310/usbdev_rk3368.c | 2 ++
drivers/usb/host/ehci-rockchip.c | 4 ++++
7 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/dwc_otg_310/dwc_otg_driver.c b/drivers/usb/dwc_otg_310/dwc_otg_driver.c
index 4e064c6ac1a8..961db3f3ed57 100755
--- a/drivers/usb/dwc_otg_310/dwc_otg_driver.c
+++ b/drivers/usb/dwc_otg_310/dwc_otg_driver.c
@@ -915,6 +915,7 @@ static int host20_driver_remove(struct platform_device *_dev)
}
static const struct of_device_id usb20_host_of_match[] = {
+#ifdef CONFIG_ARM
{
.compatible = "rockchip,rk3188_usb20_host",
.data = &usb20host_pdata_rk3188,
@@ -931,6 +932,7 @@ static const struct of_device_id usb20_host_of_match[] = {
.compatible = "rockchip,rk3126_usb20_host",
.data = &usb20host_pdata_rk3126,
},
+#endif
{},
};
@@ -1288,6 +1290,7 @@ static int otg20_driver_remove(struct platform_device *_dev)
}
static const struct of_device_id usb20_otg_of_match[] = {
+#ifdef CONFIG_ARM
{
.compatible = "rockchip,rk3188_usb20_otg",
.data = &usb20otg_pdata_rk3188,
@@ -1304,10 +1307,13 @@ static const struct of_device_id usb20_otg_of_match[] = {
.compatible = "rockchip,rk3126_usb20_otg",
.data = &usb20otg_pdata_rk3126,
},
+#endif
+#ifdef CONFIG_ARM64
{
.compatible = "rockchip,rk3368_usb20_otg",
.data = &usb20otg_pdata_rk3368,
},
+#endif
{ },
};
diff --git a/drivers/usb/dwc_otg_310/usbdev_rk30.c b/drivers/usb/dwc_otg_310/usbdev_rk30.c
index 7e7465fbb464..6494facbf176 100755
--- a/drivers/usb/dwc_otg_310/usbdev_rk30.c
+++ b/drivers/usb/dwc_otg_310/usbdev_rk30.c
@@ -1,4 +1,4 @@
-
+#ifdef CONFIG_ARM
#include "usbdev_rk.h"
#include "usbdev_grf_regs.h"
#include "dwc_otg_regs.h"
@@ -650,3 +650,4 @@ MODULE_ALIAS("platform: dwc_control_usb");
MODULE_AUTHOR("RockChip Inc.");
MODULE_DESCRIPTION("RockChip Control Module USB Driver");
MODULE_LICENSE("GPL v2");
+#endif
diff --git a/drivers/usb/dwc_otg_310/usbdev_rk3036.c b/drivers/usb/dwc_otg_310/usbdev_rk3036.c
index 006c18084810..97bb32c479dd 100755
--- a/drivers/usb/dwc_otg_310/usbdev_rk3036.c
+++ b/drivers/usb/dwc_otg_310/usbdev_rk3036.c
@@ -1,3 +1,4 @@
+#ifdef CONFIG_ARM
#include "usbdev_rk.h"
#include "usbdev_grf_regs.h"
#include "dwc_otg_regs.h"
@@ -722,3 +723,4 @@ MODULE_ALIAS("platform: dwc_control_usb");
MODULE_AUTHOR("RockChip Inc.");
MODULE_DESCRIPTION("RockChip Control Module USB Driver");
MODULE_LICENSE("GPL v2");
+#endif
diff --git a/drivers/usb/dwc_otg_310/usbdev_rk3126.c b/drivers/usb/dwc_otg_310/usbdev_rk3126.c
index 601404920146..5e9daac5e145 100755
--- a/drivers/usb/dwc_otg_310/usbdev_rk3126.c
+++ b/drivers/usb/dwc_otg_310/usbdev_rk3126.c
@@ -1,3 +1,4 @@
+#ifdef CONFIG_ARM
#include "usbdev_rk.h"
#include "usbdev_grf_regs.h"
#include "dwc_otg_regs.h"
@@ -846,4 +847,4 @@ MODULE_ALIAS("platform: dwc_control_usb");
MODULE_AUTHOR("RockChip Inc.");
MODULE_DESCRIPTION("RockChip Control Module USB Driver");
MODULE_LICENSE("GPL v2");
-
+#endif
diff --git a/drivers/usb/dwc_otg_310/usbdev_rk32.c b/drivers/usb/dwc_otg_310/usbdev_rk32.c
index 84894be0ed0a..dd0d051b7bce 100755
--- a/drivers/usb/dwc_otg_310/usbdev_rk32.c
+++ b/drivers/usb/dwc_otg_310/usbdev_rk32.c
@@ -1,4 +1,4 @@
-
+#ifdef CONFIG_ARM
#include "usbdev_rk.h"
#include "usbdev_grf_regs.h"
#include "dwc_otg_regs.h"
@@ -1175,3 +1175,4 @@ MODULE_ALIAS("platform: dwc_control_usb");
MODULE_AUTHOR("RockChip Inc.");
MODULE_DESCRIPTION("RockChip Control Module USB Driver");
MODULE_LICENSE("GPL v2");
+#endif
diff --git a/drivers/usb/dwc_otg_310/usbdev_rk3368.c b/drivers/usb/dwc_otg_310/usbdev_rk3368.c
index 8a316b31382a..b73fe08a31b8 100644
--- a/drivers/usb/dwc_otg_310/usbdev_rk3368.c
+++ b/drivers/usb/dwc_otg_310/usbdev_rk3368.c
@@ -1,3 +1,4 @@
+#ifdef CONFIG_ARM64
#include "usbdev_rk.h"
#include "dwc_otg_regs.h"
@@ -516,3 +517,4 @@ MODULE_ALIAS("platform: dwc_control_usb");
MODULE_AUTHOR("RockChip Inc.");
MODULE_DESCRIPTION("RockChip Control Module USB Driver");
MODULE_LICENSE("GPL v2");
+#endif
diff --git a/drivers/usb/host/ehci-rockchip.c b/drivers/usb/host/ehci-rockchip.c
index 2169c7d5e5b8..425a7626ed83 100755
--- a/drivers/usb/host/ehci-rockchip.c
+++ b/drivers/usb/host/ehci-rockchip.c
@@ -248,6 +248,7 @@ static ssize_t test_sq_store(struct device *dev,
static DEVICE_ATTR(test_sq, S_IWUSR, NULL, test_sq_store);
static struct of_device_id rk_ehci_of_match[] = {
+#ifdef CONFIG_ARM
{
.compatible = "rockchip,rk3288_rk_ehci_host",
.data = &rkehci_pdata_rk3288,
@@ -256,10 +257,13 @@ static struct of_device_id rk_ehci_of_match[] = {
.compatible = "rockchip,rk3126_ehci",
.data = &usb20ehci_pdata_rk3126,
},
+#endif
+#ifdef CONFIG_ARM64
{
.compatible = "rockchip,rk3368_ehci",
.data = &usb20ehci_pdata_rk3368,
},
+#endif
{},
};
--
2.34.1