ARM: lpc32xx: clean up header files (d3532910) · Commits · 戴 / test

arch/arm/mach-lpc32xx/common.c

+1 −2

deleted100644 → 0

+0 −28

Original line number	Diff line number	Diff line
		/* 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

deleted100644 → 0

+0 −25

Original line number	Diff line number	Diff line
		/* 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

+1 −3

Original line number	Diff line number	Diff line
		@@ -12,15 +12,13 @@

		#include <linux/io.h>

		#include <mach/hardware.h>
		#include <mach/platform.h>

		/*
		* Uncompress output is hardcoded to standard UART 5
		*/

		#define UART_FIFO_CTL_TX_RESET (1 << 2)
		#define UART_STATUS_TX_MT (1 << 6)
		#define LPC32XX_UART5_BASE 0x40090000

		#define _UARTREG(x) (void __iomem *)(LPC32XX_UART5_BASE + (x))

+16 −2

Original line number	Diff line number	Diff line
		@@ -7,8 +7,8 @@
		* Copyright (C) 2010 NXP Semiconductors
		*/

		#ifndef __ASM_ARCH_PLATFORM_H
		#define __ASM_ARCH_PLATFORM_H
		#ifndef __ARM_LPC32XX_H
		#define __ARM_LPC32XX_H

		#define _SBF(f, v) ((v) << (f))
		#define _BIT(n) _SBF(n, 1)
		@@ -700,4 +700,18 @@
		#define LPC32XX_USB_OTG_DEV_CLOCK_ON _BIT(1)
		#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