public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-10-31 08:44:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ARM: lpc32xx: clean up header files

Browse source 
All device drivers have stopped relying on mach/*.h headers,
so move the remaining headers into arch/arm/mach-lpc32xx/lpc32xx.h
to prepare for multiplatform builds.

The mach/entry-macro.S file has been unused for a long time now
and can simply get removed.

Link: https://lore.kernel.org/r/20190809144043.476786-13-arnd@arndb.de
Acked-by: Sylvain Lemieux <slemieux.tyco@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2019-08-09 16:40:38 +02:00
parent ffba29c9eb
commit d353291003
8 changed files with 21 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/arm/mach-lpc32xx/common.c
View file

@ -13,8 +13,7 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/system_info.h> #include <asm/system_info.h>
#include <mach/hardware.h> #include "lpc32xx.h"
#include <mach/platform.h>
#include "common.h" #include "common.h"
/* /*

28
arch/arm/mach-lpc32xx/include/mach/entry-macro.S
View file

@ -1,28 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
* arch/arm/mach-lpc32xx/include/mach/entry-macro.S
*
* Author: Kevin Wells <kevin.wells@nxp.com>
*
* Copyright (C) 2010 NXP Semiconductors
*/
#include <mach/hardware.h>
#include <mach/platform.h>
#define LPC32XX_INTC_MASKED_STATUS_OFS 0x8
.macro get_irqnr_preamble, base, tmp
ldr \base, =IO_ADDRESS(LPC32XX_MIC_BASE)
.endm
/*
* Return IRQ number in irqnr. Also return processor Z flag status in CPSR
* as set if an interrupt is pending.
*/
.macro get_irqnr_and_base, irqnr, irqstat, base, tmp
ldr \irqstat, [\base, #LPC32XX_INTC_MASKED_STATUS_OFS]
clz \irqnr, \irqstat
rsb \irqnr, \irqnr, #31
teq \irqstat, #0
.endm

25
arch/arm/mach-lpc32xx/include/mach/hardware.h
View file

@ -1,25 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
* arch/arm/mach-lpc32xx/include/mach/hardware.h
*
* Copyright (c) 2005 MontaVista Software, Inc. <source@mvista.com>
*/
#ifndef __ASM_ARCH_HARDWARE_H
#define __ASM_ARCH_HARDWARE_H
/*
* Start of virtual addresses for IO devices
*/
#define IO_BASE 0xF0000000
/*
* This macro relies on fact that for all HW i/o addresses bits 20-23 are 0
*/
#define IO_ADDRESS(x) IOMEM(((((x) & 0xff000000) >> 4) | ((x) & 0xfffff)) |\
IO_BASE)
#define io_p2v(x) ((void __iomem *) (unsigned long) IO_ADDRESS(x))
#define io_v2p(x) ((((x) & 0x0ff00000) << 4) | ((x) & 0x000fffff))
#endif

4
arch/arm/mach-lpc32xx/include/mach/uncompress.h
View file

@ -12,15 +12,13 @@
#include <linux/io.h> #include <linux/io.h>
#include <mach/hardware.h>
#include <mach/platform.h>
/* /*
* Uncompress output is hardcoded to standard UART 5 * Uncompress output is hardcoded to standard UART 5
*/ */
#define UART_FIFO_CTL_TX_RESET (1 << 2) #define UART_FIFO_CTL_TX_RESET (1 << 2)
#define UART_STATUS_TX_MT (1 << 6) #define UART_STATUS_TX_MT (1 << 6)
#define LPC32XX_UART5_BASE 0x40090000
#define _UARTREG(x) (void __iomem *)(LPC32XX_UART5_BASE + (x)) #define _UARTREG(x) (void __iomem *)(LPC32XX_UART5_BASE + (x))

18
arch/arm/mach-lpc32xx/include/mach/platform.h → arch/arm/mach-lpc32xx/lpc32xx.h
View file

@ -7,8 +7,8 @@
* Copyright (C) 2010 NXP Semiconductors * Copyright (C) 2010 NXP Semiconductors
*/ */
#ifndef __ASM_ARCH_PLATFORM_H #ifndef __ARM_LPC32XX_H
#define __ASM_ARCH_PLATFORM_H #define __ARM_LPC32XX_H
#define _SBF(f, v) ((v) << (f)) #define _SBF(f, v) ((v) << (f))
#define _BIT(n) _SBF(n, 1) #define _BIT(n) _SBF(n, 1)
@ -700,4 +700,18 @@
#define LPC32XX_USB_OTG_DEV_CLOCK_ON _BIT(1) #define LPC32XX_USB_OTG_DEV_CLOCK_ON _BIT(1)
#define LPC32XX_USB_OTG_HOST_CLOCK_ON _BIT(0) #define LPC32XX_USB_OTG_HOST_CLOCK_ON _BIT(0)
/*
* Start of virtual addresses for IO devices
*/
#define IO_BASE 0xF0000000
/*
* This macro relies on fact that for all HW i/o addresses bits 20-23 are 0
*/
#define IO_ADDRESS(x) IOMEM(((((x) & 0xff000000) >> 4) | ((x) & 0xfffff)) |\
IO_BASE)
#define io_p2v(x) ((void __iomem *) (unsigned long) IO_ADDRESS(x))
#define io_v2p(x) ((((x) & 0x0ff00000) << 4) | ((x) & 0x000fffff))
#endif #endif

3
arch/arm/mach-lpc32xx/pm.c
View file

@ -70,8 +70,7 @@
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <mach/hardware.h> #include "lpc32xx.h"
#include <mach/platform.h>
#include "common.h" #include "common.h"
#define TEMP_IRAM_AREA IO_ADDRESS(LPC32XX_IRAM_BASE) #define TEMP_IRAM_AREA IO_ADDRESS(LPC32XX_IRAM_BASE)

3
arch/arm/mach-lpc32xx/serial.c
View file

@ -16,8 +16,7 @@
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/io.h> #include <linux/io.h>
#include <mach/hardware.h> #include "lpc32xx.h"
#include <mach/platform.h>
#include "common.h" #include "common.h"
#define LPC32XX_SUART_FIFO_SIZE 64 #define LPC32XX_SUART_FIFO_SIZE 64

3
arch/arm/mach-lpc32xx/suspend.S
View file

@ -11,8 +11,7 @@
*/ */
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/assembler.h> #include <asm/assembler.h>
#include <mach/platform.h> #include "lpc32xx.h"
#include <mach/hardware.h>
/* Using named register defines makes the code easier to follow */ /* Using named register defines makes the code easier to follow */
#define WORK1_REG r0 #define WORK1_REG r0