aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/input/serio/xilinx_ps2.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/input/serio/xilinx_ps2.c b/drivers/input/serio/xilinx_ps2.c
index 14c40892ed82..07de1b49293c 100644
--- a/drivers/input/serio/xilinx_ps2.c
+++ b/drivers/input/serio/xilinx_ps2.c
@@ -45,8 +45,10 @@
45#define XPS2_STATUS_RX_FULL 0x00000001 /* Receive Full */ 45#define XPS2_STATUS_RX_FULL 0x00000001 /* Receive Full */
46#define XPS2_STATUS_TX_FULL 0x00000002 /* Transmit Full */ 46#define XPS2_STATUS_TX_FULL 0x00000002 /* Transmit Full */
47 47
48/* Bit definitions for ISR/IER registers. Both the registers have the same bit 48/*
49 * definitions and are only defined once. */ 49 * Bit definitions for ISR/IER registers. Both the registers have the same bit
50 * definitions and are only defined once.
51 */
50#define XPS2_IPIXR_WDT_TOUT 0x00000001 /* Watchdog Timeout Interrupt */ 52#define XPS2_IPIXR_WDT_TOUT 0x00000001 /* Watchdog Timeout Interrupt */
51#define XPS2_IPIXR_TX_NOACK 0x00000002 /* Transmit No ACK Interrupt */ 53#define XPS2_IPIXR_TX_NOACK 0x00000002 /* Transmit No ACK Interrupt */
52#define XPS2_IPIXR_TX_ACK 0x00000004 /* Transmit ACK (Data) Interrupt */ 54#define XPS2_IPIXR_TX_ACK 0x00000004 /* Transmit ACK (Data) Interrupt */
@@ -292,8 +294,10 @@ static int xps2_of_probe(struct platform_device *ofdev)
292 /* Disable all the interrupts, just in case */ 294 /* Disable all the interrupts, just in case */
293 out_be32(drvdata->base_address + XPS2_IPIER_OFFSET, 0); 295 out_be32(drvdata->base_address + XPS2_IPIER_OFFSET, 0);
294 296
295 /* Reset the PS2 device and abort any current transaction, to make sure 297 /*
296 * we have the PS2 in a good state */ 298 * Reset the PS2 device and abort any current transaction,
299 * to make sure we have the PS2 in a good state.
300 */
297 out_be32(drvdata->base_address + XPS2_SRST_OFFSET, XPS2_SRST_RESET); 301 out_be32(drvdata->base_address + XPS2_SRST_OFFSET, XPS2_SRST_RESET);
298 302
299 dev_info(dev, "Xilinx PS2 at 0x%08llX mapped to 0x%p, irq=%d\n", 303 dev_info(dev, "Xilinx PS2 at 0x%08llX mapped to 0x%p, irq=%d\n",