Commit 70d84a64 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'tegra/cleanup' into next/cleanup 

* tegra/cleanup:
  arm/tegra: Remove code that's ifndef CONFIG_ARM_GIC
  arm/tegra: remove unused defines
  arm/tegra: fix variable formatting in makefile

Conflicts:
	arch/arm/mach-tegra/include/mach/entry-macro.S
parents 0363e3da f5ce5e7e

arch/arm/mach-tegra/Makefile

+13 −13
Original line number Diff line number Diff line
@@ -18,20 +18,20 @@ obj-$(CONFIG_CPU_FREQ) += cpu-tegra.o 
obj-$(CONFIG_TEGRA_PCI)			+= pcie.o

obj-$(CONFIG_USB_SUPPORT)		+= usb_phy.o



obj-${CONFIG_MACH_HARMONY}              += board-harmony.o

obj-${CONFIG_MACH_HARMONY}              += board-harmony-pinmux.o

obj-${CONFIG_MACH_HARMONY}              += board-harmony-pcie.o

obj-${CONFIG_MACH_HARMONY}              += board-harmony-power.o

obj-$(CONFIG_MACH_HARMONY)              += board-harmony.o

obj-$(CONFIG_MACH_HARMONY)              += board-harmony-pinmux.o

obj-$(CONFIG_MACH_HARMONY)              += board-harmony-pcie.o

obj-$(CONFIG_MACH_HARMONY)              += board-harmony-power.o



obj-${CONFIG_MACH_PAZ00}		+= board-paz00.o

obj-${CONFIG_MACH_PAZ00}		+= board-paz00-pinmux.o

obj-$(CONFIG_MACH_PAZ00)		+= board-paz00.o

obj-$(CONFIG_MACH_PAZ00)		+= board-paz00-pinmux.o



obj-${CONFIG_MACH_SEABOARD}             += board-seaboard.o

obj-${CONFIG_MACH_SEABOARD}             += board-seaboard-pinmux.o

obj-$(CONFIG_MACH_SEABOARD)             += board-seaboard.o

obj-$(CONFIG_MACH_SEABOARD)             += board-seaboard-pinmux.o



obj-${CONFIG_MACH_TEGRA_DT}             += board-dt.o

obj-${CONFIG_MACH_TEGRA_DT}             += board-harmony-pinmux.o

obj-${CONFIG_MACH_TEGRA_DT}             += board-seaboard-pinmux.o

obj-$(CONFIG_MACH_TEGRA_DT)             += board-dt.o

obj-$(CONFIG_MACH_TEGRA_DT)             += board-harmony-pinmux.o

obj-$(CONFIG_MACH_TEGRA_DT)             += board-seaboard-pinmux.o



obj-${CONFIG_MACH_TRIMSLICE}            += board-trimslice.o

obj-${CONFIG_MACH_TRIMSLICE}            += board-trimslice-pinmux.o
 
obj-$(CONFIG_MACH_TRIMSLICE)            += board-trimslice.o

obj-$(CONFIG_MACH_TRIMSLICE)            += board-trimslice-pinmux.o

arch/arm/mach-tegra/include/mach/entry-macro.S

+0 −18
Original line number Diff line number Diff line
@@ -18,21 +18,3 @@ 


	.macro	arch_ret_to_user, tmp1, tmp2

	.endm
 


#if !defined(CONFIG_ARM_GIC)

	/* legacy interrupt controller for AP16 */



	.macro	get_irqnr_preamble, base, tmp

	@ enable imprecise aborts

	cpsie	a

	@ EVP base at 0xf010f000

	mov \base, #0xf0000000

	orr \base, #0x00100000

	orr \base, #0x0000f000

	.endm



	.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp

	ldr \irqnr, [\base, #0x20]	@ EVT_IRQ_STS

	cmp \irqnr, #0x80

	.endm

#endif

arch/arm/mach-tegra/irq.c

+0 −4
Original line number Diff line number Diff line
@@ -28,10 +28,6 @@ 


#include "board.h"



#define INT_SYS_NR	(INT_GPIO_BASE - INT_PRI_BASE)

#define INT_SYS_SZ	(INT_SEC_BASE - INT_PRI_BASE)

#define PPI_NR		((INT_SYS_NR+INT_SYS_SZ-1)/INT_SYS_SZ)



#define ICTLR_CPU_IEP_VFIQ	0x08

#define ICTLR_CPU_IEP_FIR	0x14

#define ICTLR_CPU_IEP_FIR_SET	0x18

CRA Git | Maintained and supported by SUSTech CRA and CCSE