lkml.org 
[lkml]   [2014]   [Jul]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH RESEND 04/18] AT91: Rework ramc mapping code
    Date
    Adapt the ramc mapping code to handle multiple ram controllers in the DT.

    Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
    ---
    arch/arm/mach-at91/setup.c | 26 ++++++++++++++------------
    1 file changed, 14 insertions(+), 12 deletions(-)

    diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
    index 9c4c7fb323fb..cc520596f23b 100644
    --- a/arch/arm/mach-at91/setup.c
    +++ b/arch/arm/mach-at91/setup.c
    @@ -393,24 +393,26 @@ static void at91_dt_ramc(void)
    {
    struct device_node *np;
    const struct of_device_id *of_id;
    + int idx = 0;

    - np = of_find_matching_node(NULL, ramc_ids);
    - if (!np)
    - panic(pr_fmt("unable to find compatible ram controller node in dtb\n"));
    + for_each_matching_node(np, ramc_ids) {
    + at91_ramc_base[idx] = of_iomap(np, 0);
    + if (!at91_ramc_base[idx])
    + panic(pr_fmt("unable to map ramc[%d] cpu registers\n"), idx);

    - at91_ramc_base[0] = of_iomap(np, 0);
    - if (!at91_ramc_base[0])
    - panic(pr_fmt("unable to map ramc[0] cpu registers\n"));
    - /* the controller may have 2 banks */
    - at91_ramc_base[1] = of_iomap(np, 1);
    + idx++;
    + }
    +
    + if (!idx)
    + panic(pr_fmt("unable to find compatible ram controller node in dtb\n"));

    of_id = of_match_node(ramc_ids, np);
    - if (!of_id)
    + if (!of_id) {
    pr_warn("ramc no standby function available\n");
    - else
    - at91_pm_set_standby(of_id->data);
    + return;
    + }

    - of_node_put(np);
    + at91_pm_set_standby(of_id->data);
    }

    static struct of_device_id shdwc_ids[] = {
    --
    2.0.1


    \
     
     \ /
      Last update: 2014-07-04 00:21    [W:5.162 / U:0.188 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site