From patchwork Tue Mar 25 11:04:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Francois Moine X-Patchwork-Id: 3887271 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8FE5B9F2E8 for ; Tue, 25 Mar 2014 11:07:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BBEF4201F5 for ; Tue, 25 Mar 2014 11:07:40 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id E0C232020E for ; Tue, 25 Mar 2014 11:07:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3D96589A4F; Tue, 25 Mar 2014 04:07:38 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from smtp6-g21.free.fr (smtp6-g21.free.fr [212.27.42.6]) by gabe.freedesktop.org (Postfix) with ESMTP id BDE0089A4F for ; Tue, 25 Mar 2014 04:07:35 -0700 (PDT) Received: from localhost (unknown [IPv6:2a01:e35:2f5c:9de0:212:bfff:fe1e:9ce4]) by smtp6-g21.free.fr (Postfix) with ESMTP id 6C4C682289; Tue, 25 Mar 2014 12:07:24 +0100 (CET) X-Mailbox-Line: From b3089323c2b69e7860fc4997f3b59e0b2db67314 Mon Sep 17 00:00:00 2001 From: Jean-Francois Moine Date: Tue, 25 Mar 2014 12:04:15 +0100 Subject: [PATCH v4] drm/i2c: tda998x: Deprecate "nxp,tda998x" in favour of "nxp,tda9989" To: dri-devel@lists.freedesktop.org, Russell King - ARM Linux Message-Id: <20140325110725.6C4C682289@smtp6-g21.free.fr> Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The tda998x driver accepts only 3 chips from the TDA998x family. To avoid confusion with the other TDA998x chips, this patch changes the driver compatible string to "nxp,tda9989". As the previous compatible string is not used in any DT, no compatibility is offered. Signed-off-by: Jean-Francois Moine --- v4: - the armada and tilcdc DRM drivers are impacted v3: - fix the I2C ID (the OF compatible is not used for such drivers) - define only one compatible (Sebastian Hesselbarth) - change the subject (Sebastian Hesselbarth) v2: - change the subject to drm/i2c This patch applies after drm/i2c: tda998x: Fix lack of required reg in DT documentation --- Documentation/devicetree/bindings/drm/i2c/tda998x.txt | 4 ++-- drivers/gpu/drm/armada/armada_drv.c | 2 +- drivers/gpu/drm/i2c/tda998x_drv.c | 4 ++-- drivers/gpu/drm/tilcdc/tilcdc_slave.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentation/devicetree/bindings/drm/i2c/tda998x.txt b/Documentation/devicetree/bindings/drm/i2c/tda998x.txt index e9e4bce..9b41c7e 100644 --- a/Documentation/devicetree/bindings/drm/i2c/tda998x.txt +++ b/Documentation/devicetree/bindings/drm/i2c/tda998x.txt @@ -1,7 +1,7 @@ Device-Tree bindings for the NXP TDA998x HDMI transmitter Required properties; - - compatible: must be "nxp,tda998x" + - compatible: must be "nxp,tda9989" - reg: I2C address @@ -20,7 +20,7 @@ Optional properties: Example: tda998x: hdmi-encoder { - compatible = "nxp,tda998x"; + compatible = "nxp,tda9989"; reg = <0x70>; interrupt-parent = <&gpio0>; interrupts = <27 2>; /* falling edge */ diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c index acf3a36..d949279 100644 --- a/drivers/gpu/drm/armada/armada_drv.c +++ b/drivers/gpu/drm/armada/armada_drv.c @@ -45,7 +45,7 @@ static const struct armada_drm_slave_config tda19988_config = { .polled = DRM_CONNECTOR_POLL_CONNECT | DRM_CONNECTOR_POLL_DISCONNECT, .interlace_allowed = true, .info = { - .type = "tda998x", + .type = "tda9989", .addr = 0x70, .platform_data = ¶ms, }, diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c index 48af5ca..249ef84 100644 --- a/drivers/gpu/drm/i2c/tda998x_drv.c +++ b/drivers/gpu/drm/i2c/tda998x_drv.c @@ -1367,14 +1367,14 @@ fail: #ifdef CONFIG_OF static const struct of_device_id tda998x_dt_ids[] = { - { .compatible = "nxp,tda998x", }, + { .compatible = "nxp,tda9989", }, { } }; MODULE_DEVICE_TABLE(of, tda998x_dt_ids); #endif static struct i2c_device_id tda998x_ids[] = { - { "tda998x", 0 }, + { "tda9989", 0 }, { } }; MODULE_DEVICE_TABLE(i2c, tda998x_ids); diff --git a/drivers/gpu/drm/tilcdc/tilcdc_slave.c b/drivers/gpu/drm/tilcdc/tilcdc_slave.c index 595068b..eadfed7 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_slave.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_slave.c @@ -112,7 +112,7 @@ static const struct drm_encoder_helper_funcs slave_encoder_helper_funcs = { }; static const struct i2c_board_info info = { - I2C_BOARD_INFO("tda998x", 0x70) + I2C_BOARD_INFO("tda9989", 0x70) }; static struct drm_encoder *slave_encoder_create(struct drm_device *dev,