lkml.org 
[lkml]   [2011]   [Feb]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/11] x86/dtb: add support hpet
    Date
    Set hpet_address based on information provied form DTB

    Cc: devicetree-discuss@lists.ozlabs.org
    Cc: Dirk Brandewie <dirk.brandewie@gmail.com>
    Acked-by: Grant Likely <grant.likely@secretlab.ca>
    Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
    ---
    arch/x86/kernel/devicetree.c | 19 +++++++++++++++++++
    1 files changed, 19 insertions(+), 0 deletions(-)

    diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c
    index 72cc3e2..8d7a2eb 100644
    --- a/arch/x86/kernel/devicetree.c
    +++ b/arch/x86/kernel/devicetree.c
    @@ -11,6 +11,7 @@
    #include <linux/of_platform.h>
    #include <linux/slab.h>

    +#include <asm/hpet.h>
    #include <asm/irq_controller.h>
    #include <asm/apic.h>

    @@ -99,6 +100,23 @@ void __init add_dtb(u64 data)
    initial_dtb = data + offsetof(struct setup_data, data);
    }

    +static void __init dtb_setup_hpet(void)
    +{
    + struct device_node *dn;
    + struct resource r;
    + int ret;
    +
    + dn = of_find_compatible_node(NULL, NULL, "intel,ce4100-hpet");
    + if (!dn)
    + return;
    + ret = of_address_to_resource(dn, 0, &r);
    + if (ret) {
    + WARN_ON(1);
    + return;
    + }
    + hpet_address = r.start;
    +}
    +
    static void __init dtb_lapic_setup(void)
    {
    #ifdef CONFIG_X86_LOCAL_APIC
    @@ -199,5 +217,6 @@ void __init x86_dtb_get_config(unsigned int unused)
    of_scan_flat_dt(early_init_dt_scan_root, NULL);

    unflatten_device_tree();
    + dtb_setup_hpet();
    dtb_apic_setup();
    }
    --
    1.7.4


    \
     
     \ /
      Last update: 2011-02-22 21:11    [W:4.075 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site