diff options
| -rw-r--r-- | arch/arm/mach-sa1100/include/mach/jornada720.h | 11 | ||||
| -rw-r--r-- | arch/arm/mach-sa1100/jornada720_ssp.c | 10 |
2 files changed, 13 insertions, 8 deletions
diff --git a/arch/arm/mach-sa1100/include/mach/jornada720.h b/arch/arm/mach-sa1100/include/mach/jornada720.h index bc120850d313..cc6b4bfcecf6 100644 --- a/arch/arm/mach-sa1100/include/mach/jornada720.h +++ b/arch/arm/mach-sa1100/include/mach/jornada720.h | |||
| @@ -1,10 +1,10 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * arch/arm/mach-sa1100/include/mach/jornada720.h | 2 | * arch/arm/mach-sa1100/include/mach/jornada720.h |
| 3 | * | 3 | * |
| 4 | * This file contains SSP/MCU communication definitions for HP Jornada 710/720/728 | 4 | * SSP/MCU communication definitions for HP Jornada 710/720/728 |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2007 Kristoffer Ericson <Kristoffer.Ericson@gmail.com> | 6 | * Copyright 2007,2008 Kristoffer Ericson <Kristoffer.Ericson@gmail.com> |
| 7 | * Copyright (C) 2000 John Ankcorn <jca@lcs.mit.edu> | 7 | * Copyright 2000 John Ankcorn <jca@lcs.mit.edu> |
| 8 | * | 8 | * |
| 9 | * This program is free software; you can redistribute it and/or modify | 9 | * This program is free software; you can redistribute it and/or modify |
| 10 | * it under the terms of the GNU General Public License version 2 as | 10 | * it under the terms of the GNU General Public License version 2 as |
| @@ -25,3 +25,8 @@ | |||
| 25 | #define PWMOFF 0xDF | 25 | #define PWMOFF 0xDF |
| 26 | #define TXDUMMY 0x11 | 26 | #define TXDUMMY 0x11 |
| 27 | #define ERRORCODE 0x00 | 27 | #define ERRORCODE 0x00 |
| 28 | |||
| 29 | extern void jornada_ssp_start(void); | ||
| 30 | extern void jornada_ssp_end(void); | ||
| 31 | extern int jornada_ssp_inout(u8 byte); | ||
| 32 | extern int jornada_ssp_byte(u8 byte); | ||
diff --git a/arch/arm/mach-sa1100/jornada720_ssp.c b/arch/arm/mach-sa1100/jornada720_ssp.c index 06ea7abd9170..28cf36967977 100644 --- a/arch/arm/mach-sa1100/jornada720_ssp.c +++ b/arch/arm/mach-sa1100/jornada720_ssp.c | |||
| @@ -21,8 +21,8 @@ | |||
| 21 | #include <linux/slab.h> | 21 | #include <linux/slab.h> |
| 22 | 22 | ||
| 23 | #include <mach/hardware.h> | 23 | #include <mach/hardware.h> |
| 24 | #include <asm/hardware/ssp.h> | ||
| 25 | #include <mach/jornada720.h> | 24 | #include <mach/jornada720.h> |
| 25 | #include <asm/hardware/ssp.h> | ||
| 26 | 26 | ||
| 27 | static DEFINE_SPINLOCK(jornada_ssp_lock); | 27 | static DEFINE_SPINLOCK(jornada_ssp_lock); |
| 28 | static unsigned long jornada_ssp_flags; | 28 | static unsigned long jornada_ssp_flags; |
| @@ -109,12 +109,12 @@ EXPORT_SYMBOL(jornada_ssp_inout); | |||
| 109 | * jornada_ssp_start - enable mcu | 109 | * jornada_ssp_start - enable mcu |
| 110 | * | 110 | * |
| 111 | */ | 111 | */ |
| 112 | int jornada_ssp_start() | 112 | void jornada_ssp_start(void) |
| 113 | { | 113 | { |
| 114 | spin_lock_irqsave(&jornada_ssp_lock, jornada_ssp_flags); | 114 | spin_lock_irqsave(&jornada_ssp_lock, jornada_ssp_flags); |
| 115 | GPCR = GPIO_GPIO25; | 115 | GPCR = GPIO_GPIO25; |
| 116 | udelay(50); | 116 | udelay(50); |
| 117 | return 0; | 117 | return; |
| 118 | }; | 118 | }; |
| 119 | EXPORT_SYMBOL(jornada_ssp_start); | 119 | EXPORT_SYMBOL(jornada_ssp_start); |
| 120 | 120 | ||
| @@ -122,11 +122,11 @@ EXPORT_SYMBOL(jornada_ssp_start); | |||
| 122 | * jornada_ssp_end - disable mcu and turn off lock | 122 | * jornada_ssp_end - disable mcu and turn off lock |
| 123 | * | 123 | * |
| 124 | */ | 124 | */ |
| 125 | int jornada_ssp_end() | 125 | void jornada_ssp_end(void) |
| 126 | { | 126 | { |
| 127 | GPSR = GPIO_GPIO25; | 127 | GPSR = GPIO_GPIO25; |
| 128 | spin_unlock_irqrestore(&jornada_ssp_lock, jornada_ssp_flags); | 128 | spin_unlock_irqrestore(&jornada_ssp_lock, jornada_ssp_flags); |
| 129 | return 0; | 129 | return; |
| 130 | }; | 130 | }; |
| 131 | EXPORT_SYMBOL(jornada_ssp_end); | 131 | EXPORT_SYMBOL(jornada_ssp_end); |
| 132 | 132 | ||
