From patchwork Wed Aug 28 14:47:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 19576 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f199.google.com (mail-ve0-f199.google.com [209.85.128.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 28EB925E58 for ; Wed, 28 Aug 2013 14:48:24 +0000 (UTC) Received: by mail-ve0-f199.google.com with SMTP id m1sf6976186ves.2 for ; Wed, 28 Aug 2013 07:48:23 -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=nm0K86aCDMj0pDXu2N84+fVE/6T57wBTXEwpdYWOKEk=; b=WBleRUIg3sPVElzfb4gd6+3mAVMZ17xZJN7gR0z9zu4TMhpDioNhArYniylx9F/5MS fdXas7cunLwYm0KvYripZIAMCVkiXHLF0+UFI/g7n05tYU6YEDbD812ungU9QimK1hDg D+y1giQ2bXl96oataqTc2Lx6y84PDQfeYf/ykZPmiaboM7BJkNizHfJ6NkOwtY3CMqpX 3Rpv17fthSNrv6gpTXXUSqh2NGDKHmL9TNSES9+YMJ1ekkFYzCJt9yFy4VBSDLlusm93 +OPyz8hIWotNJKbOASsMeuiHdlduSEdDZogDt+OaSlRvL6G2CWLPQdhmh+DoUs6s1A+w 4reA== X-Received: by 10.236.140.130 with SMTP id e2mr9631659yhj.10.1377701303879; Wed, 28 Aug 2013 07:48:23 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.14.106 with SMTP id o10ls359928qec.36.gmail; Wed, 28 Aug 2013 07:48:23 -0700 (PDT) X-Received: by 10.220.103.140 with SMTP id k12mr306290vco.39.1377701303729; Wed, 28 Aug 2013 07:48:23 -0700 (PDT) Received: from mail-vb0-f50.google.com (mail-vb0-f50.google.com [209.85.212.50]) by mx.google.com with ESMTPS id se9si5577057vdc.62.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 28 Aug 2013 07:48:23 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.50 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.50; Received: by mail-vb0-f50.google.com with SMTP id x14so4070640vbb.37 for ; Wed, 28 Aug 2013 07:48:23 -0700 (PDT) X-Gm-Message-State: ALoCoQktIh2ZPSnsEmF/ITGlbNX/l03RCCbtpWk84heNinccPk5zF/i8zN02n2wAAOzE23WiJ8Mz X-Received: by 10.52.164.201 with SMTP id ys9mr511011vdb.39.1377701303621; Wed, 28 Aug 2013 07:48:23 -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 u4csp359949vcz; Wed, 28 Aug 2013 07:48:22 -0700 (PDT) X-Received: by 10.194.173.66 with SMTP id bi2mr3282358wjc.43.1377701302253; Wed, 28 Aug 2013 07:48:22 -0700 (PDT) Received: from mail-we0-f171.google.com (mail-we0-f171.google.com [74.125.82.171]) by mx.google.com with ESMTPS id lg5si9544396wjb.35.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 28 Aug 2013 07:48:22 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.171 is neither permitted nor denied by best guess record for domain of julien.grall@linaro.org) client-ip=74.125.82.171; Received: by mail-we0-f171.google.com with SMTP id p57so5255457wes.16 for ; Wed, 28 Aug 2013 07:48:21 -0700 (PDT) X-Received: by 10.194.248.130 with SMTP id ym2mr2963249wjc.61.1377701301557; Wed, 28 Aug 2013 07:48:21 -0700 (PDT) Received: from belegaer.uk.xensource.com. ([185.25.64.249]) by mx.google.com with ESMTPSA id a8sm5590498wie.6.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 28 Aug 2013 07:48:20 -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 V1 13/29] xen/video: hdlcd: Convert the driver to the new device tree API Date: Wed, 28 Aug 2013 15:47:27 +0100 Message-Id: <1377701263-3319-14-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1377701263-3319-1-git-send-email-julien.grall@linaro.org> References: <1377701263-3319-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.212.50 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);