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>

diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c
index 7ce0b5f..63511f6 100644 (file)
--- a/arch/arm/mach-davinci/da830.c
+++ b/arch/arm/mach-davinci/da830.c
@@ -624,101 +624,6 @@ const short da830_eqep1_pins[] __initconst = {
        -1
 };
 
-/* FIQ are pri 0-1; otherwise 2-7, with 7 lowest priority */
-static u8 da830_default_priorities[DA830_N_CP_INTC_IRQ] = {
-       [IRQ_DA8XX_COMMTX]              = 7,
-       [IRQ_DA8XX_COMMRX]              = 7,
-       [IRQ_DA8XX_NINT]                = 7,
-       [IRQ_DA8XX_EVTOUT0]             = 7,
-       [IRQ_DA8XX_EVTOUT1]             = 7,
-       [IRQ_DA8XX_EVTOUT2]             = 7,
-       [IRQ_DA8XX_EVTOUT3]             = 7,
-       [IRQ_DA8XX_EVTOUT4]             = 7,
-       [IRQ_DA8XX_EVTOUT5]             = 7,
-       [IRQ_DA8XX_EVTOUT6]             = 7,
-       [IRQ_DA8XX_EVTOUT7]             = 7,
-       [IRQ_DA8XX_CCINT0]              = 7,
-       [IRQ_DA8XX_CCERRINT]            = 7,
-       [IRQ_DA8XX_TCERRINT0]           = 7,
-       [IRQ_DA8XX_AEMIFINT]            = 7,
-       [IRQ_DA8XX_I2CINT0]             = 7,
-       [IRQ_DA8XX_MMCSDINT0]           = 7,
-       [IRQ_DA8XX_MMCSDINT1]           = 7,
-       [IRQ_DA8XX_ALLINT0]             = 7,
-       [IRQ_DA8XX_RTC]                 = 7,
-       [IRQ_DA8XX_SPINT0]              = 7,
-       [IRQ_DA8XX_TINT12_0]            = 7,
-       [IRQ_DA8XX_TINT34_0]            = 7,
-       [IRQ_DA8XX_TINT12_1]            = 7,
-       [IRQ_DA8XX_TINT34_1]            = 7,
-       [IRQ_DA8XX_UARTINT0]            = 7,
-       [IRQ_DA8XX_KEYMGRINT]           = 7,
-       [IRQ_DA830_MPUERR]              = 7,
-       [IRQ_DA8XX_CHIPINT0]            = 7,
-       [IRQ_DA8XX_CHIPINT1]            = 7,
-       [IRQ_DA8XX_CHIPINT2]            = 7,
-       [IRQ_DA8XX_CHIPINT3]            = 7,
-       [IRQ_DA8XX_TCERRINT1]           = 7,
-       [IRQ_DA8XX_C0_RX_THRESH_PULSE]  = 7,
-       [IRQ_DA8XX_C0_RX_PULSE]         = 7,
-       [IRQ_DA8XX_C0_TX_PULSE]         = 7,
-       [IRQ_DA8XX_C0_MISC_PULSE]       = 7,
-       [IRQ_DA8XX_C1_RX_THRESH_PULSE]  = 7,
-       [IRQ_DA8XX_C1_RX_PULSE]         = 7,
-       [IRQ_DA8XX_C1_TX_PULSE]         = 7,
-       [IRQ_DA8XX_C1_MISC_PULSE]       = 7,
-       [IRQ_DA8XX_MEMERR]              = 7,
-       [IRQ_DA8XX_GPIO0]               = 7,
-       [IRQ_DA8XX_GPIO1]               = 7,
-       [IRQ_DA8XX_GPIO2]               = 7,
-       [IRQ_DA8XX_GPIO3]               = 7,
-       [IRQ_DA8XX_GPIO4]               = 7,
-       [IRQ_DA8XX_GPIO5]               = 7,
-       [IRQ_DA8XX_GPIO6]               = 7,
-       [IRQ_DA8XX_GPIO7]               = 7,
-       [IRQ_DA8XX_GPIO8]               = 7,
-       [IRQ_DA8XX_I2CINT1]             = 7,
-       [IRQ_DA8XX_LCDINT]              = 7,
-       [IRQ_DA8XX_UARTINT1]            = 7,
-       [IRQ_DA8XX_MCASPINT]            = 7,
-       [IRQ_DA8XX_ALLINT1]             = 7,
-       [IRQ_DA8XX_SPINT1]              = 7,
-       [IRQ_DA8XX_UHPI_INT1]           = 7,
-       [IRQ_DA8XX_USB_INT]             = 7,
-       [IRQ_DA8XX_IRQN]                = 7,
-       [IRQ_DA8XX_RWAKEUP]             = 7,
-       [IRQ_DA8XX_UARTINT2]            = 7,
-       [IRQ_DA8XX_DFTSSINT]            = 7,
-       [IRQ_DA8XX_EHRPWM0]             = 7,
-       [IRQ_DA8XX_EHRPWM0TZ]           = 7,
-       [IRQ_DA8XX_EHRPWM1]             = 7,
-       [IRQ_DA8XX_EHRPWM1TZ]           = 7,
-       [IRQ_DA830_EHRPWM2]             = 7,
-       [IRQ_DA830_EHRPWM2TZ]           = 7,
-       [IRQ_DA8XX_ECAP0]               = 7,
-       [IRQ_DA8XX_ECAP1]               = 7,
-       [IRQ_DA8XX_ECAP2]               = 7,
-       [IRQ_DA830_EQEP0]               = 7,
-       [IRQ_DA830_EQEP1]               = 7,
-       [IRQ_DA830_T12CMPINT0_0]        = 7,
-       [IRQ_DA830_T12CMPINT1_0]        = 7,
-       [IRQ_DA830_T12CMPINT2_0]        = 7,
-       [IRQ_DA830_T12CMPINT3_0]        = 7,
-       [IRQ_DA830_T12CMPINT4_0]        = 7,
-       [IRQ_DA830_T12CMPINT5_0]        = 7,
-       [IRQ_DA830_T12CMPINT6_0]        = 7,
-       [IRQ_DA830_T12CMPINT7_0]        = 7,
-       [IRQ_DA830_T12CMPINT0_1]        = 7,
-       [IRQ_DA830_T12CMPINT1_1]        = 7,
-       [IRQ_DA830_T12CMPINT2_1]        = 7,
-       [IRQ_DA830_T12CMPINT3_1]        = 7,
-       [IRQ_DA830_T12CMPINT4_1]        = 7,
-       [IRQ_DA830_T12CMPINT5_1]        = 7,
-       [IRQ_DA830_T12CMPINT6_1]        = 7,
-       [IRQ_DA830_T12CMPINT7_1]        = 7,
-       [IRQ_DA8XX_ARMCLKSTOPREQ]       = 7,
-};
-
 static struct map_desc da830_io_desc[] = {
        {
                .virtual        = IO_VIRT,
@@ -807,9 +712,6 @@ static const struct davinci_soc_info davinci_soc_info_da830 = {
        .pinmux_base            = DA8XX_SYSCFG0_BASE + 0x120,
        .pinmux_pins            = da830_pins,
        .pinmux_pins_num        = ARRAY_SIZE(da830_pins),
-       .intc_base              = DA8XX_CP_INTC_BASE,
-       .intc_irq_prios         = da830_default_priorities,
-       .intc_irq_num           = DA830_N_CP_INTC_IRQ,
        .timer_info             = &da830_timer_info,
        .emac_pdata             = &da8xx_emac_pdata,
 };

diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index 62a00fa..8a50956 100644 (file)
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -299,111 +299,6 @@ const short da850_vpif_display_pins[] __initconst = {
        -1
 };
 
-/* FIQ are pri 0-1; otherwise 2-7, with 7 lowest priority */
-static u8 da850_default_priorities[DA850_N_CP_INTC_IRQ] = {
-       [IRQ_DA8XX_COMMTX]              = 7,
-       [IRQ_DA8XX_COMMRX]              = 7,
-       [IRQ_DA8XX_NINT]                = 7,
-       [IRQ_DA8XX_EVTOUT0]             = 7,
-       [IRQ_DA8XX_EVTOUT1]             = 7,
-       [IRQ_DA8XX_EVTOUT2]             = 7,
-       [IRQ_DA8XX_EVTOUT3]             = 7,
-       [IRQ_DA8XX_EVTOUT4]             = 7,
-       [IRQ_DA8XX_EVTOUT5]             = 7,
-       [IRQ_DA8XX_EVTOUT6]             = 7,
-       [IRQ_DA8XX_EVTOUT7]             = 7,
-       [IRQ_DA8XX_CCINT0]              = 7,
-       [IRQ_DA8XX_CCERRINT]            = 7,
-       [IRQ_DA8XX_TCERRINT0]           = 7,
-       [IRQ_DA8XX_AEMIFINT]            = 7,
-       [IRQ_DA8XX_I2CINT0]             = 7,
-       [IRQ_DA8XX_MMCSDINT0]           = 7,
-       [IRQ_DA8XX_MMCSDINT1]           = 7,
-       [IRQ_DA8XX_ALLINT0]             = 7,
-       [IRQ_DA8XX_RTC]                 = 7,
-       [IRQ_DA8XX_SPINT0]              = 7,
-       [IRQ_DA8XX_TINT12_0]            = 7,
-       [IRQ_DA8XX_TINT34_0]            = 7,
-       [IRQ_DA8XX_TINT12_1]            = 7,
-       [IRQ_DA8XX_TINT34_1]            = 7,
-       [IRQ_DA8XX_UARTINT0]            = 7,
-       [IRQ_DA8XX_KEYMGRINT]           = 7,
-       [IRQ_DA850_MPUADDRERR0]         = 7,
-       [IRQ_DA8XX_CHIPINT0]            = 7,
-       [IRQ_DA8XX_CHIPINT1]            = 7,
-       [IRQ_DA8XX_CHIPINT2]            = 7,
-       [IRQ_DA8XX_CHIPINT3]            = 7,
-       [IRQ_DA8XX_TCERRINT1]           = 7,
-       [IRQ_DA8XX_C0_RX_THRESH_PULSE]  = 7,
-       [IRQ_DA8XX_C0_RX_PULSE]         = 7,
-       [IRQ_DA8XX_C0_TX_PULSE]         = 7,
-       [IRQ_DA8XX_C0_MISC_PULSE]       = 7,
-       [IRQ_DA8XX_C1_RX_THRESH_PULSE]  = 7,
-       [IRQ_DA8XX_C1_RX_PULSE]         = 7,
-       [IRQ_DA8XX_C1_TX_PULSE]         = 7,
-       [IRQ_DA8XX_C1_MISC_PULSE]       = 7,
-       [IRQ_DA8XX_MEMERR]              = 7,
-       [IRQ_DA8XX_GPIO0]               = 7,
-       [IRQ_DA8XX_GPIO1]               = 7,
-       [IRQ_DA8XX_GPIO2]               = 7,
-       [IRQ_DA8XX_GPIO3]               = 7,
-       [IRQ_DA8XX_GPIO4]               = 7,
-       [IRQ_DA8XX_GPIO5]               = 7,
-       [IRQ_DA8XX_GPIO6]               = 7,
-       [IRQ_DA8XX_GPIO7]               = 7,
-       [IRQ_DA8XX_GPIO8]               = 7,
-       [IRQ_DA8XX_I2CINT1]             = 7,
-       [IRQ_DA8XX_LCDINT]              = 7,
-       [IRQ_DA8XX_UARTINT1]            = 7,
-       [IRQ_DA8XX_MCASPINT]            = 7,
-       [IRQ_DA8XX_ALLINT1]             = 7,
-       [IRQ_DA8XX_SPINT1]              = 7,
-       [IRQ_DA8XX_UHPI_INT1]           = 7,
-       [IRQ_DA8XX_USB_INT]             = 7,
-       [IRQ_DA8XX_IRQN]                = 7,
-       [IRQ_DA8XX_RWAKEUP]             = 7,
-       [IRQ_DA8XX_UARTINT2]            = 7,
-       [IRQ_DA8XX_DFTSSINT]            = 7,
-       [IRQ_DA8XX_EHRPWM0]             = 7,
-       [IRQ_DA8XX_EHRPWM0TZ]           = 7,
-       [IRQ_DA8XX_EHRPWM1]             = 7,
-       [IRQ_DA8XX_EHRPWM1TZ]           = 7,
-       [IRQ_DA850_SATAINT]             = 7,
-       [IRQ_DA850_TINTALL_2]           = 7,
-       [IRQ_DA8XX_ECAP0]               = 7,
-       [IRQ_DA8XX_ECAP1]               = 7,
-       [IRQ_DA8XX_ECAP2]               = 7,
-       [IRQ_DA850_MMCSDINT0_1]         = 7,
-       [IRQ_DA850_MMCSDINT1_1]         = 7,
-       [IRQ_DA850_T12CMPINT0_2]        = 7,
-       [IRQ_DA850_T12CMPINT1_2]        = 7,
-       [IRQ_DA850_T12CMPINT2_2]        = 7,
-       [IRQ_DA850_T12CMPINT3_2]        = 7,
-       [IRQ_DA850_T12CMPINT4_2]        = 7,
-       [IRQ_DA850_T12CMPINT5_2]        = 7,
-       [IRQ_DA850_T12CMPINT6_2]        = 7,
-       [IRQ_DA850_T12CMPINT7_2]        = 7,
-       [IRQ_DA850_T12CMPINT0_3]        = 7,
-       [IRQ_DA850_T12CMPINT1_3]        = 7,
-       [IRQ_DA850_T12CMPINT2_3]        = 7,
-       [IRQ_DA850_T12CMPINT3_3]        = 7,
-       [IRQ_DA850_T12CMPINT4_3]        = 7,
-       [IRQ_DA850_T12CMPINT5_3]        = 7,
-       [IRQ_DA850_T12CMPINT6_3]        = 7,
-       [IRQ_DA850_T12CMPINT7_3]        = 7,
-       [IRQ_DA850_RPIINT]              = 7,
-       [IRQ_DA850_VPIFINT]             = 7,
-       [IRQ_DA850_CCINT1]              = 7,
-       [IRQ_DA850_CCERRINT1]           = 7,
-       [IRQ_DA850_TCERRINT2]           = 7,
-       [IRQ_DA850_TINTALL_3]           = 7,
-       [IRQ_DA850_MCBSP0RINT]          = 7,
-       [IRQ_DA850_MCBSP0XINT]          = 7,
-       [IRQ_DA850_MCBSP1RINT]          = 7,
-       [IRQ_DA850_MCBSP1XINT]          = 7,
-       [IRQ_DA8XX_ARMCLKSTOPREQ]       = 7,
-};
-
 static struct map_desc da850_io_desc[] = {
        {
                .virtual        = IO_VIRT,
@@ -739,9 +634,6 @@ static const struct davinci_soc_info davinci_soc_info_da850 = {
        .pinmux_base            = DA8XX_SYSCFG0_BASE + 0x120,
        .pinmux_pins            = da850_pins,
        .pinmux_pins_num        = ARRAY_SIZE(da850_pins),
-       .intc_base              = DA8XX_CP_INTC_BASE,
-       .intc_irq_prios         = da850_default_priorities,
-       .intc_irq_num           = DA850_N_CP_INTC_IRQ,
        .timer_info             = &da850_timer_info,
        .emac_pdata             = &da8xx_emac_pdata,
        .sram_dma               = DA8XX_SHARED_RAM_BASE,

diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index c7cd765..4a48244 100644 (file)
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -705,9 +705,6 @@ static const struct davinci_soc_info davinci_soc_info_dm355 = {
        .pinmux_base            = DAVINCI_SYSTEM_MODULE_BASE,
        .pinmux_pins            = dm355_pins,
        .pinmux_pins_num        = ARRAY_SIZE(dm355_pins),
-       .intc_base              = DAVINCI_ARM_INTC_BASE,
-       .intc_irq_prios         = dm355_default_priorities,
-       .intc_irq_num           = DAVINCI_N_AINTC_IRQ,
        .timer_info             = &dm355_timer_info,
        .sram_dma               = 0x00010000,
        .sram_len               = SZ_32K,

diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index bde3c3b..8e0a773 100644 (file)
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -722,9 +722,6 @@ static const struct davinci_soc_info davinci_soc_info_dm365 = {
        .pinmux_base            = DAVINCI_SYSTEM_MODULE_BASE,
        .pinmux_pins            = dm365_pins,
        .pinmux_pins_num        = ARRAY_SIZE(dm365_pins),
-       .intc_base              = DAVINCI_ARM_INTC_BASE,
-       .intc_irq_prios         = dm365_default_priorities,
-       .intc_irq_num           = DAVINCI_N_AINTC_IRQ,
        .timer_info             = &dm365_timer_info,
        .emac_pdata             = &dm365_emac_pdata,
        .sram_dma               = 0x00010000,

diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index 6d34980..cecc7ce 100644 (file)
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -646,9 +646,6 @@ static const struct davinci_soc_info davinci_soc_info_dm644x = {
        .pinmux_base            = DAVINCI_SYSTEM_MODULE_BASE,
        .pinmux_pins            = dm644x_pins,
        .pinmux_pins_num        = ARRAY_SIZE(dm644x_pins),
-       .intc_base              = DAVINCI_ARM_INTC_BASE,
-       .intc_irq_prios         = dm644x_default_priorities,
-       .intc_irq_num           = DAVINCI_N_AINTC_IRQ,
        .timer_info             = &dm644x_timer_info,
        .emac_pdata             = &dm644x_emac_pdata,
        .sram_dma               = 0x00008000,

diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
index a0a8b33..f33392f 100644 (file)
--- a/arch/arm/mach-davinci/dm646x.c
+++ b/arch/arm/mach-davinci/dm646x.c
@@ -586,9 +586,6 @@ static const struct davinci_soc_info davinci_soc_info_dm646x = {
        .pinmux_base            = DAVINCI_SYSTEM_MODULE_BASE,
        .pinmux_pins            = dm646x_pins,
        .pinmux_pins_num        = ARRAY_SIZE(dm646x_pins),
-       .intc_base              = DAVINCI_ARM_INTC_BASE,
-       .intc_irq_prios         = dm646x_default_priorities,
-       .intc_irq_num           = DAVINCI_N_AINTC_IRQ,
        .timer_info             = &dm646x_timer_info,
        .emac_pdata             = &dm646x_emac_pdata,
        .sram_dma               = 0x10010000,

diff --git a/arch/arm/mach-davinci/include/mach/common.h b/arch/arm/mach-davinci/include/mach/common.h
index 14e0e1c..9526e5d 100644 (file)
--- a/arch/arm/mach-davinci/include/mach/common.h
+++ b/arch/arm/mach-davinci/include/mach/common.h
@@ -58,9 +58,6 @@ struct davinci_soc_info {
        u32                             pinmux_base;
        const struct mux_config         *pinmux_pins;
        unsigned long                   pinmux_pins_num;
-       u32                             intc_base;
-       u8                              *intc_irq_prios;
-       unsigned long                   intc_irq_num;
        struct davinci_timer_info       *timer_info;
        int                             gpio_type;
        u32                             gpio_base;