lkml.org 
[lkml]   [2019]   [Feb]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RESEND PATCH v2 21/33] ARM: davinci: cp-intc: add a wrapper around cp_intc_init()
    Date
    From: Bartosz Golaszewski <bgolaszewski@baylibre.com>

    We're going to extend the cp_intc_init() function with a config
    structure so we can drop the intc-related fields from davinci_soc_info.

    Once we do it, we won't be able to use this routine directly as the
    init_irq callback. Wrap the calls in additional helpers that don't
    take parameters and can be assigned to init_irq.

    Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
    Reviewed-by: David Lechner <david@lechnology.com>
    ---
    arch/arm/mach-davinci/board-da830-evm.c | 2 +-
    arch/arm/mach-davinci/board-da850-evm.c | 2 +-
    arch/arm/mach-davinci/board-mityomapl138.c | 2 +-
    arch/arm/mach-davinci/board-omapl138-hawk.c | 2 +-
    arch/arm/mach-davinci/da830.c | 5 +++++
    arch/arm/mach-davinci/da850.c | 5 +++++
    arch/arm/mach-davinci/include/mach/da8xx.h | 2 ++
    7 files changed, 16 insertions(+), 4 deletions(-)

    diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c
    index f81c92b9cf07..1ae7dcb8f59d 100644
    --- a/arch/arm/mach-davinci/board-da830-evm.c
    +++ b/arch/arm/mach-davinci/board-da830-evm.c
    @@ -694,7 +694,7 @@ static void __init da830_evm_map_io(void)
    MACHINE_START(DAVINCI_DA830_EVM, "DaVinci DA830/OMAP-L137/AM17x EVM")
    .atag_offset = 0x100,
    .map_io = da830_evm_map_io,
    - .init_irq = cp_intc_init,
    + .init_irq = da830_init_irq,
    .init_time = da830_init_time,
    .init_machine = da830_evm_init,
    .init_late = davinci_init_late,
    diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
    index 1cc49e7bf128..8022ca8ac4ef 100644
    --- a/arch/arm/mach-davinci/board-da850-evm.c
    +++ b/arch/arm/mach-davinci/board-da850-evm.c
    @@ -1522,7 +1522,7 @@ static void __init da850_evm_map_io(void)
    MACHINE_START(DAVINCI_DA850_EVM, "DaVinci DA850/OMAP-L138/AM18x EVM")
    .atag_offset = 0x100,
    .map_io = da850_evm_map_io,
    - .init_irq = cp_intc_init,
    + .init_irq = da850_init_irq,
    .init_time = da850_init_time,
    .init_machine = da850_evm_init,
    .init_late = davinci_init_late,
    diff --git a/arch/arm/mach-davinci/board-mityomapl138.c b/arch/arm/mach-davinci/board-mityomapl138.c
    index eb6a9465f229..815f155eb349 100644
    --- a/arch/arm/mach-davinci/board-mityomapl138.c
    +++ b/arch/arm/mach-davinci/board-mityomapl138.c
    @@ -623,7 +623,7 @@ static void __init mityomapl138_map_io(void)
    MACHINE_START(MITYOMAPL138, "MityDSP-L138/MityARM-1808")
    .atag_offset = 0x100,
    .map_io = mityomapl138_map_io,
    - .init_irq = cp_intc_init,
    + .init_irq = da850_init_irq,
    .init_time = da850_init_time,
    .init_machine = mityomapl138_init,
    .init_late = davinci_init_late,
    diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c
    index 7f852722ff08..673d890c2e3e 100644
    --- a/arch/arm/mach-davinci/board-omapl138-hawk.c
    +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c
    @@ -461,7 +461,7 @@ static void __init omapl138_hawk_map_io(void)
    MACHINE_START(OMAPL138_HAWKBOARD, "AM18x/OMAP-L138 Hawkboard")
    .atag_offset = 0x100,
    .map_io = omapl138_hawk_map_io,
    - .init_irq = cp_intc_init,
    + .init_irq = da850_init_irq,
    .init_time = da850_init_time,
    .init_machine = omapl138_hawk_init,
    .init_late = davinci_init_late,
    diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c
    index ca903c9105e4..5cfd30c57429 100644
    --- a/arch/arm/mach-davinci/da830.c
    +++ b/arch/arm/mach-davinci/da830.c
    @@ -821,6 +821,11 @@ void __init da830_init(void)
    WARN(!da8xx_syscfg0_base, "Unable to map syscfg0 module");
    }

    +void __init da830_init_irq(void)
    +{
    + cp_intc_init();
    +}
    +
    void __init da830_init_time(void)
    {
    void __iomem *pll;
    diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
    index 486d53481636..6df6994c0f26 100644
    --- a/arch/arm/mach-davinci/da850.c
    +++ b/arch/arm/mach-davinci/da850.c
    @@ -759,6 +759,11 @@ void __init da850_init(void)
    WARN(!da8xx_syscfg1_base, "Unable to map syscfg1 module");
    }

    +void __init da850_init_irq(void)
    +{
    + cp_intc_init();
    +}
    +
    void __init da850_init_time(void)
    {
    void __iomem *pll0;
    diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h
    index ab4a57f433f4..1618b30661a9 100644
    --- a/arch/arm/mach-davinci/include/mach/da8xx.h
    +++ b/arch/arm/mach-davinci/include/mach/da8xx.h
    @@ -88,10 +88,12 @@ extern unsigned int da850_max_speed;
    #define DA8XX_ARM_RAM_BASE 0xffff0000

    void da830_init(void);
    +void da830_init_irq(void);
    void da830_init_time(void);
    void da830_register_clocks(void);

    void da850_init(void);
    +void da850_init_irq(void);
    void da850_init_time(void);
    void da850_register_clocks(void);

    --
    2.20.1
    \
     
     \ /
      Last update: 2019-02-11 13:28    [W:4.114 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site