[PATCH 06/15] x86/dtb: add support hpet
Grant Likely
grant.likely at secretlab.ca
Wed Jan 12 09:26:07 EST 2011
On Fri, Dec 17, 2010 at 04:33:44PM +0100, Sebastian Andrzej Siewior wrote:
> Set hpet_address based on information provied form DTB
>
> Cc: devicetree-discuss at lists.ozlabs.org
> Cc: Dirk Brandewie <dirk.brandewie at gmail.com>
> Signed-off-by: Sebastian Andrzej Siewior <bigeasy at linutronix.de>
Acked-by: Grant Likely <grant.likely at secretlab.ca>
> ---
> arch/x86/kernel/prom.c | 19 +++++++++++++++++++
> 1 files changed, 19 insertions(+), 0 deletions(-)
>
> diff --git a/arch/x86/kernel/prom.c b/arch/x86/kernel/prom.c
> index 9cbb52b..40ad8c0 100644
> --- a/arch/x86/kernel/prom.c
> +++ b/arch/x86/kernel/prom.c
> @@ -10,6 +10,7 @@
> #include <linux/of_platform.h>
> #include <linux/slab.h>
>
> +#include <asm/hpet.h>
> #include <asm/irq_controller.h>
> #include <asm/io_apic.h>
>
> @@ -101,6 +102,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,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
> @@ -212,5 +230,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.3.2
>
> _______________________________________________
> devicetree-discuss mailing list
> devicetree-discuss at lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/devicetree-discuss
More information about the devicetree-discuss
mailing list