lkml.org 
[lkml]   [2012]   [Aug]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 13/22] ARM: ux500: Fork MSP platform registration for step-by-step DT enablement
    Date
    We've done this before and it worked well last time. Here we're
    duplicating a complex registration function to ease the process
    of enabling it for Device Tree. As there are quite a few steps
    taken during the registration process, it makes sense to break
    them up into more manageable chunks. This patch will aid us.

    Signed-off-by: Lee Jones <lee.jones@linaro.org>
    ---
    arch/arm/mach-ux500/board-mop500-msp.c | 20 ++++++++++++++++++++
    arch/arm/mach-ux500/board-mop500.c | 2 +-
    2 files changed, 21 insertions(+), 1 deletion(-)

    diff --git a/arch/arm/mach-ux500/board-mop500-msp.c b/arch/arm/mach-ux500/board-mop500-msp.c
    index 1a67577..24a3604 100644
    --- a/arch/arm/mach-ux500/board-mop500-msp.c
    +++ b/arch/arm/mach-ux500/board-mop500-msp.c
    @@ -172,6 +172,26 @@ static struct msp_i2s_platform_data msp3_platform_data = {
    .msp_i2s_dma_tx = NULL,
    };

    +/* Due for removal once the MSP driver has been fully DT:ed. */
    +void mop500_of_msp_init(struct device *parent)
    +{
    + pr_info("%s: Register platform-device 'snd-soc-u8500'.\n", __func__);
    + platform_device_register(&snd_soc_mop500);
    +
    + pr_info("Initialize MSP I2S-devices.\n");
    + db8500_add_msp_i2s(parent, 0, U8500_MSP0_BASE, IRQ_DB8500_MSP0,
    + &msp0_platform_data);
    + db8500_add_msp_i2s(parent, 1, U8500_MSP1_BASE, IRQ_DB8500_MSP1,
    + &msp1_platform_data);
    + db8500_add_msp_i2s(parent, 2, U8500_MSP2_BASE, IRQ_DB8500_MSP2,
    + &msp2_platform_data);
    + db8500_add_msp_i2s(parent, 3, U8500_MSP3_BASE, IRQ_DB8500_MSP1,
    + &msp3_platform_data);
    +
    + pr_info("%s: Register platform-device 'ux500-pcm'\n", __func__);
    + platform_device_register(&ux500_pcm);
    +}
    +
    void mop500_msp_init(struct device *parent)
    {
    pr_info("%s: Register platform-device 'snd-soc-mop500'.\n", __func__);
    diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
    index 11dd962..8f419b1 100644
    --- a/arch/arm/mach-ux500/board-mop500.c
    +++ b/arch/arm/mach-ux500/board-mop500.c
    @@ -807,7 +807,7 @@ static void __init u8500_init_machine(void)
    mop500_uib_init();

    } else if (of_machine_is_compatible("calaosystems,snowball-a9500")) {
    - mop500_msp_init(parent);
    + mop500_of_msp_init(parent);
    } else if (of_machine_is_compatible("st-ericsson,hrefv60+")) {
    /*
    * The HREFv60 board removed a GPIO expander and routed
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2012-08-09 18:42    [W:4.439 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site