hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARM: realview: clean up header files 

This contains multiple trivial cleanups to the realview headers:

- removing the file names from the introductory comment
- removing the uncompress.h header that is unused
- removing the irqs.h header and NR_IRQS logic that is
  obsoleted by sparse IRQs

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Arnd Bergmann 2015-11-25 17:32:23 +01:00 committed by Linus Walleij
parent 6d407a6eac
commit 38d2cfcc8d
21 changed files with 8 additions and 251 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-realview/board-eb.h
View File

@ -1,6 +1,4 @@
/*
* arch/arm/mach-realview/include/mach/board-eb.h
*
* Copyright (C) 2007 ARM Limited
*
* This program is free software; you can redistribute it and/or modify

2
arch/arm/mach-realview/board-pb1176.h
View File

@ -1,6 +1,4 @@
/*
* arch/arm/mach-realview/include/mach/board-pb1176.h
*
* Copyright (C) 2008 ARM Limited
*
* This program is free software; you can redistribute it and/or modify

2
arch/arm/mach-realview/board-pb11mp.h
View File

@ -1,6 +1,4 @@
/*
* arch/arm/mach-realview/include/mach/board-pb11mp.h
*
* Copyright (C) 2008 ARM Limited
*
* This program is free software; you can redistribute it and/or modify

2
arch/arm/mach-realview/board-pba8.h
View File

@ -1,6 +1,4 @@
/*
* include/asm-arm/arch-realview/board-pba8.h
*
* Copyright (C) 2008 ARM Limited
*
* This program is free software; you can redistribute it and/or modify

2
arch/arm/mach-realview/board-pbx.h
View File

@ -1,6 +1,4 @@
/*
* arch/arm/mach-realview/include/mach/board-pbx.h
*
* Copyright (C) 2009 ARM Limited
*
* This program is free software; you can redistribute it and/or modify

2
arch/arm/mach-realview/core.h
View File

@ -1,6 +1,4 @@
/*
* linux/arch/arm/mach-realview/core.h
*
* Copyright (C) 2004 ARM Limited
* Copyright (C) 2000 Deep Blue Solutions Ltd
*

2
arch/arm/mach-realview/hardware.h
View File

@ -1,6 +1,4 @@
/*
* arch/arm/mach-realview/include/mach/hardware.h
*
* This file contains the hardware definitions of the RealView boards.
*
* Copyright (C) 2003 ARM Limited.

20
arch/arm/mach-realview/irqs-eb.h
View File

@ -1,6 +1,4 @@
/*
* arch/arm/mach-realview/include/mach/irqs-eb.h
*
* Copyright (C) 2007 ARM Limited
*
* This program is free software; you can redistribute it and/or modify
@ -21,6 +19,7 @@
#ifndef __MACH_IRQS_EB_H
#define __MACH_IRQS_EB_H
#define IRQ_LOCALTIMER 29
#define IRQ_EB_GIC_START 32
/*
@ -112,21 +111,4 @@
#define NR_GIC_EB11MP 2
/*
* Only define NR_IRQS if less than NR_IRQS_EB
*/
#define NR_IRQS_EB (IRQ_EB_GIC_START + 128)
#if defined(CONFIG_MACH_REALVIEW_EB) \
&& (!defined(NR_IRQS) || (NR_IRQS < NR_IRQS_EB))
#undef NR_IRQS
#define NR_IRQS NR_IRQS_EB
#endif
#if defined(CONFIG_REALVIEW_EB_ARM11MP) || defined(CONFIG_REALVIEW_EB_A9MP) \
&& (!defined(MAX_GIC_NR) || (MAX_GIC_NR < NR_GIC_EB11MP))
#undef MAX_GIC_NR
#define MAX_GIC_NR NR_GIC_EB11MP
#endif
#endif /* __MACH_IRQS_EB_H */

21
arch/arm/mach-realview/irqs-pb1176.h
View File

@ -1,6 +1,4 @@
/*
* arch/arm/mach-realview/include/mach/irqs-pb1176.h
*
* Copyright (C) 2008 ARM Limited
*
* This program is free software; you can redistribute it and/or modify
@ -76,23 +74,4 @@
#define IRQ_PB1176_SCTL -1
#define NR_GIC_PB1176 2
/*
* Only define NR_IRQS if less than NR_IRQS_PB1176
*/
#define NR_IRQS_PB1176 (IRQ_DC1176_GIC_START + 96)
#if defined(CONFIG_MACH_REALVIEW_PB1176)
#if !defined(NR_IRQS) || (NR_IRQS < NR_IRQS_PB1176)
#undef NR_IRQS
#define NR_IRQS NR_IRQS_PB1176
#endif
#if !defined(MAX_GIC_NR) || (MAX_GIC_NR < NR_GIC_PB1176)
#undef MAX_GIC_NR
#define MAX_GIC_NR NR_GIC_PB1176
#endif
#endif /* __MACH_IRQS_PB1176_H */

27
arch/arm/mach-realview/irqs-pb11mp.h
View File

@ -1,6 +1,4 @@
/*
* arch/arm/mach-realview/include/mach/irqs-pb11mp.h
*
* Copyright (C) 2008 ARM Limited
*
* This program is free software; you can redistribute it and/or modify
@ -21,6 +19,7 @@
#ifndef __MACH_IRQS_PB11MP_H
#define __MACH_IRQS_PB11MP_H
#define IRQ_LOCALTIMER 29
#define IRQ_TC11MP_GIC_START 32
#define IRQ_PB11MP_GIC_START 64
@ -95,28 +94,4 @@
#define IRQ_PB11MP_TSPEN (IRQ_PB11MP_GIC_START + 30) /* Touchscreen pen */
#define IRQ_PB11MP_TSKPAD (IRQ_PB11MP_GIC_START + 31) /* Touchscreen keypad */
#define IRQ_PB11MP_SMC -1
#define IRQ_PB11MP_SCTL -1
#define NR_GIC_PB11MP 2
/*
* Only define NR_IRQS if less than NR_IRQS_PB11MP
*/
#define NR_IRQS_PB11MP (IRQ_TC11MP_GIC_START + 96)
#if defined(CONFIG_MACH_REALVIEW_PB11MP)
#if !defined(NR_IRQS) || (NR_IRQS < NR_IRQS_PB11MP)
#undef NR_IRQS
#define NR_IRQS NR_IRQS_PB11MP
#endif
#if !defined(MAX_GIC_NR) || (MAX_GIC_NR < NR_GIC_PB11MP)
#undef MAX_GIC_NR
#define MAX_GIC_NR NR_GIC_PB11MP
#endif
#endif /* CONFIG_MACH_REALVIEW_PB11MP */
#endif /* __MACH_IRQS_PB11MP_H */

23
arch/arm/mach-realview/irqs-pba8.h
View File

@ -1,6 +1,4 @@
/*
* arch/arm/mach-realview/include/mach/irqs-pba8.h
*
* Copyright (C) 2008 ARM Limited
*
* This program is free software; you can redistribute it and/or modify
@ -70,25 +68,4 @@
#define IRQ_PBA8_SMC -1
#define IRQ_PBA8_SCTL -1
#define NR_GIC_PBA8 1
/*
* Only define NR_IRQS if less than NR_IRQS_PBA8
*/
#define NR_IRQS_PBA8 (IRQ_PBA8_GIC_START + 64)
#if defined(CONFIG_MACH_REALVIEW_PBA8)
#if !defined(NR_IRQS) || (NR_IRQS < NR_IRQS_PBA8)
#undef NR_IRQS
#define NR_IRQS NR_IRQS_PBA8
#endif
#if !defined(MAX_GIC_NR) || (MAX_GIC_NR < NR_GIC_PBA8)
#undef MAX_GIC_NR
#define MAX_GIC_NR NR_GIC_PBA8
#endif
#endif /* CONFIG_MACH_REALVIEW_PBA8 */
#endif /* __MACH_IRQS_PBA8_H */

24
arch/arm/mach-realview/irqs-pbx.h
View File

@ -1,6 +1,4 @@
/*
* arch/arm/mach-realview/include/mach/irqs-pbx.h
*
* Copyright (C) 2009 ARM Limited
*
* This program is free software; you can redistribute it and/or modify
@ -20,6 +18,7 @@
#ifndef __MACH_IRQS_PBX_H
#define __MACH_IRQS_PBX_H
#define IRQ_LOCALTIMER 29
#define IRQ_PBX_GIC_START 32
/*
@ -85,25 +84,4 @@
#define IRQ_PBX_SMC -1
#define IRQ_PBX_SCTL -1
#define NR_GIC_PBX 1
/*
* Only define NR_IRQS if less than NR_IRQS_PBX
*/
#define NR_IRQS_PBX (IRQ_PBX_GIC_START + 96)
#if defined(CONFIG_MACH_REALVIEW_PBX)
#if !defined(NR_IRQS) || (NR_IRQS < NR_IRQS_PBX)
#undef NR_IRQS
#define NR_IRQS NR_IRQS_PBX
#endif
#if !defined(MAX_GIC_NR) || (MAX_GIC_NR < NR_GIC_PBX)
#undef MAX_GIC_NR
#define MAX_GIC_NR NR_GIC_PBX
#endif
#endif /* CONFIG_MACH_REALVIEW_PBX */
#endif /* __MACH_IRQS_PBX_H */

40
arch/arm/mach-realview/irqs.h
View File

@ -1,40 +0,0 @@
/*
* arch/arm/mach-realview/include/mach/irqs.h
*
* Copyright (C) 2003 ARM Limited
* Copyright (C) 2000 Deep Blue Solutions Ltd.
*
* 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 program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef __ASM_ARCH_IRQS_H
#define __ASM_ARCH_IRQS_H
#include "irqs-eb.h"
#include "irqs-pb11mp.h"
#include "irqs-pb1176.h"
#include "irqs-pba8.h"
#include "irqs-pbx.h"
#define IRQ_LOCALTIMER 29
#define IRQ_LOCALWDOG 30
#define IRQ_GIC_START 32
#ifndef NR_IRQS
#error "NR_IRQS not defined by the board-specific files"
#endif
#endif

2
arch/arm/mach-realview/platform.h
View File

@ -1,6 +1,4 @@
/*
* arch/arm/mach-realview/include/mach/platform.h
*
* Copyright (c) ARM Limited 2003. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify

1
arch/arm/mach-realview/realview-dt.c
View File

@ -11,7 +11,6 @@
#include <linux/of_platform.h>
#include <asm/mach/arch.h>
#include <asm/hardware/cache-l2x0.h>
#include "core.h"
static const char *const realview_dt_platform_compat[] __initconst = {
"arm,realview-eb",

2
arch/arm/mach-realview/realview_eb.c
View File

@ -45,7 +45,7 @@
#include <asm/mach/time.h>
#include "board-eb.h"
#include "irqs.h"
#include "irqs-eb.h"
#include "core.h"

2
arch/arm/mach-realview/realview_pb1176.c
View File

@ -46,7 +46,7 @@
#include <asm/mach/time.h>
#include "board-pb1176.h"
#include "irqs.h"
#include "irqs-pb1176.h"
#include "core.h"

2
arch/arm/mach-realview/realview_pb11mp.c
View File

@ -45,7 +45,7 @@
#include <asm/outercache.h>
#include "board-pb11mp.h"
#include "irqs.h"
#include "irqs-pb11mp.h"
#include "core.h"

2
arch/arm/mach-realview/realview_pba8.c
View File

@ -41,7 +41,7 @@
#include "hardware.h"
#include "board-pba8.h"
#include "irqs.h"
#include "irqs-pba8.h"
#include "core.h"

2
arch/arm/mach-realview/realview_pbx.c
View File

@ -43,7 +43,7 @@
#include "hardware.h"
#include "board-pbx.h"
#include "irqs.h"
#include "irqs-pbx.h"
#include "core.h"

77
arch/arm/mach-realview/uncompress.h
View File

@ -1,77 +0,0 @@
/*
* arch/arm/mach-realview/include/mach/uncompress.h
*
* Copyright (C) 2003 ARM Limited
*
* 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 program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "hardware.h"
#include <asm/mach-types.h>
#include "board-eb.h"
#include "board-pb11mp.h"
#include "board-pb1176.h"
#include "board-pba8.h"
#include "board-pbx.h"
#define AMBA_UART_DR(base) (*(volatile unsigned char *)((base) + 0x00))
#define AMBA_UART_LCRH(base) (*(volatile unsigned char *)((base) + 0x2c))
#define AMBA_UART_CR(base) (*(volatile unsigned char *)((base) + 0x30))
#define AMBA_UART_FR(base) (*(volatile unsigned char *)((base) + 0x18))
/*
* Return the UART base address
*/
static inline unsigned long get_uart_base(void)
{
if (machine_is_realview_eb())
return REALVIEW_EB_UART0_BASE;
else if (machine_is_realview_pb11mp())
return REALVIEW_PB11MP_UART0_BASE;
else if (machine_is_realview_pb1176())
return REALVIEW_PB1176_UART0_BASE;
else if (machine_is_realview_pba8())
return REALVIEW_PBA8_UART0_BASE;
else if (machine_is_realview_pbx())
return REALVIEW_PBX_UART0_BASE;
else
return 0;
}
/*
* This does not append a newline
*/
static inline void putc(int c)
{
unsigned long base = get_uart_base();
while (AMBA_UART_FR(base) & (1 << 5))
barrier();
AMBA_UART_DR(base) = c;
}
static inline void flush(void)
{
unsigned long base = get_uart_base();
while (AMBA_UART_FR(base) & (1 << 3))
barrier();
}
/*
* nothing to do
*/
#define arch_decomp_setup()