ARM: imx: Remove orphan header
Subsystems (3)
PATCH 1/2 ARM: imx: Remove orphan header
The header eukrea-baseboards.h is not used, remove it.
Signed-off-by Alexander Shiyan <[email protected]>
--- arch/arm/mach-imx/eukrea-baseboards.h | 42 ----------------------------------- 1 file changed, 42 deletions(-) delete mode 100644 arch/arm/mach-imx/eukrea-baseboards.h
arch/arm/mach-imx/eukrea-baseboards.h deleted +0 -42
@@ -1,42 +0,0 @@ -/* -* Copyright (C) 2010 Eric Benard - eric at eukrea.com -* -* Based on board-pcm038.h which is : -* Copyright (C) 2008 Juergen Beisert (kernel at pengutronix.de) -* -* 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., 51 Franklin Street, Fifth Floor, Boston, -* MA 02110-1301, USA. -*/ - -#ifndef __MACH_EUKREA_BASEBOARDS_H__ -#define __MACH_EUKREA_BASEBOARDS_H__ - -#ifndef __ASSEMBLY__ -/* -* This CPU module needs a baseboard to work. After basic initializing -* its own devices, it calls baseboard's init function. -* TODO: Add your own baseboard init function and call it from -* inside eukrea_cpuimx25_init() or eukrea_cpuimx35_init() -* -* This example here is for the development board. Refer -* mach-mx25/eukrea_mbimxsd-baseboard.c for cpuimx25 -* mach-mx3/eukrea_mbimxsd-baseboard.c for cpuimx35 -*/ - -extern void eukrea_mbimxsd25_baseboard_init (void ); -extern void eukrea_mbimxsd35_baseboard_init (void ); - -#endif - -#endif /* __MACH_EUKREA_BASEBOARDS_H__ */
Signature · 1 line
2.4.9
PATCH 2/2 ARM: imx: Use IRQCHIP_DECLARE for TZIC
Remove boilerplate code by using IRQCHIP_DECLARE macro.
Signed-off-by Alexander Shiyan <[email protected]>
--- arch/arm/mach-imx/common.h | 1 - arch/arm/mach-imx/mach-imx50.c | 1 - arch/arm/mach-imx/mach-imx51.c | 1 - arch/arm/mach-imx/mach-imx53.c | 1 - arch/arm/mach-imx/tzic.c | 10 +++++----- 5 files changed, 5 insertions(+), 9 deletions(-)
arch/arm/mach-imx/common.h +0 -1
@@ -32,7 +32,6 @@ void imx27_init_early(void);void imx31_init_early (void );void imx35_init_early (void );void mxc_init_irq (void __iomem *); -void tzic_init_irq (void );void mx1_init_irq (void );void mx21_init_irq (void );void mx27_init_irq (void );
arch/arm/mach-imx/mach-imx50.c +0 -1
@@ -22,6 +22,5 @@ static const char * const imx50_dt_board_compat[] __initconst = { };DT_MACHINE_START (IMX50_DT ,"Freescale i.MX50 (Device Tree Support)" ) - .init_irq = tzic_init_irq, .dt_compat = imx50_dt_board_compat,MACHINE_END
arch/arm/mach-imx/mach-imx51.c +0 -1
@@ -69,7 +69,6 @@ static const char * const imx51_dt_board_compat[] __initconst = {DT_MACHINE_START (IMX51_DT ,"Freescale i.MX51 (Device Tree Support)" ) .init_early = imx51_init_early, - .init_irq = tzic_init_irq, .init_machine = imx51_dt_init, .init_late = imx51_init_late, .dt_compat = imx51_dt_board_compat,
arch/arm/mach-imx/mach-imx53.c +0 -1
@@ -49,7 +49,6 @@ static const char * const imx53_dt_board_compat[] __initconst = {DT_MACHINE_START (IMX53_DT ,"Freescale i.MX53 (Device Tree Support)" ) .init_early = imx53_init_early, - .init_irq = tzic_init_irq, .init_machine = imx53_dt_init, .init_late = imx53_init_late, .dt_compat = imx53_dt_board_compat,
arch/arm/mach-imx/tzic.c +5 -5
@@ -9,12 +9,11 @@* http://www.gnu.org/copyleft/gpl.html */ -#include <linux/module.h> -#include <linux/moduleparam.h> #include <linux/init.h> #include <linux/device.h> #include <linux/errno.h> #include <linux/io.h> +#include <linux/irqchip.h> #include <linux/irqdomain.h> #include <linux/of.h> #include <linux/of_address.h>
@@ -153,13 +152,11 @@ static void __exception_irq_entry tzic_handle_irq(struct pt_regs *regs)* interrupts. It registers the interrupt enable and disable functions * to the kernel for each interrupt source. */ -void __init tzic_init_irq (void ) +static int __init tzic_init_dt (struct device_node *np,struct device_node *p) { -struct device_node *np;int irq_base;int i; - np =of_find_compatible_node (NULL ,NULL ,"fsl,tzic" ); tzic_base =of_iomap (np,0 );WARN_ON (!tzic_base);
@@ -199,7 +196,10 @@ void __init tzic_init_irq(void)#endif pr_info ("TrustZone Interrupt Controller (TZIC) initialized\n" ); + +return 0 ; } +IRQCHIP_DECLARE (tzic,"fsl,tzic" , tzic_init_dt);/** * tzic_enable_wake() - enable wakeup interrupt
Signature · 1 line
2.4.9
Shawn Guo
AppliedPATCH 1/2 ARM: imx: Remove orphan header
In reply to Alexander ShiyanQuoted 3 lines · Alexander Shiyan
The header
eukrea-baseboards.his not used, remove it.Signed-off-by Alexander Shiyan <[email protected]>
Applied both, thanks.