Skip to content

Commit 49b654f

Browse files
brglnsekhar
brgl
authored and
nsekhar
committed
ARM: davinci: remove intc related fields from davinci_soc_info
The fields related to the two davinci interrupt controllers are no longer used. Remove them. Reviewed-by: David Lechner <david@lechnology.com> Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> Signed-off-by: Sekhar Nori <nsekhar@ti.com>
1 parent 0fc3d74 commit 49b654f

File tree

7 files changed

+0
-221
lines changed

7 files changed

+0
-221
lines changed

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

Lines changed: 0 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -624,101 +624,6 @@ const short da830_eqep1_pins[] __initconst = {
624624
-1
625625
};
626626

627-
/* FIQ are pri 0-1; otherwise 2-7, with 7 lowest priority */
628-
static u8 da830_default_priorities[DA830_N_CP_INTC_IRQ] = {
629-
[IRQ_DA8XX_COMMTX] = 7,
630-
[IRQ_DA8XX_COMMRX] = 7,
631-
[IRQ_DA8XX_NINT] = 7,
632-
[IRQ_DA8XX_EVTOUT0] = 7,
633-
[IRQ_DA8XX_EVTOUT1] = 7,
634-
[IRQ_DA8XX_EVTOUT2] = 7,
635-
[IRQ_DA8XX_EVTOUT3] = 7,
636-
[IRQ_DA8XX_EVTOUT4] = 7,
637-
[IRQ_DA8XX_EVTOUT5] = 7,
638-
[IRQ_DA8XX_EVTOUT6] = 7,
639-
[IRQ_DA8XX_EVTOUT7] = 7,
640-
[IRQ_DA8XX_CCINT0] = 7,
641-
[IRQ_DA8XX_CCERRINT] = 7,
642-
[IRQ_DA8XX_TCERRINT0] = 7,
643-
[IRQ_DA8XX_AEMIFINT] = 7,
644-
[IRQ_DA8XX_I2CINT0] = 7,
645-
[IRQ_DA8XX_MMCSDINT0] = 7,
646-
[IRQ_DA8XX_MMCSDINT1] = 7,
647-
[IRQ_DA8XX_ALLINT0] = 7,
648-
[IRQ_DA8XX_RTC] = 7,
649-
[IRQ_DA8XX_SPINT0] = 7,
650-
[IRQ_DA8XX_TINT12_0] = 7,
651-
[IRQ_DA8XX_TINT34_0] = 7,
652-
[IRQ_DA8XX_TINT12_1] = 7,
653-
[IRQ_DA8XX_TINT34_1] = 7,
654-
[IRQ_DA8XX_UARTINT0] = 7,
655-
[IRQ_DA8XX_KEYMGRINT] = 7,
656-
[IRQ_DA830_MPUERR] = 7,
657-
[IRQ_DA8XX_CHIPINT0] = 7,
658-
[IRQ_DA8XX_CHIPINT1] = 7,
659-
[IRQ_DA8XX_CHIPINT2] = 7,
660-
[IRQ_DA8XX_CHIPINT3] = 7,
661-
[IRQ_DA8XX_TCERRINT1] = 7,
662-
[IRQ_DA8XX_C0_RX_THRESH_PULSE] = 7,
663-
[IRQ_DA8XX_C0_RX_PULSE] = 7,
664-
[IRQ_DA8XX_C0_TX_PULSE] = 7,
665-
[IRQ_DA8XX_C0_MISC_PULSE] = 7,
666-
[IRQ_DA8XX_C1_RX_THRESH_PULSE] = 7,
667-
[IRQ_DA8XX_C1_RX_PULSE] = 7,
668-
[IRQ_DA8XX_C1_TX_PULSE] = 7,
669-
[IRQ_DA8XX_C1_MISC_PULSE] = 7,
670-
[IRQ_DA8XX_MEMERR] = 7,
671-
[IRQ_DA8XX_GPIO0] = 7,
672-
[IRQ_DA8XX_GPIO1] = 7,
673-
[IRQ_DA8XX_GPIO2] = 7,
674-
[IRQ_DA8XX_GPIO3] = 7,
675-
[IRQ_DA8XX_GPIO4] = 7,
676-
[IRQ_DA8XX_GPIO5] = 7,
677-
[IRQ_DA8XX_GPIO6] = 7,
678-
[IRQ_DA8XX_GPIO7] = 7,
679-
[IRQ_DA8XX_GPIO8] = 7,
680-
[IRQ_DA8XX_I2CINT1] = 7,
681-
[IRQ_DA8XX_LCDINT] = 7,
682-
[IRQ_DA8XX_UARTINT1] = 7,
683-
[IRQ_DA8XX_MCASPINT] = 7,
684-
[IRQ_DA8XX_ALLINT1] = 7,
685-
[IRQ_DA8XX_SPINT1] = 7,
686-
[IRQ_DA8XX_UHPI_INT1] = 7,
687-
[IRQ_DA8XX_USB_INT] = 7,
688-
[IRQ_DA8XX_IRQN] = 7,
689-
[IRQ_DA8XX_RWAKEUP] = 7,
690-
[IRQ_DA8XX_UARTINT2] = 7,
691-
[IRQ_DA8XX_DFTSSINT] = 7,
692-
[IRQ_DA8XX_EHRPWM0] = 7,
693-
[IRQ_DA8XX_EHRPWM0TZ] = 7,
694-
[IRQ_DA8XX_EHRPWM1] = 7,
695-
[IRQ_DA8XX_EHRPWM1TZ] = 7,
696-
[IRQ_DA830_EHRPWM2] = 7,
697-
[IRQ_DA830_EHRPWM2TZ] = 7,
698-
[IRQ_DA8XX_ECAP0] = 7,
699-
[IRQ_DA8XX_ECAP1] = 7,
700-
[IRQ_DA8XX_ECAP2] = 7,
701-
[IRQ_DA830_EQEP0] = 7,
702-
[IRQ_DA830_EQEP1] = 7,
703-
[IRQ_DA830_T12CMPINT0_0] = 7,
704-
[IRQ_DA830_T12CMPINT1_0] = 7,
705-
[IRQ_DA830_T12CMPINT2_0] = 7,
706-
[IRQ_DA830_T12CMPINT3_0] = 7,
707-
[IRQ_DA830_T12CMPINT4_0] = 7,
708-
[IRQ_DA830_T12CMPINT5_0] = 7,
709-
[IRQ_DA830_T12CMPINT6_0] = 7,
710-
[IRQ_DA830_T12CMPINT7_0] = 7,
711-
[IRQ_DA830_T12CMPINT0_1] = 7,
712-
[IRQ_DA830_T12CMPINT1_1] = 7,
713-
[IRQ_DA830_T12CMPINT2_1] = 7,
714-
[IRQ_DA830_T12CMPINT3_1] = 7,
715-
[IRQ_DA830_T12CMPINT4_1] = 7,
716-
[IRQ_DA830_T12CMPINT5_1] = 7,
717-
[IRQ_DA830_T12CMPINT6_1] = 7,
718-
[IRQ_DA830_T12CMPINT7_1] = 7,
719-
[IRQ_DA8XX_ARMCLKSTOPREQ] = 7,
720-
};
721-
722627
static struct map_desc da830_io_desc[] = {
723628
{
724629
.virtual = IO_VIRT,
@@ -807,9 +712,6 @@ static const struct davinci_soc_info davinci_soc_info_da830 = {
807712
.pinmux_base = DA8XX_SYSCFG0_BASE + 0x120,
808713
.pinmux_pins = da830_pins,
809714
.pinmux_pins_num = ARRAY_SIZE(da830_pins),
810-
.intc_base = DA8XX_CP_INTC_BASE,
811-
.intc_irq_prios = da830_default_priorities,
812-
.intc_irq_num = DA830_N_CP_INTC_IRQ,
813715
.timer_info = &da830_timer_info,
814716
.emac_pdata = &da8xx_emac_pdata,
815717
};

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

Lines changed: 0 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -299,111 +299,6 @@ const short da850_vpif_display_pins[] __initconst = {
299299
-1
300300
};
301301

302-
/* FIQ are pri 0-1; otherwise 2-7, with 7 lowest priority */
303-
static u8 da850_default_priorities[DA850_N_CP_INTC_IRQ] = {
304-
[IRQ_DA8XX_COMMTX] = 7,
305-
[IRQ_DA8XX_COMMRX] = 7,
306-
[IRQ_DA8XX_NINT] = 7,
307-
[IRQ_DA8XX_EVTOUT0] = 7,
308-
[IRQ_DA8XX_EVTOUT1] = 7,
309-
[IRQ_DA8XX_EVTOUT2] = 7,
310-
[IRQ_DA8XX_EVTOUT3] = 7,
311-
[IRQ_DA8XX_EVTOUT4] = 7,
312-
[IRQ_DA8XX_EVTOUT5] = 7,
313-
[IRQ_DA8XX_EVTOUT6] = 7,
314-
[IRQ_DA8XX_EVTOUT7] = 7,
315-
[IRQ_DA8XX_CCINT0] = 7,
316-
[IRQ_DA8XX_CCERRINT] = 7,
317-
[IRQ_DA8XX_TCERRINT0] = 7,
318-
[IRQ_DA8XX_AEMIFINT] = 7,
319-
[IRQ_DA8XX_I2CINT0] = 7,
320-
[IRQ_DA8XX_MMCSDINT0] = 7,
321-
[IRQ_DA8XX_MMCSDINT1] = 7,
322-
[IRQ_DA8XX_ALLINT0] = 7,
323-
[IRQ_DA8XX_RTC] = 7,
324-
[IRQ_DA8XX_SPINT0] = 7,
325-
[IRQ_DA8XX_TINT12_0] = 7,
326-
[IRQ_DA8XX_TINT34_0] = 7,
327-
[IRQ_DA8XX_TINT12_1] = 7,
328-
[IRQ_DA8XX_TINT34_1] = 7,
329-
[IRQ_DA8XX_UARTINT0] = 7,
330-
[IRQ_DA8XX_KEYMGRINT] = 7,
331-
[IRQ_DA850_MPUADDRERR0] = 7,
332-
[IRQ_DA8XX_CHIPINT0] = 7,
333-
[IRQ_DA8XX_CHIPINT1] = 7,
334-
[IRQ_DA8XX_CHIPINT2] = 7,
335-
[IRQ_DA8XX_CHIPINT3] = 7,
336-
[IRQ_DA8XX_TCERRINT1] = 7,
337-
[IRQ_DA8XX_C0_RX_THRESH_PULSE] = 7,
338-
[IRQ_DA8XX_C0_RX_PULSE] = 7,
339-
[IRQ_DA8XX_C0_TX_PULSE] = 7,
340-
[IRQ_DA8XX_C0_MISC_PULSE] = 7,
341-
[IRQ_DA8XX_C1_RX_THRESH_PULSE] = 7,
342-
[IRQ_DA8XX_C1_RX_PULSE] = 7,
343-
[IRQ_DA8XX_C1_TX_PULSE] = 7,
344-
[IRQ_DA8XX_C1_MISC_PULSE] = 7,
345-
[IRQ_DA8XX_MEMERR] = 7,
346-
[IRQ_DA8XX_GPIO0] = 7,
347-
[IRQ_DA8XX_GPIO1] = 7,
348-
[IRQ_DA8XX_GPIO2] = 7,
349-
[IRQ_DA8XX_GPIO3] = 7,
350-
[IRQ_DA8XX_GPIO4] = 7,
351-
[IRQ_DA8XX_GPIO5] = 7,
352-
[IRQ_DA8XX_GPIO6] = 7,
353-
[IRQ_DA8XX_GPIO7] = 7,
354-
[IRQ_DA8XX_GPIO8] = 7,
355-
[IRQ_DA8XX_I2CINT1] = 7,
356-
[IRQ_DA8XX_LCDINT] = 7,
357-
[IRQ_DA8XX_UARTINT1] = 7,
358-
[IRQ_DA8XX_MCASPINT] = 7,
359-
[IRQ_DA8XX_ALLINT1] = 7,
360-
[IRQ_DA8XX_SPINT1] = 7,
361-
[IRQ_DA8XX_UHPI_INT1] = 7,
362-
[IRQ_DA8XX_USB_INT] = 7,
363-
[IRQ_DA8XX_IRQN] = 7,
364-
[IRQ_DA8XX_RWAKEUP] = 7,
365-
[IRQ_DA8XX_UARTINT2] = 7,
366-
[IRQ_DA8XX_DFTSSINT] = 7,
367-
[IRQ_DA8XX_EHRPWM0] = 7,
368-
[IRQ_DA8XX_EHRPWM0TZ] = 7,
369-
[IRQ_DA8XX_EHRPWM1] = 7,
370-
[IRQ_DA8XX_EHRPWM1TZ] = 7,
371-
[IRQ_DA850_SATAINT] = 7,
372-
[IRQ_DA850_TINTALL_2] = 7,
373-
[IRQ_DA8XX_ECAP0] = 7,
374-
[IRQ_DA8XX_ECAP1] = 7,
375-
[IRQ_DA8XX_ECAP2] = 7,
376-
[IRQ_DA850_MMCSDINT0_1] = 7,
377-
[IRQ_DA850_MMCSDINT1_1] = 7,
378-
[IRQ_DA850_T12CMPINT0_2] = 7,
379-
[IRQ_DA850_T12CMPINT1_2] = 7,
380-
[IRQ_DA850_T12CMPINT2_2] = 7,
381-
[IRQ_DA850_T12CMPINT3_2] = 7,
382-
[IRQ_DA850_T12CMPINT4_2] = 7,
383-
[IRQ_DA850_T12CMPINT5_2] = 7,
384-
[IRQ_DA850_T12CMPINT6_2] = 7,
385-
[IRQ_DA850_T12CMPINT7_2] = 7,
386-
[IRQ_DA850_T12CMPINT0_3] = 7,
387-
[IRQ_DA850_T12CMPINT1_3] = 7,
388-
[IRQ_DA850_T12CMPINT2_3] = 7,
389-
[IRQ_DA850_T12CMPINT3_3] = 7,
390-
[IRQ_DA850_T12CMPINT4_3] = 7,
391-
[IRQ_DA850_T12CMPINT5_3] = 7,
392-
[IRQ_DA850_T12CMPINT6_3] = 7,
393-
[IRQ_DA850_T12CMPINT7_3] = 7,
394-
[IRQ_DA850_RPIINT] = 7,
395-
[IRQ_DA850_VPIFINT] = 7,
396-
[IRQ_DA850_CCINT1] = 7,
397-
[IRQ_DA850_CCERRINT1] = 7,
398-
[IRQ_DA850_TCERRINT2] = 7,
399-
[IRQ_DA850_TINTALL_3] = 7,
400-
[IRQ_DA850_MCBSP0RINT] = 7,
401-
[IRQ_DA850_MCBSP0XINT] = 7,
402-
[IRQ_DA850_MCBSP1RINT] = 7,
403-
[IRQ_DA850_MCBSP1XINT] = 7,
404-
[IRQ_DA8XX_ARMCLKSTOPREQ] = 7,
405-
};
406-
407302
static struct map_desc da850_io_desc[] = {
408303
{
409304
.virtual = IO_VIRT,
@@ -739,9 +634,6 @@ static const struct davinci_soc_info davinci_soc_info_da850 = {
739634
.pinmux_base = DA8XX_SYSCFG0_BASE + 0x120,
740635
.pinmux_pins = da850_pins,
741636
.pinmux_pins_num = ARRAY_SIZE(da850_pins),
742-
.intc_base = DA8XX_CP_INTC_BASE,
743-
.intc_irq_prios = da850_default_priorities,
744-
.intc_irq_num = DA850_N_CP_INTC_IRQ,
745637
.timer_info = &da850_timer_info,
746638
.emac_pdata = &da8xx_emac_pdata,
747639
.sram_dma = DA8XX_SHARED_RAM_BASE,

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -705,9 +705,6 @@ static const struct davinci_soc_info davinci_soc_info_dm355 = {
705705
.pinmux_base = DAVINCI_SYSTEM_MODULE_BASE,
706706
.pinmux_pins = dm355_pins,
707707
.pinmux_pins_num = ARRAY_SIZE(dm355_pins),
708-
.intc_base = DAVINCI_ARM_INTC_BASE,
709-
.intc_irq_prios = dm355_default_priorities,
710-
.intc_irq_num = DAVINCI_N_AINTC_IRQ,
711708
.timer_info = &dm355_timer_info,
712709
.sram_dma = 0x00010000,
713710
.sram_len = SZ_32K,

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -722,9 +722,6 @@ static const struct davinci_soc_info davinci_soc_info_dm365 = {
722722
.pinmux_base = DAVINCI_SYSTEM_MODULE_BASE,
723723
.pinmux_pins = dm365_pins,
724724
.pinmux_pins_num = ARRAY_SIZE(dm365_pins),
725-
.intc_base = DAVINCI_ARM_INTC_BASE,
726-
.intc_irq_prios = dm365_default_priorities,
727-
.intc_irq_num = DAVINCI_N_AINTC_IRQ,
728725
.timer_info = &dm365_timer_info,
729726
.emac_pdata = &dm365_emac_pdata,
730727
.sram_dma = 0x00010000,

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -646,9 +646,6 @@ static const struct davinci_soc_info davinci_soc_info_dm644x = {
646646
.pinmux_base = DAVINCI_SYSTEM_MODULE_BASE,
647647
.pinmux_pins = dm644x_pins,
648648
.pinmux_pins_num = ARRAY_SIZE(dm644x_pins),
649-
.intc_base = DAVINCI_ARM_INTC_BASE,
650-
.intc_irq_prios = dm644x_default_priorities,
651-
.intc_irq_num = DAVINCI_N_AINTC_IRQ,
652649
.timer_info = &dm644x_timer_info,
653650
.emac_pdata = &dm644x_emac_pdata,
654651
.sram_dma = 0x00008000,

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -586,9 +586,6 @@ static const struct davinci_soc_info davinci_soc_info_dm646x = {
586586
.pinmux_base = DAVINCI_SYSTEM_MODULE_BASE,
587587
.pinmux_pins = dm646x_pins,
588588
.pinmux_pins_num = ARRAY_SIZE(dm646x_pins),
589-
.intc_base = DAVINCI_ARM_INTC_BASE,
590-
.intc_irq_prios = dm646x_default_priorities,
591-
.intc_irq_num = DAVINCI_N_AINTC_IRQ,
592589
.timer_info = &dm646x_timer_info,
593590
.emac_pdata = &dm646x_emac_pdata,
594591
.sram_dma = 0x10010000,

‎arch/arm/mach-davinci/include/mach/common.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,6 @@ struct davinci_soc_info {
5858
u32 pinmux_base;
5959
const struct mux_config *pinmux_pins;
6060
unsigned long pinmux_pins_num;
61-
u32 intc_base;
62-
u8 *intc_irq_prios;
63-
unsigned long intc_irq_num;
6461
struct davinci_timer_info *timer_info;
6562
int gpio_type;
6663
u32 gpio_base;

0 commit comments

Comments
 (0)