ARM: msm: Remove irqs-*.h files for DT based targets
Subsystems (3)
PATCH v2 1/2 ARM: msm: Remove irqs-*.h files for DT based targets
From: Stephen Boyd <[email protected]>
We don't want or need the irqs.h files from the DT based MSM targets. Remove these header files and select sparse irq so that we don't try to include the mach/irqs.h file.
Reviewed-by Rohit Vaswani <[email protected]>
Signed-off-by Stephen Boyd <[email protected]>
Signed-off-by Rohit Vaswani <[email protected]>
--- arch/arm/mach-msm/Kconfig | 2 + arch/arm/mach-msm/include/mach/irqs-8960.h | 277 ----------------------------- arch/arm/mach-msm/include/mach/irqs-8x60.h | 258 --------------------------- arch/arm/mach-msm/include/mach/irqs.h | 5 - 4 files changed, 2 insertions(+), 540 deletions(-) delete mode 100644 arch/arm/mach-msm/include/mach/irqs-8960.h delete mode 100644 arch/arm/mach-msm/include/mach/irqs-8x60.h
arch/arm/mach-msm/Kconfig +2 -0
@@ -49,6 +49,7 @@ config ARCH_MSM8X60 select GPIO_MSM_V2 select HAVE_SMP select MSM_SCM if SMP + select SPARSE_IRQ select USE_OF config ARCH_MSM8960
@@ -58,6 +59,7 @@ config ARCH_MSM8960 select HAVE_SMP select GPIO_MSM_V2 select MSM_SCM if SMP + select SPARSE_IRQ select USE_OF config MSM_HAS_DEBUG_UART_HS
arch/arm/mach-msm/include/mach/irqs-8960.h deleted +0 -277
277 lines not on this page · raw message
arch/arm/mach-msm/include/mach/irqs-8x60.h deleted +0 -258
258 lines not on this page · raw message
arch/arm/mach-msm/include/mach/irqs.h +0 -5
@@ -24,11 +24,6 @@#elif defined(CONFIG_ARCH_QSD8X50 )#include "irqs-8x50.h" #include "sirc.h" -#elif defined(CONFIG_ARCH_MSM8X60 ) -#include "irqs-8x60.h" -#elif defined(CONFIG_ARCH_MSM8960 ) -/* TODO: Make these not generic. */ -#include "irqs-8960.h" #elif defined(CONFIG_ARCH_MSM_ARM11 )#include "irqs-7x00.h" #else
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH v2 2/2 ARM: msm: Create a common board-dt and config ARCH_MSM_DT
Create a config ARCH_MSM_DT and common board-dt.c
to encapsulate the MSM DT based targets.
Reviewed-by Stephen Boyd <[email protected]>
Signed-off-by Rohit Vaswani <[email protected]>
--- arch/arm/mach-msm/Kconfig | 13 +++++++---- arch/arm/mach-msm/Makefile | 3 +-- arch/arm/mach-msm/board-dt-8660.c | 48 --------------------------------------- arch/arm/mach-msm/board-dt-8960.c | 35 ---------------------------- arch/arm/mach-msm/board-dt.c | 32 ++++++++++++++++++++++++++ 5 files changed, 42 insertions(+), 89 deletions(-) delete mode 100644 arch/arm/mach-msm/board-dt-8660.c delete mode 100644 arch/arm/mach-msm/board-dt-8960.c create mode 100644 arch/arm/mach-msm/board-dt.c
arch/arm/mach-msm/Kconfig +9 -4
@@ -1,12 +1,12 @@ if ARCH_MSM comment "Qualcomm MSM SoC Type" - depends on (ARCH_MSM8X60 || ARCH_MSM8960) + depends on ARCH_MSM_DT choice prompt "Qualcomm MSM SoC Type" default ARCH_MSM7X00A - depends on !(ARCH_MSM8X60 || ARCH_MSM8960) + depends on !ARCH_MSM_DT config ARCH_MSM7X00A bool "MSM7x00A / MSM7x01A"
@@ -49,8 +49,6 @@ config ARCH_MSM8X60 select GPIO_MSM_V2 select HAVE_SMP select MSM_SCM if SMP - select SPARSE_IRQ - select USE_OF config ARCH_MSM8960 bool "MSM8960"
@@ -59,6 +57,10 @@ config ARCH_MSM8960 select HAVE_SMP select GPIO_MSM_V2 select MSM_SCM if SMP + +config ARCH_MSM_DT + def_bool y + depends on (ARCH_MSM8X60 || ARCH_MSM8960) select SPARSE_IRQ select USE_OF
@@ -70,6 +72,7 @@ config MSM_SOC_REV_A config ARCH_MSM_ARM11 bool + config ARCH_MSM_SCORPION bool
@@ -77,6 +80,7 @@ config MSM_VIC bool menu "Qualcomm MSM Board Type" + depends on !ARCH_MSM_DT config MACH_HALIBUT depends on ARCH_MSM
@@ -124,6 +128,7 @@ config MSM_SMD config MSM_GPIOMUX bool + depends on !ARCH_MSM_DT help Support for MSM V1 TLMM GPIOMUX architecture.
arch/arm/mach-msm/Makefile +1 -2
@@ -26,7 +26,6 @@ obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o b obj-$(CONFIG_MACH_HALIBUT) += board-halibut.o devices-msm7x00.o obj-$(CONFIG_ARCH_MSM7X30) += board-msm7x30.o devices-msm7x30.o obj-$(CONFIG_ARCH_QSD8X50) += board-qsd8x50.o devices-qsd8x50.o -obj-$(CONFIG_ARCH_MSM8X60) += board-dt-8660.o -obj-$(CONFIG_ARCH_MSM8960) += board-dt-8960.o +obj-$(CONFIG_ARCH_MSM_DT) += board-dt.o obj-$(CONFIG_MSM_GPIOMUX) += gpiomux.o obj-$(CONFIG_ARCH_QSD8X50) += gpiomux-8x50.o
arch/arm/mach-msm/board-dt-8660.c deleted +0 -48
48 lines not on this page · raw message
arch/arm/mach-msm/board-dt-8960.c deleted +0 -35
@@ -1,35 +0,0 @@ -/* Copyright (c) 2012, The Linux Foundation. All rights reserved. -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 and -* only version 2 as published by the Free Software Foundation. -* -* 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. -*/ - -#include <linux/init.h> -#include <linux/of_platform.h> - -#include <asm/mach/arch.h> -#include <asm/mach/map.h> - -#include "common.h" - -static void __init msm_dt_init (void ) -{ -of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL ); -} - -static const char *const msm8960_dt_match[]__initconst = { -"qcom,msm8960-cdp" , -NULL -}; - -DT_MACHINE_START (MSM8960_DT ,"Qualcomm MSM (Flattened Device Tree)" ) - .smp = smp_ops(msm_smp_ops), - .init_machine = msm_dt_init, - .dt_compat = msm8960_dt_match, -MACHINE_END
arch/arm/mach-msm/board-dt.c new file +32 -0
@@ -0,0 +1,32 @@ +/* Copyright (c) 2010-2012,2013 The Linux Foundation. All rights reserved. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 and +* only version 2 as published by the Free Software Foundation. +* +* 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. +*/ + +#include <linux/init.h> +#include <linux/of.h> +#include <linux/of_platform.h> + +#include <asm/mach/arch.h> +#include <asm/mach/map.h> + +#include "common.h" + +static const char *const msm_dt_match[]__initconst = { +"qcom,msm8660-fluid" , +"qcom,msm8660-surf" , +"qcom,msm8960-cdp" , +NULL +}; + +DT_MACHINE_START (MSM_DT ,"Qualcomm MSM (Flattened Device Tree)" ) + .smp = smp_ops(msm_smp_ops), + .dt_compat = msm_dt_match, +MACHINE_END
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCHv2 2/2] ARM: msm: Create a common board-dt and config ARCH_MSM_DT
arch/arm/mach-msm/board-dt.c line 1
Quoted 7 lines · Rohit Vaswani
arch/arm/mach-msm/board-dt.c new file +1
-0@@ -0,0 +1,32 @@ +/* Copyright (c) 2010-2012,2013 The Linux Foundation. All rights reserved.
Hm.. I meant 2010-2013. Maybe David can fix that when he picks it up.
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation