mirror of https://lore.kernel.org/lkml/
 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,
	Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
	devicetree-discuss@lists.ozlabs.org
Subject: [PATCH 06/11] x86/dtb: add support hpet
Date: Thu, 25 Nov 2010 18:39:56 +0100	[thread overview]
Message-ID: <1290706801-7323-7-git-send-email-bigeasy@linutronix.de> (raw)
In-Reply-To: <1290706801-7323-1-git-send-email-bigeasy@linutronix.de>

Set hpet_address based on information provied form DTB

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
CC: x86@kernel.org
Cc: devicetree-discuss@lists.ozlabs.org
Tested-by: Dirk Brandewie <dirk.brandewie@gmail.com>
---
 arch/x86/kernel/prom.c |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/prom.c b/arch/x86/kernel/prom.c
index 9551f2f..f61c541 100644
--- a/arch/x86/kernel/prom.c
+++ b/arch/x86/kernel/prom.c
@@ -9,6 +9,7 @@
 #include <linux/of_platform.h>
 #include <linux/slab.h>
 
+#include <asm/hpet.h>
 #include <asm/irq_controller.h>
 #include <asm/io_apic.h>
 
@@ -99,6 +100,27 @@ void __init add_dtb(u64 data)
 				offsetof(struct setup_data, data));
 }
 
+static int __init early_scan_hpet(unsigned long node, const char *uname,
+				   int depth, void *data)
+{
+	unsigned long l;
+	int ret;
+	__be32 *cell;
+
+	if (depth != 2)
+		return 0;
+
+	ret = of_flat_dt_is_compatible(node, "intel,hpet");
+	if (!ret)
+		return 0;
+
+	cell = of_get_flat_dt_prop(node, "phys_reg", &l);
+	if (!cell)
+		return 0;
+	hpet_address = of_read_ulong(cell, l / 4);
+	return 1;
+}
+
 static void __init of_lapic_setup(void)
 {
 #ifdef CONFIG_X86_LOCAL_APIC
@@ -195,6 +217,7 @@ void __init x86_early_of_parse(void)
 
 	/* root level address cells */
 	of_scan_flat_dt(early_init_dt_scan_root, NULL);
+	of_scan_flat_dt(early_scan_hpet, NULL);
 	of_apic_setup();
 
 	early_iounmap(initial_boot_params, size);
-- 
1.7.3.2


  parent reply	other threads:[~2010-11-25 17:44 UTC|newest]

Thread overview: 71+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-11-25 17:39 Add device tree support for x86 Sebastian Andrzej Siewior
2010-11-25 17:39 ` [PATCH 01/11] x86/kernel: remove conditional early remap in parse_e820_ext Sebastian Andrzej Siewior
2010-12-08  8:38   ` [sodaville] " Sebastian Andrzej Siewior
2010-12-08 14:15     ` Thomas Gleixner
2010-12-15 23:28   ` H. Peter Anvin
2010-12-16  9:55     ` Sebastian Andrzej Siewior
2010-11-25 17:39 ` [PATCH 02/11] x86: Add device tree support Sebastian Andrzej Siewior
2010-11-25 22:53   ` Sam Ravnborg
2010-11-26  9:06     ` Sebastian Andrzej Siewior
2010-11-26 21:42   ` Benjamin Herrenschmidt
2010-11-28 13:49     ` Sebastian Andrzej Siewior
2010-11-28 22:28       ` Benjamin Herrenschmidt
2010-12-30  8:26       ` Grant Likely
2010-12-30  8:45         ` Rob Landley
2010-12-30 20:58           ` Grant Likely
2011-01-03 16:05             ` [sodaville] " H. Peter Anvin
2011-01-03 16:19               ` H. Peter Anvin
2011-01-03 17:52                 ` Grant Likely
2011-01-03 18:06                   ` H. Peter Anvin
2011-01-03 18:10                     ` H. Peter Anvin
2010-12-30 20:57         ` Grant Likely
2010-12-31  0:51         ` [sodaville] " H. Peter Anvin
2010-11-25 17:39 ` [PATCH 03/11] x86/dtb: Add a device tree for CE4100 Sebastian Andrzej Siewior
2010-11-26 21:57   ` Benjamin Herrenschmidt
2010-11-28 16:04     ` Sebastian Andrzej Siewior
2010-11-28 22:53       ` Benjamin Herrenschmidt
2010-11-29  1:34         ` Mitch Bradley
2010-11-29 18:26           ` [sodaville] " H. Peter Anvin
2010-11-29 20:03             ` Benjamin Herrenschmidt
2010-11-29 19:44           ` Sebastian Andrzej Siewior
2010-12-02  0:40             ` David Gibson
2010-11-29 19:07         ` Scott Wood
2010-11-29 20:05           ` Benjamin Herrenschmidt
2010-11-29 20:32             ` Mitch Bradley
2010-11-29 20:44               ` Benjamin Herrenschmidt
2010-11-29 21:32                 ` Mitch Bradley
2010-11-29 23:47                 ` Alan Cox
2010-11-30  2:50                   ` Benjamin Herrenschmidt
2010-11-30 11:20                     ` Sebastian Andrzej Siewior
2010-11-29 23:42               ` Alan Cox
2010-11-30 21:18                 ` [sodaville] " H. Peter Anvin
2010-11-30 11:51               ` Sebastian Andrzej Siewior
2010-11-30 20:31                 ` Benjamin Herrenschmidt
2010-11-29 23:58           ` David Gibson
2010-11-29 19:36         ` [sodaville] " Sebastian Andrzej Siewior
2010-11-29 20:14           ` Benjamin Herrenschmidt
2010-11-29  2:22     ` David Gibson
2010-11-25 17:39 ` [PATCH 04/11] x86/dtb: add irq host abstraction Sebastian Andrzej Siewior
2010-11-25 19:30   ` Jon Loeliger
2010-11-26 14:19     ` Sebastian Andrzej Siewior
2010-11-26 21:36       ` Benjamin Herrenschmidt
2010-12-01 10:31         ` [sodaville] " Sebastian Andrzej Siewior
2010-11-27  3:11       ` Jon Loeliger
2010-11-25 17:39 ` [PATCH 05/11] x86/dtb: add early parsing of APIC and IO APIC Sebastian Andrzej Siewior
2010-11-25 17:39 ` Sebastian Andrzej Siewior [this message]
2010-11-25 17:39 ` [PATCH 07/11] x86/dtb: add support for PCI devices backed by dtb nodes Sebastian Andrzej Siewior
2010-11-27 22:33   ` Benjamin Herrenschmidt
2010-11-28 14:04     ` Sebastian Andrzej Siewior
2010-11-28 22:32       ` Benjamin Herrenschmidt
2010-12-02 16:17         ` Sebastian Andrzej Siewior
2010-11-25 17:39 ` [PATCH 08/11] x86/dtb: Add generic bus probe Sebastian Andrzej Siewior
2010-11-25 17:39 ` [PATCH 09/11] x86/ioapic: Add OF bindings for IO-APIC Sebastian Andrzej Siewior
2010-11-25 17:40 ` [PATCH 10/11] x86/io_apic: add simply id set Sebastian Andrzej Siewior
2010-11-25 21:04   ` Yinghai Lu
2010-11-26 11:03     ` Sebastian Andrzej Siewior
2010-11-26 16:50     ` [PATCH] x86/io_apic: split setup_ioapic_ids_from_mpc() into a non-checkign version Sebastian Andrzej Siewior
2010-12-06 13:33       ` [tip:x86/apic] x86: io_apic: Split setup_ioapic_ids_from_mpc() tip-bot for Sebastian Andrzej Siewior
2010-12-07  8:59         ` [PATCH -v2] x86, ioapic: Don't write io_apic ID if it is not changed Yinghai Lu
2010-12-09 20:56           ` [tip:x86/apic-cleanups] x86, ioapic: Avoid writing io_apic id if already correct tip-bot for Yinghai Lu
2010-11-25 17:40 ` [PATCH 11/11] x86/ce4100: use OF for ioapic Sebastian Andrzej Siewior
2011-02-22 20:07 Device tree on x86, part v4 Sebastian Andrzej Siewior
2011-02-22 20:07 ` [PATCH 06/11] x86/dtb: add support hpet 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=1290706801-7323-7-git-send-email-bigeasy@linutronix.de \
    --to=bigeasy@linutronix.de \
    --cc=devicetree-discuss@lists.ozlabs.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sodaville@linutronix.de \
    --cc=x86@kernel.org \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®