summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Chen <peter.chen@freescale.com>2015-03-17 06:21:00 (GMT)
committerPeter Chen <peter.chen@freescale.com>2015-08-14 02:03:55 (GMT)
commit65668718f2c5b76d5f4513564a3c56672bb07892 (patch)
tree3127be1b1ec7956f71fb382d28494c3718e3718a
parentc6fba7b750efe64a69dd83e0ff7249abd0e783aa (diff)
downloadlinux-65668718f2c5b76d5f4513564a3c56672bb07892.tar.xz
usb: chipidea: add ahb burst configuration interface
The users can change it through dts or platform data if they want to change the default value. Signed-off-by: Peter Chen <peter.chen@freescale.com>
-rw-r--r--drivers/usb/chipidea/bits.h3
-rw-r--r--drivers/usb/chipidea/core.c14
-rw-r--r--include/linux/usb/chipidea.h2
3 files changed, 19 insertions, 0 deletions
diff --git a/drivers/usb/chipidea/bits.h b/drivers/usb/chipidea/bits.h
index 831a8f6..462ad02 100644
--- a/drivers/usb/chipidea/bits.h
+++ b/drivers/usb/chipidea/bits.h
@@ -25,6 +25,9 @@
#define VERSION (0xF << 25)
#define CIVERSION (0x7 << 29)
+/* SBUSCFG */
+#define AHBBRST_MASK 0x7
+
/* HCCPARAMS */
#define HCCPARAMS_LEN BIT(17)
diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
index 7a2c217..ce04897 100644
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@ -438,6 +438,9 @@ void ci_platform_configure(struct ci_hdrc *ci)
hw_write(ci, OP_USBCMD, 0xff0000, ci->platdata->itc_setting << 16);
+ if (ci->platdata->flags & CI_HDRC_OVERRIDE_AHB_BURST)
+ hw_write_id_reg(ci, ID_SBUSCFG, AHBBRST_MASK,
+ ci->platdata->ahb_burst_config);
}
/**
@@ -633,6 +636,17 @@ static int ci_get_platdata(struct device *dev,
}
}
+ if (of_find_property(dev->of_node, "ahb-burst-config", NULL)) {
+ ret = of_property_read_u32(dev->of_node, "ahb-burst-config",
+ &platdata->ahb_burst_config);
+ if (ret) {
+ dev_err(dev,
+ "failed to get ahb-burst-config\n");
+ return ret;
+ }
+ platdata->flags |= CI_HDRC_OVERRIDE_AHB_BURST;
+ }
+
return 0;
}
diff --git a/include/linux/usb/chipidea.h b/include/linux/usb/chipidea.h
index 4d34a86..cd7fcad 100644
--- a/include/linux/usb/chipidea.h
+++ b/include/linux/usb/chipidea.h
@@ -33,6 +33,7 @@ struct ci_hdrc_platform_data {
#define CI_HDRC_FORCE_FULLSPEED BIT(6)
#define CI_HDRC_TURN_VBUS_EARLY_ON BIT(7)
#define CI_HDRC_SET_NON_ZERO_TTHA BIT(8)
+#define CI_HDRC_OVERRIDE_AHB_BURST BIT(9)
enum usb_dr_mode dr_mode;
#define CI_HDRC_CONTROLLER_RESET_EVENT 0
#define CI_HDRC_CONTROLLER_STOPPED_EVENT 1
@@ -41,6 +42,7 @@ struct ci_hdrc_platform_data {
bool tpl_support;
/* interrupt threshold setting */
u32 itc_setting;
+ u32 ahb_burst_config;
};
/* Default offset of capability registers */