Commit 58005b32 authored by Kristoffer Ericson's avatar Kristoffer Ericson Committed by Russell King

[ARM] 5255/1: Update jornada ssp to remove build errors/warnings

* Adds ssp functions into header so we don't get
"implicit declaration" error at builtime.
* Converts jornada_ssp_start/end functions into voids with
proper declarations (to avoid "prototype..." warning).
* Sorts include files in alphabetical order
* Minor comment changes
Signed-off-by: default avatarKristoffer Ericson <Kristoffer.Ericson@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 7e8bc3c6
/* /*
* arch/arm/mach-sa1100/include/mach/jornada720.h * arch/arm/mach-sa1100/include/mach/jornada720.h
* *
* This file contains SSP/MCU communication definitions for HP Jornada 710/720/728 * SSP/MCU communication definitions for HP Jornada 710/720/728
* *
* Copyright (C) 2007 Kristoffer Ericson <Kristoffer.Ericson@gmail.com> * Copyright 2007,2008 Kristoffer Ericson <Kristoffer.Ericson@gmail.com>
* Copyright (C) 2000 John Ankcorn <jca@lcs.mit.edu> * Copyright 2000 John Ankcorn <jca@lcs.mit.edu>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
...@@ -25,3 +25,8 @@ ...@@ -25,3 +25,8 @@
#define PWMOFF 0xDF #define PWMOFF 0xDF
#define TXDUMMY 0x11 #define TXDUMMY 0x11
#define ERRORCODE 0x00 #define ERRORCODE 0x00
extern void jornada_ssp_start(void);
extern void jornada_ssp_end(void);
extern int jornada_ssp_inout(u8 byte);
extern int jornada_ssp_byte(u8 byte);
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <asm/hardware/ssp.h>
#include <mach/jornada720.h> #include <mach/jornada720.h>
#include <asm/hardware/ssp.h>
static DEFINE_SPINLOCK(jornada_ssp_lock); static DEFINE_SPINLOCK(jornada_ssp_lock);
static unsigned long jornada_ssp_flags; static unsigned long jornada_ssp_flags;
...@@ -109,12 +109,12 @@ EXPORT_SYMBOL(jornada_ssp_inout); ...@@ -109,12 +109,12 @@ EXPORT_SYMBOL(jornada_ssp_inout);
* jornada_ssp_start - enable mcu * jornada_ssp_start - enable mcu
* *
*/ */
int jornada_ssp_start() void jornada_ssp_start(void)
{ {
spin_lock_irqsave(&jornada_ssp_lock, jornada_ssp_flags); spin_lock_irqsave(&jornada_ssp_lock, jornada_ssp_flags);
GPCR = GPIO_GPIO25; GPCR = GPIO_GPIO25;
udelay(50); udelay(50);
return 0; return;
}; };
EXPORT_SYMBOL(jornada_ssp_start); EXPORT_SYMBOL(jornada_ssp_start);
...@@ -122,11 +122,11 @@ EXPORT_SYMBOL(jornada_ssp_start); ...@@ -122,11 +122,11 @@ EXPORT_SYMBOL(jornada_ssp_start);
* jornada_ssp_end - disable mcu and turn off lock * jornada_ssp_end - disable mcu and turn off lock
* *
*/ */
int jornada_ssp_end() void jornada_ssp_end(void)
{ {
GPSR = GPIO_GPIO25; GPSR = GPIO_GPIO25;
spin_unlock_irqrestore(&jornada_ssp_lock, jornada_ssp_flags); spin_unlock_irqrestore(&jornada_ssp_lock, jornada_ssp_flags);
return 0; return;
}; };
EXPORT_SYMBOL(jornada_ssp_end); EXPORT_SYMBOL(jornada_ssp_end);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment