LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
To: linux-kernel@vger.kernel.org
Cc: sodaville@linutronix.de, x86@kernel.org,
devicetree-discuss@lists.ozlabs.org,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
Dirk Brandewie <dirk.brandewie@gmail.com>
Subject: [PATCH TIP 06/14] x86/dtb: add support hpet
Date: Mon, 24 Jan 2011 09:58:54 +0530 [thread overview]
Message-ID: <1295843342-1122-7-git-send-email-bigeasy@linutronix.de> (raw)
In-Reply-To: <1295843342-1122-1-git-send-email-bigeasy@linutronix.de>
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/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 e4d53bf..16c124e 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>
@@ -98,6 +99,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
@@ -198,5 +216,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
next prev parent reply other threads:[~2011-01-24 4:32 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-24 4:28 Device tree on x86, part v3 Sebastian Andrzej Siewior
2011-01-24 4:28 ` [PATCH TIP 01/14] x86/e820: remove conditional early mapping in parse_e820_ext Sebastian Andrzej Siewior
2011-02-03 20:57 ` Grant Likely
2011-01-24 4:28 ` [PATCH TIP 02/14] x86: Add device tree support Sebastian Andrzej Siewior
2011-01-24 4:34 ` Sebastian Andrzej Siewior
2011-02-16 21:27 ` Grant Likely
2011-02-17 11:05 ` [sodaville] " Sebastian Andrzej Siewior
2011-02-16 21:26 ` Grant Likely
2011-02-17 11:03 ` Sebastian Andrzej Siewior
2011-02-16 21:31 ` Grant Likely
2011-02-17 11:31 ` [sodaville] " Sebastian Andrzej Siewior
2011-02-17 17:02 ` Grant Likely
2011-01-24 4:28 ` [PATCH TIP 03/14] x86/dtb: Add a device tree for CE4100 Sebastian Andrzej Siewior
2011-01-27 5:00 ` David Gibson
2011-01-27 9:11 ` Sebastian Andrzej Siewior
2011-02-03 20:59 ` Grant Likely
2011-02-03 21:32 ` Mitch Bradley
2011-02-04 9:40 ` Sebastian Andrzej Siewior
2011-02-02 18:58 ` [PATCH TIP v2 " Sebastian Andrzej Siewior
2011-02-03 21:07 ` Grant Likely
2011-02-04 10:06 ` Sebastian Andrzej Siewior
2011-02-16 21:44 ` Grant Likely
2011-02-22 11:21 ` [sodaville] " Sebastian Andrzej Siewior
2011-01-24 4:28 ` [PATCH TIP 04/14] x86/dtb: add irq domain abstraction Sebastian Andrzej Siewior
2011-01-24 4:28 ` [PATCH TIP 05/14] x86/dtb: add early parsing of APIC and IO APIC Sebastian Andrzej Siewior
2011-02-16 21:47 ` Grant Likely
2011-01-24 4:28 ` Sebastian Andrzej Siewior [this message]
2011-01-24 4:28 ` [PATCH OF 07/14] of: move of_irq_map_pci() into generic code Sebastian Andrzej Siewior
2011-02-10 13:57 ` Michal Simek
2011-02-16 21:53 ` Grant Likely
2011-02-17 7:49 ` Michal Simek
2011-01-24 4:28 ` [PATCH TIP 08/14] x86/dtb: add support for PCI devices backed by dtb nodes Sebastian Andrzej Siewior
2011-02-16 21:59 ` Grant Likely
2011-02-22 11:21 ` [sodaville] " Sebastian Andrzej Siewior
2011-01-24 4:28 ` [PATCH TIP 09/14] x86/dtb: Add generic bus probe Sebastian Andrzej Siewior
2011-02-04 10:21 ` [PATCH v2 " Sebastian Andrzej Siewior
2011-02-16 22:04 ` Grant Likely
2011-01-24 4:28 ` [PATCH TIP 10/14] x86/ioapic: Add OF bindings for IO-APIC Sebastian Andrzej Siewior
2011-02-16 22:04 ` Grant Likely
2011-01-24 4:28 ` [PATCH TIP 11/14] x86/ce4100: use OF for ioapic Sebastian Andrzej Siewior
2011-01-24 4:29 ` [PATCH OF 12/14] x86/rtc: don't register rtc if we the DT blob Sebastian Andrzej Siewior
2011-02-16 22:08 ` Grant Likely
2011-02-16 22:09 ` Grant Likely
2011-02-17 13:13 ` [sodaville] " Sebastian Andrzej Siewior
2011-01-24 4:29 ` [PATCH OF 13/14] rtc/cmos: add OF bindings Sebastian Andrzej Siewior
2011-01-24 4:38 ` Sebastian Andrzej Siewior
2011-02-16 22:11 ` Grant Likely
2011-02-17 13:26 ` [sodaville] " Sebastian Andrzej Siewior
2011-02-17 16:46 ` Grant Likely
2011-01-24 4:29 ` [PATCH TIP 14/14] x86/pci: remove warning Sebastian Andrzej Siewior
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1295843342-1122-7-git-send-email-bigeasy@linutronix.de \
--to=bigeasy@linutronix.de \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=dirk.brandewie@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sodaville@linutronix.de \
--cc=x86@kernel.org \
--subject='Re: [PATCH TIP 06/14] x86/dtb: add support hpet' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).