ARM: OMAP: Remove remaining board-*.h includes from hardware.h
Also remove board-omap3beagle.h that is not included anywhere, and move protoype for voiceblue_reset() from board-voiceblue.h to system.h. After this patch there are still board-ams-delta.h, board-sx1.h and board-voiceblue.h that export some functions. These could be removed if the functions were moved under drivers. Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
parent
d40cdf080d
commit
6b0147cda6
4 changed files with 2 additions and 56 deletions
|
@ -1,33 +0,0 @@
|
||||||
/*
|
|
||||||
* arch/arm/plat-omap/include/mach/board-omap3beagle.h
|
|
||||||
*
|
|
||||||
* Hardware definitions for TI OMAP3 BEAGLE.
|
|
||||||
*
|
|
||||||
* Initial creation by Syed Mohammed Khasim <khasim@ti.com>
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify it
|
|
||||||
* under the terms of the GNU General Public License as published by the
|
|
||||||
* Free Software Foundation; either version 2 of the License, or (at your
|
|
||||||
* option) any later version.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
|
||||||
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
||||||
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
|
|
||||||
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
||||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
|
|
||||||
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
|
||||||
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
||||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License along
|
|
||||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
||||||
* 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __ASM_ARCH_OMAP3_BEAGLE_H
|
|
||||||
#define __ASM_ARCH_OMAP3_BEAGLE_H
|
|
||||||
|
|
||||||
#endif /* __ASM_ARCH_OMAP3_BEAGLE_H */
|
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
extern void voiceblue_wdt_enable(void);
|
extern void voiceblue_wdt_enable(void);
|
||||||
extern void voiceblue_wdt_disable(void);
|
extern void voiceblue_wdt_disable(void);
|
||||||
extern void voiceblue_wdt_ping(void);
|
extern void voiceblue_wdt_ping(void);
|
||||||
extern void voiceblue_reset(void);
|
|
||||||
|
|
||||||
#endif /* __ASM_ARCH_VOICEBLUE_H */
|
#endif /* __ASM_ARCH_VOICEBLUE_H */
|
||||||
|
|
||||||
|
|
|
@ -286,26 +286,4 @@
|
||||||
#include "omap24xx.h"
|
#include "omap24xx.h"
|
||||||
#include "omap34xx.h"
|
#include "omap34xx.h"
|
||||||
|
|
||||||
#ifndef __ASSEMBLER__
|
|
||||||
|
|
||||||
/*
|
|
||||||
* ---------------------------------------------------------------------------
|
|
||||||
* Board specific defines
|
|
||||||
* ---------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifdef CONFIG_MACH_OMAP3_BEAGLE
|
|
||||||
#include "board-omap3beagle.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef CONFIG_MACH_VOICEBLUE
|
|
||||||
#include "board-voiceblue.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef CONFIG_MACH_SX1
|
|
||||||
#include "board-sx1.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* !__ASSEMBLER__ */
|
|
||||||
|
|
||||||
#endif /* __ASM_ARCH_OMAP_HARDWARE_H */
|
#endif /* __ASM_ARCH_OMAP_HARDWARE_H */
|
||||||
|
|
|
@ -11,6 +11,8 @@
|
||||||
|
|
||||||
#ifndef CONFIG_MACH_VOICEBLUE
|
#ifndef CONFIG_MACH_VOICEBLUE
|
||||||
#define voiceblue_reset() do {} while (0)
|
#define voiceblue_reset() do {} while (0)
|
||||||
|
#else
|
||||||
|
extern void voiceblue_reset(void);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
extern void omap_prcm_arch_reset(char mode);
|
extern void omap_prcm_arch_reset(char mode);
|
||||||
|
|
Loading…
Add table
Reference in a new issue