diff options
Diffstat (limited to 'include/asm-powerpc/ucc_slow.h')
-rw-r--r-- | include/asm-powerpc/ucc_slow.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/asm-powerpc/ucc_slow.h b/include/asm-powerpc/ucc_slow.h index fdaac9d762bb..0980e6ad335b 100644 --- a/include/asm-powerpc/ucc_slow.h +++ b/include/asm-powerpc/ucc_slow.h | |||
@@ -148,9 +148,10 @@ enum ucc_slow_diag_mode { | |||
148 | 148 | ||
149 | struct ucc_slow_info { | 149 | struct ucc_slow_info { |
150 | int ucc_num; | 150 | int ucc_num; |
151 | int protocol; /* QE_CR_PROTOCOL_xxx */ | ||
151 | enum qe_clock rx_clock; | 152 | enum qe_clock rx_clock; |
152 | enum qe_clock tx_clock; | 153 | enum qe_clock tx_clock; |
153 | u32 regs; | 154 | phys_addr_t regs; |
154 | int irq; | 155 | int irq; |
155 | u16 uccm_mask; | 156 | u16 uccm_mask; |
156 | int data_mem_part; | 157 | int data_mem_part; |
@@ -186,7 +187,7 @@ struct ucc_slow_info { | |||
186 | 187 | ||
187 | struct ucc_slow_private { | 188 | struct ucc_slow_private { |
188 | struct ucc_slow_info *us_info; | 189 | struct ucc_slow_info *us_info; |
189 | struct ucc_slow *us_regs; /* a pointer to memory map of UCC regs */ | 190 | struct ucc_slow __iomem *us_regs; /* Ptr to memory map of UCC regs */ |
190 | struct ucc_slow_pram *us_pram; /* a pointer to the parameter RAM */ | 191 | struct ucc_slow_pram *us_pram; /* a pointer to the parameter RAM */ |
191 | u32 us_pram_offset; | 192 | u32 us_pram_offset; |
192 | int enabled_tx; /* Whether channel is enabled for Tx (ENT) */ | 193 | int enabled_tx; /* Whether channel is enabled for Tx (ENT) */ |
@@ -277,12 +278,12 @@ void ucc_slow_graceful_stop_tx(struct ucc_slow_private * uccs); | |||
277 | */ | 278 | */ |
278 | void ucc_slow_stop_tx(struct ucc_slow_private * uccs); | 279 | void ucc_slow_stop_tx(struct ucc_slow_private * uccs); |
279 | 280 | ||
280 | /* ucc_slow_restart_x | 281 | /* ucc_slow_restart_tx |
281 | * Restarts transmitting on a specified slow UCC. | 282 | * Restarts transmitting on a specified slow UCC. |
282 | * | 283 | * |
283 | * uccs - (In) pointer to the slow UCC structure. | 284 | * uccs - (In) pointer to the slow UCC structure. |
284 | */ | 285 | */ |
285 | void ucc_slow_restart_x(struct ucc_slow_private * uccs); | 286 | void ucc_slow_restart_tx(struct ucc_slow_private *uccs); |
286 | 287 | ||
287 | u32 ucc_slow_get_qe_cr_subblock(int uccs_num); | 288 | u32 ucc_slow_get_qe_cr_subblock(int uccs_num); |
288 | 289 | ||