From patchwork Fri Sep 13 12:49:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 20034 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f198.google.com (mail-qc0-f198.google.com [209.85.216.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 122D720358 for ; Fri, 13 Sep 2013 12:49:51 +0000 (UTC) Received: by mail-qc0-f198.google.com with SMTP id l13sf1169524qcy.5 for ; Fri, 13 Sep 2013 05:49:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=qlG1H1RZJuw9dmeCtaLzkX/ikL/xkBLhLjrpBHQWqjM=; b=JnOhdlCdgUTLp66FPoqwDgdR/GunPBULuwCnvHOqSV9Mw0jUuZCv4B9vCA8y7/FPa2 gt/kW3EzOxuskwPVOxfxnx/SwOMS9c18MEg5j7YIEMHgyQd8c6lgL7WwhoytWje/ndWT qoqIBjY5mclgQZrkq8T15FO0QfUW4DlZctWmNBE8uhagF4KLrl7MSq9tLDkLtOFKU23H mzvx+5ngOeLPJCz5pdouGGC2cLGZpkIolpZQckM+Z/t1tLKIUUJtt6Z1IiPvRutPHHVR YR8UN85e1i0xyVOmJYACBoN4nIeawjsBG1ECFfzCo3jiICf5SaGam/gUMykYYJiOegpl u6VQ== X-Gm-Message-State: ALoCoQneK2BCcAqW6Xh66wScaYPHDXFdue6ZxbVJE2uFG81BR9RZ0MSunxQWIO5AWKKBDbnWFUOg X-Received: by 10.236.115.198 with SMTP id e46mr5379232yhh.33.1379076590729; Fri, 13 Sep 2013 05:49:50 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.6.73 with SMTP id y9ls1193903qey.60.gmail; Fri, 13 Sep 2013 05:49:50 -0700 (PDT) X-Received: by 10.58.168.205 with SMTP id zy13mr9928058veb.19.1379076590505; Fri, 13 Sep 2013 05:49:50 -0700 (PDT) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id jc7si3087503vdb.0.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Sep 2013 05:49:50 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.169; Received: by mail-vc0-f169.google.com with SMTP id ib11so905782vcb.0 for ; Fri, 13 Sep 2013 05:49:50 -0700 (PDT) X-Received: by 10.58.155.68 with SMTP id vu4mr7017011veb.21.1379076590397; Fri, 13 Sep 2013 05:49:50 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp78774vcz; Fri, 13 Sep 2013 05:49:49 -0700 (PDT) X-Received: by 10.15.77.199 with SMTP id p47mr3753435eey.50.1379076589111; Fri, 13 Sep 2013 05:49:49 -0700 (PDT) Received: from mail-ea0-f179.google.com (mail-ea0-f179.google.com [209.85.215.179]) by mx.google.com with ESMTPS id k2si3776070eey.122.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Sep 2013 05:49:49 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.215.179 is neither permitted nor denied by best guess record for domain of julien.grall@linaro.org) client-ip=209.85.215.179; Received: by mail-ea0-f179.google.com with SMTP id b10so550409eae.38 for ; Fri, 13 Sep 2013 05:49:48 -0700 (PDT) X-Received: by 10.15.100.198 with SMTP id bn46mr17782510eeb.11.1379076588352; Fri, 13 Sep 2013 05:49:48 -0700 (PDT) Received: from belegaer.uk.xensource.com. ([185.25.64.249]) by mx.google.com with ESMTPSA id p5sm14678420eeg.5.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Sep 2013 05:49:47 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Cc: stefano.stabellini@eu.citrix.com, ian.campbell@citrix.com, patches@linaro.org, andre.przywara@linaro.org, Julien Grall Subject: [PATCH v4 09/27] xen/video: hdlcd: Convert the driver to the new device tree API Date: Fri, 13 Sep 2013 13:49:16 +0100 Message-Id: <1379076574-28316-10-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1379076574-28316-1-git-send-email-julien.grall@linaro.org> References: <1379076574-28316-1-git-send-email-julien.grall@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: julien.grall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Avoid to use FDT API which will be removed soon Signed-off-by: Julien Grall Acked-by: Ian campbell --- Changes in v2: - Move s/printk/early_printk changes to a new patch - hdlcd_start and hdlcd_size are physical address - Update early printk to use HDLCD instead of hdlcd --- xen/drivers/video/arm_hdlcd.c | 46 +++++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/xen/drivers/video/arm_hdlcd.c b/xen/drivers/video/arm_hdlcd.c index 72979ea..ab464c6 100644 --- a/xen/drivers/video/arm_hdlcd.c +++ b/xen/drivers/video/arm_hdlcd.c @@ -25,6 +25,7 @@ #include #include #include +#include #include "font.h" #include "lfb.h" #include "modelines.h" @@ -96,47 +97,52 @@ static int __init get_color_masks(const char* bpp, struct color_masks **masks) static void __init set_pixclock(uint32_t pixclock) { - if ( device_tree_node_compatible(device_tree_flattened, 0, "arm,vexpress") ) + if ( dt_find_compatible_node(NULL, NULL, "arm,vexpress") ) vexpress_syscfg(1, V2M_SYS_CFG_OSC_FUNC, V2M_SYS_CFG_OSC5, &pixclock); } void __init video_init(void) { - int node, depth; - u32 address_cells, size_cells; struct lfb_prop lfbp; unsigned char *lfb; paddr_t hdlcd_start, hdlcd_size; paddr_t framebuffer_start, framebuffer_size; - const struct fdt_property *prop; - const u32 *cell; const char *mode_string; char _mode_string[16]; int bytes_per_pixel = 4; struct color_masks *c = NULL; struct modeline *videomode = NULL; int i; + const struct dt_device_node *dev; + const __be32 *cells; + u32 lenp; + int res; - if ( find_compatible_node("arm,hdlcd", &node, &depth, - &address_cells, &size_cells) <= 0 ) - return; + dev = dt_find_compatible_node(NULL, NULL, "arm,hdlcd"); - prop = fdt_get_property(device_tree_flattened, node, "reg", NULL); - if ( !prop ) + if ( !dev ) + { + early_printk("HDLCD: Cannot find node compatible with \"arm,hdcld\"\n"); return; + } - cell = (const u32 *)prop->data; - device_tree_get_reg(&cell, address_cells, size_cells, - &hdlcd_start, &hdlcd_size); + res = dt_device_get_address(dev, 0, &hdlcd_start, &hdlcd_size); + if ( !res ) + { + early_printk("HDLCD: Unable to retrieve MMIO base address\n"); + return; + } - prop = fdt_get_property(device_tree_flattened, node, "framebuffer", NULL); - if ( !prop ) + cells = dt_get_property(dev, "framebuffer", &lenp); + if ( !cells ) + { + early_printk("HDLCD: Unable to retrieve framebuffer property\n"); return; + } - cell = (const u32 *)prop->data; - device_tree_get_reg(&cell, address_cells, size_cells, - &framebuffer_start, &framebuffer_size); + framebuffer_start = dt_next_cell(dt_n_addr_cells(dev), &cells); + framebuffer_size = dt_next_cell(dt_n_size_cells(dev), &cells); if ( !hdlcd_start ) { @@ -150,8 +156,8 @@ void __init video_init(void) return; } - mode_string = fdt_getprop(device_tree_flattened, node, "mode", NULL); - if ( !mode_string ) + res = dt_property_read_string(dev, "mode", &mode_string); + if ( res ) { get_color_masks("32", &c); memcpy(_mode_string, "1280x1024@60", strlen("1280x1024@60") + 1);