diff options
| author | Zhao Qiang <qiang.zhao@nxp.com> | 2016-06-06 02:29:59 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-07 18:56:30 -0400 |
| commit | bb8b2062aff321af1fc58781cc07fbbea01cceb3 (patch) | |
| tree | 9a0c0492e8be4bcfbd5495bc12cc5ae8e073de39 /include/soc | |
| parent | 68f047e3d62ebfac24ff9be551476cf30eafb00e (diff) | |
fsl/qe: setup clock source for TDM mode
Add tdm clock configuration in both qe clock system and ucc
fast controller.
Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/soc')
| -rw-r--r-- | include/soc/fsl/qe/qe.h | 16 | ||||
| -rw-r--r-- | include/soc/fsl/qe/ucc.h | 4 | ||||
| -rw-r--r-- | include/soc/fsl/qe/ucc_fast.h | 1 |
3 files changed, 21 insertions, 0 deletions
diff --git a/include/soc/fsl/qe/qe.h b/include/soc/fsl/qe/qe.h index f91874582ab3..c3b1dc8a21a7 100644 --- a/include/soc/fsl/qe/qe.h +++ b/include/soc/fsl/qe/qe.h | |||
| @@ -244,6 +244,22 @@ static inline int qe_alive_during_sleep(void) | |||
| 244 | #define qe_muram_addr cpm_muram_addr | 244 | #define qe_muram_addr cpm_muram_addr |
| 245 | #define qe_muram_offset cpm_muram_offset | 245 | #define qe_muram_offset cpm_muram_offset |
| 246 | 246 | ||
| 247 | #define qe_setbits32(_addr, _v) iowrite32be(ioread32be(_addr) | (_v), (_addr)) | ||
| 248 | #define qe_clrbits32(_addr, _v) iowrite32be(ioread32be(_addr) & ~(_v), (_addr)) | ||
| 249 | |||
| 250 | #define qe_setbits16(_addr, _v) iowrite16be(ioread16be(_addr) | (_v), (_addr)) | ||
| 251 | #define qe_clrbits16(_addr, _v) iowrite16be(ioread16be(_addr) & ~(_v), (_addr)) | ||
| 252 | |||
| 253 | #define qe_setbits8(_addr, _v) iowrite8(ioread8(_addr) | (_v), (_addr)) | ||
| 254 | #define qe_clrbits8(_addr, _v) iowrite8(ioread8(_addr) & ~(_v), (_addr)) | ||
| 255 | |||
| 256 | #define qe_clrsetbits32(addr, clear, set) \ | ||
| 257 | iowrite32be((ioread32be(addr) & ~(clear)) | (set), (addr)) | ||
| 258 | #define qe_clrsetbits16(addr, clear, set) \ | ||
| 259 | iowrite16be((ioread16be(addr) & ~(clear)) | (set), (addr)) | ||
| 260 | #define qe_clrsetbits8(addr, clear, set) \ | ||
| 261 | iowrite8((ioread8(addr) & ~(clear)) | (set), (addr)) | ||
| 262 | |||
| 247 | /* Structure that defines QE firmware binary files. | 263 | /* Structure that defines QE firmware binary files. |
| 248 | * | 264 | * |
| 249 | * See Documentation/powerpc/qe_firmware.txt for a description of these | 265 | * See Documentation/powerpc/qe_firmware.txt for a description of these |
diff --git a/include/soc/fsl/qe/ucc.h b/include/soc/fsl/qe/ucc.h index 894f14cbb044..6bbbb597f2af 100644 --- a/include/soc/fsl/qe/ucc.h +++ b/include/soc/fsl/qe/ucc.h | |||
| @@ -41,6 +41,10 @@ int ucc_set_qe_mux_mii_mng(unsigned int ucc_num); | |||
| 41 | 41 | ||
| 42 | int ucc_set_qe_mux_rxtx(unsigned int ucc_num, enum qe_clock clock, | 42 | int ucc_set_qe_mux_rxtx(unsigned int ucc_num, enum qe_clock clock, |
| 43 | enum comm_dir mode); | 43 | enum comm_dir mode); |
| 44 | int ucc_set_tdm_rxtx_clk(unsigned int tdm_num, enum qe_clock clock, | ||
| 45 | enum comm_dir mode); | ||
| 46 | int ucc_set_tdm_rxtx_sync(unsigned int tdm_num, enum qe_clock clock, | ||
| 47 | enum comm_dir mode); | ||
| 44 | 48 | ||
| 45 | int ucc_mux_set_grant_tsa_bkpt(unsigned int ucc_num, int set, u32 mask); | 49 | int ucc_mux_set_grant_tsa_bkpt(unsigned int ucc_num, int set, u32 mask); |
| 46 | 50 | ||
diff --git a/include/soc/fsl/qe/ucc_fast.h b/include/soc/fsl/qe/ucc_fast.h index 31548b7aa50e..b2633b7dcc00 100644 --- a/include/soc/fsl/qe/ucc_fast.h +++ b/include/soc/fsl/qe/ucc_fast.h | |||
| @@ -118,6 +118,7 @@ enum ucc_fast_transparent_tcrc { | |||
| 118 | /* Fast UCC initialization structure */ | 118 | /* Fast UCC initialization structure */ |
| 119 | struct ucc_fast_info { | 119 | struct ucc_fast_info { |
| 120 | int ucc_num; | 120 | int ucc_num; |
| 121 | int tdm_num; | ||
| 121 | enum qe_clock rx_clock; | 122 | enum qe_clock rx_clock; |
| 122 | enum qe_clock tx_clock; | 123 | enum qe_clock tx_clock; |
| 123 | enum qe_clock rx_sync; | 124 | enum qe_clock rx_sync; |
