From patchwork Fri Jan 13 20:42:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 6203 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 5D54F23F7F for ; Fri, 13 Jan 2012 20:42:15 +0000 (UTC) Received: from mail-bk0-f52.google.com (mail-bk0-f52.google.com [209.85.214.52]) by fiordland.canonical.com (Postfix) with ESMTP id 4D9FBA18305 for ; Fri, 13 Jan 2012 20:42:15 +0000 (UTC) Received: by mail-bk0-f52.google.com with SMTP id zu5so3270986bkb.11 for ; Fri, 13 Jan 2012 12:42:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :dkim-signature:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=7EVu4MKuQT28m5n02PqsdSBSv58PkdFRYxYycqvHf+I=; b=h91u9WDJXCz0p0aPBrzbIZ/owsiZAr04nNDQ54qJ8oavc3kfuh/O6MTfF55OswDiJH YriFXZBC/m1/t9cEXhGPVi+F3ycjUAloJv+m8bNxpuGPuNXDNurquWY6L/EcFkEa5kAR W5G7JoB2XmPMqK3obYuogJRV0FkarrQifORts= Received: by 10.205.26.67 with SMTP id rl3mr1098972bkb.45.1326487335111; Fri, 13 Jan 2012 12:42:15 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.205.82.144 with SMTP id ac16cs38814bkc; Fri, 13 Jan 2012 12:42:14 -0800 (PST) Received: by 10.236.129.173 with SMTP id h33mr4408246yhi.14.1326487333220; Fri, 13 Jan 2012 12:42:13 -0800 (PST) Received: from mail-yx0-f178.google.com (mail-yx0-f178.google.com [209.85.213.178]) by mx.google.com with ESMTPS id v6si11051526yhk.98.2012.01.13.12.42.12 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 13 Jan 2012 12:42:13 -0800 (PST) Received-SPF: pass (google.com: domain of robdclark@gmail.com designates 209.85.213.178 as permitted sender) client-ip=209.85.213.178; Authentication-Results: mx.google.com; spf=pass (google.com: domain of robdclark@gmail.com designates 209.85.213.178 as permitted sender) smtp.mail=robdclark@gmail.com; dkim=pass header.i=@gmail.com Received: by yenq2 with SMTP id q2so499948yen.37 for ; Fri, 13 Jan 2012 12:42:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=7EVu4MKuQT28m5n02PqsdSBSv58PkdFRYxYycqvHf+I=; b=LL63T3SzYHAZtMkJl77OtJ+I62ZQtXEOqDyX94mbCV4QabqjYkGEf7r3ICxdbLZpEg jF60Cz5aB6zO3tsveGsPb4QgQaPg+ozz9OOpt07sXtq9/DBKS29ccVrMC4J5SoDAGgpQ 57iMwrdkDiq1yND4PjGv5cBbthxHujWYpxnfo= Received: by 10.236.154.3 with SMTP id g3mr4286687yhk.119.1326487332741; Fri, 13 Jan 2012 12:42:12 -0800 (PST) Received: from localhost (ppp-70-129-131-203.dsl.rcsntx.swbell.net. [70.129.131.203]) by mx.google.com with ESMTPS id n5sm16511804yhk.1.2012.01.13.12.42.11 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 13 Jan 2012 12:42:12 -0800 (PST) Sender: Rob Clark From: Rob Clark To: linux-omap@vger.kernel.org, dri-devel@lists.freedesktop.org Cc: patches@linaro.org, Greg KH , Tomi Valkeinen , Andy Gross , Rob Clark Subject: [PATCH 2/2] drm/omap: platform data structs moved to plat-omap Date: Fri, 13 Jan 2012 14:42:00 -0600 Message-Id: <1326487320-8781-2-git-send-email-rob.clark@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1326487320-8781-1-git-send-email-rob.clark@linaro.org> References: <1326487320-8781-1-git-send-email-rob.clark@linaro.org> From: Rob Clark Platform data structs populated when the platform device is registered need to be #include'able under arch/arm/..., but having to #include headers from drivers/staging is messy. Instead these structs are moved to arch/arm/plat-omap/include/plat. Signed-off-by: Rob Clark --- drivers/staging/omapdrm/omap_dmm_tiler.h | 5 --- drivers/staging/omapdrm/omap_drv.h | 2 +- drivers/staging/omapdrm/omap_priv.h | 55 ------------------------------ 3 files changed, 1 insertions(+), 61 deletions(-) delete mode 100644 drivers/staging/omapdrm/omap_priv.h diff --git a/drivers/staging/omapdrm/omap_dmm_tiler.h b/drivers/staging/omapdrm/omap_dmm_tiler.h index f87cb65..821d8e7 100644 --- a/drivers/staging/omapdrm/omap_dmm_tiler.h +++ b/drivers/staging/omapdrm/omap_dmm_tiler.h @@ -127,9 +127,4 @@ static inline bool validfmt(enum tiler_fmt fmt) } } -struct omap_dmm_platform_data { - void __iomem *base; - int irq; -}; - #endif diff --git a/drivers/staging/omapdrm/omap_drv.h b/drivers/staging/omapdrm/omap_drv.h index 48f6fce..db275ca 100644 --- a/drivers/staging/omapdrm/omap_drv.h +++ b/drivers/staging/omapdrm/omap_drv.h @@ -25,8 +25,8 @@ #include #include #include +#include #include "omap_drm.h" -#include "omap_priv.h" #define DBG(fmt, ...) DRM_DEBUG(fmt"\n", ##__VA_ARGS__) #define VERB(fmt, ...) if (0) DRM_DEBUG(fmt, ##__VA_ARGS__) /* verbose debug */ diff --git a/drivers/staging/omapdrm/omap_priv.h b/drivers/staging/omapdrm/omap_priv.h deleted file mode 100644 index ef64414..0000000 --- a/drivers/staging/omapdrm/omap_priv.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * include/drm/omap_priv.h - * - * Copyright (C) 2011 Texas Instruments - * Author: Rob Clark - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 as published by - * the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program. If not, see . - */ - -#ifndef __OMAP_PRIV_H__ -#define __OMAP_PRIV_H__ - -/* Non-userspace facing APIs - */ - -/* optional platform data to configure the default configuration of which - * pipes/overlays/CRTCs are used.. if this is not provided, then instead the - * first CONFIG_DRM_OMAP_NUM_CRTCS are used, and they are each connected to - * one manager, with priority given to managers that are connected to - * detected devices. Remaining overlays are used as video planes. This - * should be a good default behavior for most cases, but yet there still - * might be times when you wish to do something different. - */ -struct omap_kms_platform_data { - /* overlays to use as CRTCs: */ - int ovl_cnt; - const int *ovl_ids; - - /* overlays to use as video planes: */ - int pln_cnt; - const int *pln_ids; - - int mgr_cnt; - const int *mgr_ids; - - int dev_cnt; - const char **dev_names; -}; - -struct omap_drm_platform_data { - struct omap_kms_platform_data *kms_pdata; - struct omap_dmm_platform_data *dmm_pdata; -}; - -#endif /* __OMAP_DRM_H__ */