From patchwork Fri Jan 25 09:55:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 16468 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1Tyg9A-0001NF-Rd; Fri, 25 Jan 2013 11:04:32 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-4) with esmtp id 1Tyg99-0003C2-Cn; Fri, 25 Jan 2013 11:04:32 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755930Ab3AYKEU (ORCPT + 1 other); Fri, 25 Jan 2013 05:04:20 -0500 Received: from mail-pb0-f45.google.com ([209.85.160.45]:49063 "EHLO mail-pb0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754902Ab3AYKEQ (ORCPT ); Fri, 25 Jan 2013 05:04:16 -0500 Received: by mail-pb0-f45.google.com with SMTP id rq13so127905pbb.32 for ; Fri, 25 Jan 2013 02:04:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=fQH0zmSh5SZQkksVqOaISdUQlrBv95+hHOQzn1cmIzo=; b=IAGd/hmDAuoCoN0Rt7sFIg6cdfAPRDZdY0CvNTv04ToJDHGElaXr8dBX5MVZm9Lcf/ 78D7+OUX/QOnBpifrRfJ/Z0WmBT9PmZU1KSqgxYzlHfwODmB09HU2uRKKpZ2bNLjBuP+ BEfSAd/CVCPXA3H33QXbtnOLz1GLuPh82BlxT0vao8tUEcAlVcOTiBXK/atcsTgdtMFz Wqp1a28J0ecQCbPwyN2fRtQ0oS/3hFY7GcEqhYgXD2Eh4L4qhyw/37/4JrdehgfmaWt0 LlY1rGds5f3/Fgg4YeCSaxYP5b46UNIArSjN4l+ZjQr0e+4L33gkEzGqvqhT+6gwNb8g lcNA== X-Received: by 10.68.236.97 with SMTP id ut1mr12671832pbc.164.1359108255841; Fri, 25 Jan 2013 02:04:15 -0800 (PST) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id y9sm603085paw.1.2013.01.25.02.04.12 (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 25 Jan 2013 02:04:15 -0800 (PST) From: Sachin Kamat To: linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, devicetree-discuss@lists.ozlabs.org Cc: k.debski@samsung.com, inki.dae@samsung.com, sachin.kamat@linaro.org, ajaykumar.rs@samsung.com, patches@linaro.org, s.nawrocki@samsung.com Subject: [PATCH 1/2] [media] s5p-g2d: Add DT based discovery support Date: Fri, 25 Jan 2013 15:25:21 +0530 Message-Id: <1359107722-9974-1-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.4.1 X-Gm-Message-State: ALoCoQn/xZ8EbKzo0uWwEtofMqVC/3ZkUcuvKbB3AhkXleX/VOlth810QYVKiiCqUiV6ogWDWpvP Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2013.1.25.95418 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1700_1799 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __SXL_RIP_ERROR_SERVFAIL , __SXL_SIG_ERROR_SERVFAIL , __SXL_URI_ERROR_SERVFAIL , __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' This patch adds device tree based discovery support to G2D driver Signed-off-by: Sachin Kamat --- drivers/media/platform/s5p-g2d/g2d.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/drivers/media/platform/s5p-g2d/g2d.c b/drivers/media/platform/s5p-g2d/g2d.c index 7e41529..210e142 100644 --- a/drivers/media/platform/s5p-g2d/g2d.c +++ b/drivers/media/platform/s5p-g2d/g2d.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include @@ -796,7 +797,8 @@ static int g2d_probe(struct platform_device *pdev) } def_frame.stride = (def_frame.width * def_frame.fmt->depth) >> 3; - dev->variant = g2d_get_drv_data(pdev); + if (!pdev->dev.of_node) + dev->variant = g2d_get_drv_data(pdev); return 0; @@ -844,6 +846,18 @@ static struct g2d_variant g2d_drvdata_v4x = { .hw_rev = TYPE_G2D_4X, /* Revision 4.1 for Exynos4X12 and Exynos5 */ }; +static const struct of_device_id exynos_g2d_match[] = { + { + .compatible = "samsung,g2d-v3", + .data = &g2d_drvdata_v3x, + }, { + .compatible = "samsung,g2d-v41", + .data = &g2d_drvdata_v4x, + }, + {}, +}; +MODULE_DEVICE_TABLE(of, exynos_g2d_match); + static struct platform_device_id g2d_driver_ids[] = { { .name = "s5p-g2d", @@ -863,6 +877,7 @@ static struct platform_driver g2d_pdrv = { .driver = { .name = G2D_NAME, .owner = THIS_MODULE, + .of_match_table = of_match_ptr(exynos_g2d_match), }, };