aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhao Qiang <qiang.zhao@nxp.com>2016-06-06 02:29:58 -0400
committerDavid S. Miller <davem@davemloft.net>2016-06-07 18:56:30 -0400
commit68f047e3d62ebfac24ff9be551476cf30eafb00e (patch)
tree200ff1dc71af28400062c80c2c57cd38982e7d58
parent0b0f43fe2e7291aa97b1febeaa5a0de453d007ca (diff)
fsl/qe: add rx_sync and tx_sync for TDM mode
Rx_sync and tx_sync are used by QE-TDM mode, add them to struct ucc_fast_info. Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/soc/fsl/qe/qe.c6
-rw-r--r--include/soc/fsl/qe/qe.h2
-rw-r--r--include/soc/fsl/qe/ucc_fast.h2
3 files changed, 10 insertions, 0 deletions
diff --git a/drivers/soc/fsl/qe/qe.c b/drivers/soc/fsl/qe/qe.c
index 709fc63809e5..7026507e6f1d 100644
--- a/drivers/soc/fsl/qe/qe.c
+++ b/drivers/soc/fsl/qe/qe.c
@@ -239,6 +239,12 @@ enum qe_clock qe_clock_source(const char *source)
239 if (strcasecmp(source, "none") == 0) 239 if (strcasecmp(source, "none") == 0)
240 return QE_CLK_NONE; 240 return QE_CLK_NONE;
241 241
242 if (strcmp(source, "tsync_pin") == 0)
243 return QE_TSYNC_PIN;
244
245 if (strcmp(source, "rsync_pin") == 0)
246 return QE_RSYNC_PIN;
247
242 if (strncasecmp(source, "brg", 3) == 0) { 248 if (strncasecmp(source, "brg", 3) == 0) {
243 i = simple_strtoul(source + 3, NULL, 10); 249 i = simple_strtoul(source + 3, NULL, 10);
244 if ((i >= 1) && (i <= 16)) 250 if ((i >= 1) && (i <= 16))
diff --git a/include/soc/fsl/qe/qe.h b/include/soc/fsl/qe/qe.h
index 33b29ead3d55..f91874582ab3 100644
--- a/include/soc/fsl/qe/qe.h
+++ b/include/soc/fsl/qe/qe.h
@@ -80,6 +80,8 @@ enum qe_clock {
80 QE_CLK22, /* Clock 22 */ 80 QE_CLK22, /* Clock 22 */
81 QE_CLK23, /* Clock 23 */ 81 QE_CLK23, /* Clock 23 */
82 QE_CLK24, /* Clock 24 */ 82 QE_CLK24, /* Clock 24 */
83 QE_RSYNC_PIN, /* RSYNC from pin */
84 QE_TSYNC_PIN, /* TSYNC from pin */
83 QE_CLK_DUMMY 85 QE_CLK_DUMMY
84}; 86};
85 87
diff --git a/include/soc/fsl/qe/ucc_fast.h b/include/soc/fsl/qe/ucc_fast.h
index df8ea7958c63..31548b7aa50e 100644
--- a/include/soc/fsl/qe/ucc_fast.h
+++ b/include/soc/fsl/qe/ucc_fast.h
@@ -120,6 +120,8 @@ struct ucc_fast_info {
120 int ucc_num; 120 int ucc_num;
121 enum qe_clock rx_clock; 121 enum qe_clock rx_clock;
122 enum qe_clock tx_clock; 122 enum qe_clock tx_clock;
123 enum qe_clock rx_sync;
124 enum qe_clock tx_sync;
123 u32 regs; 125 u32 regs;
124 int irq; 126 int irq;
125 u32 uccm_mask; 127 u32 uccm_mask;