Skip to content

Commit afe6fe7

Browse files
torvaldstorvalds
committed
Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC late updates from Arnd Bergmann: "Here are two branches that came relatively late during the linux-5.0 development cycle and have dependencies on the other branches: - On the TI OMAP platform, the CPSW Ethernet PHY mode selection driver is being replaced, this puts the final pieces in place - On the DaVinci platform, the interrupt handling code in arch/arm gets moved into a regular device driver in drivers/irqchip. Since they both had some time in linux-next after the 5.0-rc8 release, I'm sending them along with the other updates" * tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (38 commits) net: ethernet: ti: cpsw: deprecate cpsw-phy-sel driver ARM: davinci: remove intc related fields from davinci_soc_info irqchip: davinci-cp-intc: move the driver to drivers/irqchip ARM: davinci: cp-intc: remove redundant comments ARM: davinci: cp-intc: drop GPL license boilerplate ARM: davinci: cp-intc: use readl/writel_relaxed() ARM: davinci: cp-intc: unify error handling ARM: davinci: cp-intc: improve coding style ARM: davinci: cp-intc: request the memory region before remapping it ARM: davinci: cp-intc: use the new-style config structure ARM: davinci: cp-intc: convert all hex numbers to lowercase ARM: davinci: cp-intc: use a common prefix for all symbols ARM: davinci: cp-intc: add the new config structures for da8xx SoCs irqchip: davinci-cp-intc: add a new config structure ARM: davinci: cp-intc: add a wrapper around cp_intc_init() ARM: davinci: cp-intc: remove cp_intc.h irqchip: davinci-aintc: move the driver to drivers/irqchip ARM: davinci: aintc: remove unnecessary includes ARM: davinci: aintc: remove the timer-specific irq_set_handler() ARM: davinci: aintc: request memory region before remapping it ...
2 parents 64b1b21 + 2547635 commit afe6fe7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+889
-964
lines changed

‎arch/arm/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -590,11 +590,13 @@ config ARCH_DAVINCI
590590
select GENERIC_ALLOCATOR
591591
select GENERIC_CLOCKEVENTS
592592
select GENERIC_IRQ_CHIP
593+
select GENERIC_IRQ_MULTI_HANDLER
593594
select GPIOLIB
594595
select HAVE_IDE
595596
select PM_GENERIC_DOMAINS if PM
596597
select PM_GENERIC_DOMAINS_OF if PM && OF
597598
select RESET_CONTROLLER
599+
select SPARSE_IRQ
598600
select USE_OF
599601
select ZONE_DMA
600602
help

‎arch/arm/mach-davinci/Kconfig

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
# SPDX-License-Identifier: GPL-2.0
22
if ARCH_DAVINCI
33

4-
config AINTC
5-
bool
6-
7-
config CP_INTC
8-
bool
9-
select IRQ_DOMAIN
10-
114
config ARCH_DAVINCI_DMx
125
bool
136

@@ -17,17 +10,17 @@ comment "DaVinci Core Type"
1710

1811
config ARCH_DAVINCI_DM644x
1912
bool "DaVinci 644x based system"
20-
select AINTC
13+
select DAVINCI_AINTC
2114
select ARCH_DAVINCI_DMx
2215

2316
config ARCH_DAVINCI_DM355
2417
bool "DaVinci 355 based system"
25-
select AINTC
18+
select DAVINCI_AINTC
2619
select ARCH_DAVINCI_DMx
2720

2821
config ARCH_DAVINCI_DM646x
2922
bool "DaVinci 646x based system"
30-
select AINTC
23+
select DAVINCI_AINTC
3124
select ARCH_DAVINCI_DMx
3225

3326
config ARCH_DAVINCI_DA830
@@ -36,20 +29,20 @@ config ARCH_DAVINCI_DA830
3629
select ARCH_DAVINCI_DA8XX
3730
# needed on silicon revs 1.0, 1.1:
3831
select CPU_DCACHE_WRITETHROUGH if !CPU_DCACHE_DISABLE
39-
select CP_INTC
32+
select DAVINCI_CP_INTC
4033

4134
config ARCH_DAVINCI_DA850
4235
bool "DA850/OMAP-L138/AM18x based system"
4336
depends on !ARCH_DAVINCI_DMx || (AUTO_ZRELADDR && ARM_PATCH_PHYS_VIRT)
4437
select ARCH_DAVINCI_DA8XX
45-
select CP_INTC
38+
select DAVINCI_CP_INTC
4639

4740
config ARCH_DAVINCI_DA8XX
4841
bool
4942

5043
config ARCH_DAVINCI_DM365
5144
bool "DaVinci 365 based system"
52-
select AINTC
45+
select DAVINCI_AINTC
5346
select ARCH_DAVINCI_DMx
5447

5548
comment "DaVinci Board Type"

‎arch/arm/mach-davinci/Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ obj-$(CONFIG_ARCH_DAVINCI_DM365) += dm365.o devices.o
1818
obj-$(CONFIG_ARCH_DAVINCI_DA830) += da830.o devices-da8xx.o usb-da8xx.o
1919
obj-$(CONFIG_ARCH_DAVINCI_DA850) += da850.o devices-da8xx.o usb-da8xx.o
2020

21-
obj-$(CONFIG_AINTC) += irq.o
22-
obj-$(CONFIG_CP_INTC) += cp_intc.o
23-
2421
# Board specific
2522
obj-$(CONFIG_MACH_DA8XX_DT) += da8xx-dt.o pdata-quirks.o
2623
obj-$(CONFIG_MACH_DAVINCI_EVM) += board-dm644x-evm.o

‎arch/arm/mach-davinci/asp.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@
4949
#define DAVINCI_DA830_DMA_MCASP2_AXEVT 5
5050

5151
/* Interrupts */
52-
#define DAVINCI_ASP0_RX_INT IRQ_MBRINT
53-
#define DAVINCI_ASP0_TX_INT IRQ_MBXINT
54-
#define DAVINCI_ASP1_RX_INT IRQ_MBRINT
55-
#define DAVINCI_ASP1_TX_INT IRQ_MBXINT
52+
#define DAVINCI_ASP0_RX_INT DAVINCI_INTC_IRQ(IRQ_MBRINT)
53+
#define DAVINCI_ASP0_TX_INT DAVINCI_INTC_IRQ(IRQ_MBXINT)
54+
#define DAVINCI_ASP1_RX_INT DAVINCI_INTC_IRQ(IRQ_MBRINT)
55+
#define DAVINCI_ASP1_TX_INT DAVINCI_INTC_IRQ(IRQ_MBXINT)
5656

5757
#endif /* __ASM_ARCH_DAVINCI_ASP_H */

‎arch/arm/mach-davinci/board-da830-evm.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,11 @@
3636
#include <asm/mach/arch.h>
3737

3838
#include <mach/common.h>
39-
#include "cp_intc.h"
4039
#include <mach/mux.h>
4140
#include <mach/da8xx.h>
4241

42+
#include "irqs.h"
43+
4344
#define DA830_EVM_PHY_ID ""
4445
/*
4546
* USB1 VBUS is controlled by GPIO1[15], over-current is reported on GPIO2[4].
@@ -633,7 +634,7 @@ static void __init da830_evm_map_io(void)
633634
MACHINE_START(DAVINCI_DA830_EVM, "DaVinci DA830/OMAP-L137/AM17x EVM")
634635
.atag_offset = 0x100,
635636
.map_io = da830_evm_map_io,
636-
.init_irq = cp_intc_init,
637+
.init_irq = da830_init_irq,
637638
.init_time = da830_init_time,
638639
.init_machine = da830_evm_init,
639640
.init_late = davinci_init_late,

‎arch/arm/mach-davinci/board-da850-evm.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,10 @@
4343
#include <linux/spi/flash.h>
4444

4545
#include <mach/common.h>
46-
#include "cp_intc.h"
4746
#include <mach/da8xx.h>
4847
#include <mach/mux.h>
48+
49+
#include "irqs.h"
4950
#include "sram.h"
5051

5152
#include <asm/mach-types.h>
@@ -1499,7 +1500,7 @@ static void __init da850_evm_map_io(void)
14991500
MACHINE_START(DAVINCI_DA850_EVM, "DaVinci DA850/OMAP-L138/AM18x EVM")
15001501
.atag_offset = 0x100,
15011502
.map_io = da850_evm_map_io,
1502-
.init_irq = cp_intc_init,
1503+
.init_irq = da850_init_irq,
15031504
.init_time = da850_init_time,
15041505
.init_machine = da850_evm_init,
15051506
.init_late = davinci_init_late,

‎arch/arm/mach-davinci/board-dm355-evm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ static __init void dm355_evm_init(void)
438438
MACHINE_START(DAVINCI_DM355_EVM, "DaVinci DM355 EVM")
439439
.atag_offset = 0x100,
440440
.map_io = dm355_evm_map_io,
441-
.init_irq = davinci_irq_init,
441+
.init_irq = dm355_init_irq,
442442
.init_time = dm355_init_time,
443443
.init_machine = dm355_evm_init,
444444
.init_late = davinci_init_late,

‎arch/arm/mach-davinci/board-dm355-leopard.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ static __init void dm355_leopard_init(void)
273273
MACHINE_START(DM355_LEOPARD, "DaVinci DM355 leopard")
274274
.atag_offset = 0x100,
275275
.map_io = dm355_leopard_map_io,
276-
.init_irq = davinci_irq_init,
276+
.init_irq = dm355_init_irq,
277277
.init_time = dm355_init_time,
278278
.init_machine = dm355_leopard_init,
279279
.init_late = davinci_init_late,

‎arch/arm/mach-davinci/board-dm365-evm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -831,7 +831,7 @@ static __init void dm365_evm_init(void)
831831
MACHINE_START(DAVINCI_DM365_EVM, "DaVinci DM365 EVM")
832832
.atag_offset = 0x100,
833833
.map_io = dm365_evm_map_io,
834-
.init_irq = davinci_irq_init,
834+
.init_irq = dm365_init_irq,
835835
.init_time = dm365_init_time,
836836
.init_machine = dm365_evm_init,
837837
.init_late = davinci_init_late,

‎arch/arm/mach-davinci/board-dm644x-evm.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,18 @@
3636
#include <asm/mach/arch.h>
3737

3838
#include <mach/common.h>
39-
#include <linux/platform_data/i2c-davinci.h>
40-
#include <mach/serial.h>
4139
#include <mach/mux.h>
40+
#include <mach/serial.h>
41+
42+
#include <linux/platform_data/i2c-davinci.h>
4243
#include <linux/platform_data/mtd-davinci.h>
4344
#include <linux/platform_data/mmc-davinci.h>
4445
#include <linux/platform_data/usb-davinci.h>
4546
#include <linux/platform_data/mtd-davinci-aemif.h>
4647
#include <linux/platform_data/ti-aemif.h>
4748

4849
#include "davinci.h"
50+
#include "irqs.h"
4951

5052
#define DM644X_EVM_PHY_ID "davinci_mdio-0:01"
5153
#define LXT971_PHY_ID (0x001378e2)
@@ -886,7 +888,7 @@ MACHINE_START(DAVINCI_EVM, "DaVinci DM644x EVM")
886888
/* Maintainer: MontaVista Software <source@mvista.com> */
887889
.atag_offset = 0x100,
888890
.map_io = davinci_evm_map_io,
889-
.init_irq = davinci_irq_init,
891+
.init_irq = dm644x_init_irq,
890892
.init_time = dm644x_init_time,
891893
.init_machine = davinci_evm_init,
892894
.init_late = davinci_init_late,

‎arch/arm/mach-davinci/board-dm646x-evm.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@
4444
#include <asm/mach/arch.h>
4545

4646
#include <mach/common.h>
47-
#include <mach/irqs.h>
4847
#include <mach/serial.h>
4948

5049
#include "davinci.h"
50+
#include "irqs.h"
5151

5252
#define NAND_BLOCK_SIZE SZ_128K
5353

@@ -860,7 +860,7 @@ static __init void evm_init(void)
860860
MACHINE_START(DAVINCI_DM6467_EVM, "DaVinci DM646x EVM")
861861
.atag_offset = 0x100,
862862
.map_io = davinci_map_io,
863-
.init_irq = davinci_irq_init,
863+
.init_irq = dm646x_init_irq,
864864
.init_time = dm646x_evm_init_time,
865865
.init_machine = evm_init,
866866
.init_late = davinci_init_late,
@@ -870,7 +870,7 @@ MACHINE_END
870870
MACHINE_START(DAVINCI_DM6467TEVM, "DaVinci DM6467T EVM")
871871
.atag_offset = 0x100,
872872
.map_io = davinci_map_io,
873-
.init_irq = davinci_irq_init,
873+
.init_irq = dm646x_init_irq,
874874
.init_time = dm6467t_evm_init_time,
875875
.init_machine = evm_init,
876876
.init_late = davinci_init_late,

‎arch/arm/mach-davinci/board-mityomapl138.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#include <asm/mach-types.h>
3030
#include <asm/mach/arch.h>
3131
#include <mach/common.h>
32-
#include "cp_intc.h"
3332
#include <mach/da8xx.h>
3433
#include <linux/platform_data/mtd-davinci.h>
3534
#include <linux/platform_data/mtd-davinci-aemif.h>
@@ -628,7 +627,7 @@ static void __init mityomapl138_map_io(void)
628627
MACHINE_START(MITYOMAPL138, "MityDSP-L138/MityARM-1808")
629628
.atag_offset = 0x100,
630629
.map_io = mityomapl138_map_io,
631-
.init_irq = cp_intc_init,
630+
.init_irq = da850_init_irq,
632631
.init_time = da850_init_time,
633632
.init_machine = mityomapl138_init,
634633
.init_late = davinci_init_late,

‎arch/arm/mach-davinci/board-neuros-osd2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ MACHINE_START(NEUROS_OSD2, "Neuros OSD2")
231231
/* Maintainer: Neuros Technologies <neuros@groups.google.com> */
232232
.atag_offset = 0x100,
233233
.map_io = davinci_ntosd2_map_io,
234-
.init_irq = davinci_irq_init,
234+
.init_irq = dm644x_init_irq,
235235
.init_time = dm644x_init_time,
236236
.init_machine = davinci_ntosd2_init,
237237
.init_late = davinci_init_late,

‎arch/arm/mach-davinci/board-omapl138-hawk.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include <asm/mach/arch.h>
2828

2929
#include <mach/common.h>
30-
#include "cp_intc.h"
3130
#include <mach/da8xx.h>
3231
#include <mach/mux.h>
3332

@@ -399,7 +398,7 @@ static void __init omapl138_hawk_map_io(void)
399398
MACHINE_START(OMAPL138_HAWKBOARD, "AM18x/OMAP-L138 Hawkboard")
400399
.atag_offset = 0x100,
401400
.map_io = omapl138_hawk_map_io,
402-
.init_irq = cp_intc_init,
401+
.init_irq = da850_init_irq,
403402
.init_time = da850_init_time,
404403
.init_machine = omapl138_hawk_init,
405404
.init_late = davinci_init_late,

‎arch/arm/mach-davinci/board-sffsdr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ static __init void davinci_sffsdr_init(void)
152152
MACHINE_START(SFFSDR, "Lyrtech SFFSDR")
153153
.atag_offset = 0x100,
154154
.map_io = davinci_sffsdr_map_io,
155-
.init_irq = davinci_irq_init,
155+
.init_irq = dm644x_init_irq,
156156
.init_time = dm644x_init_time,
157157
.init_machine = davinci_sffsdr_init,
158158
.init_late = davinci_init_late,

‎arch/arm/mach-davinci/common.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
2323
struct davinci_soc_info davinci_soc_info;
2424
EXPORT_SYMBOL(davinci_soc_info);
2525

26-
void __iomem *davinci_intc_base;
27-
int davinci_intc_type;
28-
2926
static int __init davinci_init_id(struct davinci_soc_info *soc_info)
3027
{
3128
int i;

0 commit comments

Comments
 (0)