From patchwork Fri Aug 16 21:05:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 19262 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f71.google.com (mail-qa0-f71.google.com [209.85.216.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5C92725E5D for ; Fri, 16 Aug 2013 21:06:30 +0000 (UTC) Received: by mail-qa0-f71.google.com with SMTP id bq6sf1503107qab.10 for ; Fri, 16 Aug 2013 14:06:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-gm-message-state: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=XC/D2rkOmLWjVJAIwFWPT+4dxO7iSy17DJB/eBlF/F0=; b=QMAihA7duqnPutP9hmz2+6zKRVCjWJXKPSRed+n40TFcPvK4CzvOxW9XYElGiqEHVN luB6Vjn4wiCkXhmY0yKQr/b+FLDguboYgIS08SiT8UasFWsVyYxGEHw3iMRwKt1Sn8lg gUFp1lcoHrR+1D2JK8WhNNA8bazYcTqx4hUdjCL7GOaypuwOSEwkEA7Y9piOdaDzbADe VbDknxAIo2nNkDFHJcvcf7j09DWM+tRK1kOaQTa3HUI5hTancxnJFR23s9jGI3Ol1psT aIfrS9UkBnx9x8biUtSn0MXSS1eukT4nGzOZfYu4pmqJzaakLnCmDpUeZ/MCnkIdahGY Ll8g== X-Received: by 10.236.140.130 with SMTP id e2mr1239569yhj.10.1376687190164; Fri, 16 Aug 2013 14:06:30 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.105.69 with SMTP id gk5ls964886qeb.57.gmail; Fri, 16 Aug 2013 14:06:30 -0700 (PDT) X-Received: by 10.52.120.7 with SMTP id ky7mr2444935vdb.12.1376687190015; Fri, 16 Aug 2013 14:06:30 -0700 (PDT) Received: from mail-ve0-f175.google.com (mail-ve0-f175.google.com [209.85.128.175]) by mx.google.com with ESMTPS id bk8si776519vec.94.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 16 Aug 2013 14:06:30 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.175; Received: by mail-ve0-f175.google.com with SMTP id oy10so1675642veb.6 for ; Fri, 16 Aug 2013 14:06:29 -0700 (PDT) X-Gm-Message-State: ALoCoQnxgMAMJDXmiu5Hjn3Tpve+xoHjPMosAGhkd6fSZi8xeQAS9qUO1qO3CK3dCYTQYCkq15cc X-Received: by 10.58.196.132 with SMTP id im4mr1937179vec.28.1376687189917; Fri, 16 Aug 2013 14:06:29 -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 u4csp89459vcz; Fri, 16 Aug 2013 14:06:29 -0700 (PDT) X-Received: by 10.195.12.170 with SMTP id er10mr2566383wjd.5.1376687188798; Fri, 16 Aug 2013 14:06:28 -0700 (PDT) Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com [209.85.212.169]) by mx.google.com with ESMTPS id ey17si249657wid.6.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 16 Aug 2013 14:06:28 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.169 is neither permitted nor denied by best guess record for domain of julien.grall@linaro.org) client-ip=209.85.212.169; Received: by mail-wi0-f169.google.com with SMTP id f14so2004621wiw.4 for ; Fri, 16 Aug 2013 14:06:28 -0700 (PDT) X-Received: by 10.180.10.202 with SMTP id k10mr627696wib.17.1376687188219; Fri, 16 Aug 2013 14:06:28 -0700 (PDT) Received: from belegaer.uk.xensource.com. ([185.25.64.249]) by mx.google.com with ESMTPSA id b13sm797327wic.9.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 16 Aug 2013 14:06:27 -0700 (PDT) From: Julien Grall To: stefano.stabellini@eu.citrix.com, ian.campbell@citrix.com Cc: patches@linaro.org, andre.przywara@linaro.org, xen-devel@lists.xen.org, Julien Grall Subject: [RFC 14/24] xen/video: hdlcd: Convert the driver to the new device tree API Date: Fri, 16 Aug 2013 22:05:46 +0100 Message-Id: <1376687156-6737-15-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1376687156-6737-1-git-send-email-julien.grall@linaro.org> References: <1376687156-6737-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.128.175 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 --- xen/drivers/video/arm_hdlcd.c | 58 +++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 26 deletions(-) diff --git a/xen/drivers/video/arm_hdlcd.c b/xen/drivers/video/arm_hdlcd.c index 72979ea..0ff8c22 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,62 +97,67 @@ 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; + u64 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 ) { - printk(KERN_ERR "HDLCD address missing from device tree, disabling driver\n"); + early_printk("hdlcd: address missing from device tree, disabling driver\n"); return; } if ( !hdlcd_start || !framebuffer_start ) { - printk(KERN_ERR "HDLCD: framebuffer address missing from device tree, disabling driver\n"); + printk("hdlcd: framebuffer address missing from device tree, disabling driver\n"); 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); @@ -160,14 +166,14 @@ void __init video_init(void) else if ( strlen(mode_string) < strlen("800x600@60") || strlen(mode_string) > sizeof(_mode_string) - 1 ) { - printk(KERN_ERR "HDLCD: invalid modeline=%s\n", mode_string); + early_printk("hdlcd: invalid modeline=%s\n", mode_string); return; } else { char *s = strchr(mode_string, '-'); if ( !s ) { - printk(KERN_INFO "HDLCD: bpp not found in modeline %s, assume 32 bpp\n", - mode_string); + early_printk("hdcld: bpp not found in modeline %s, assume 32 bpp\n", + mode_string); get_color_masks("32", &c); memcpy(_mode_string, mode_string, strlen(mode_string) + 1); bytes_per_pixel = 4;