From patchwork Thu Jul 14 09:00:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 9229457 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E4FD06075D for ; Thu, 14 Jul 2016 09:03:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D314725D99 for ; Thu, 14 Jul 2016 09:03:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C5D3B28178; Thu, 14 Jul 2016 09:03:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 861CE25D99 for ; Thu, 14 Jul 2016 09:03:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A3B156E0B2; Thu, 14 Jul 2016 09:03:30 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 02A376E0B2 for ; Thu, 14 Jul 2016 09:03:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 205E520384; Thu, 14 Jul 2016 09:03:23 +0000 (UTC) Received: from localhost.localdomain (unknown [180.106.221.196]) (using TLSv1.2 with cipher AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 23A2120381; Thu, 14 Jul 2016 09:03:20 +0000 (UTC) From: Shawn Guo To: David Airlie Subject: [PATCH] drm/edid: move DDC_SEGMENT_ADDR into drm_edid.h Date: Thu, 14 Jul 2016 17:00:28 +0800 Message-Id: <1468486828-29293-1-git-send-email-shawnguo@kernel.org> X-Mailer: git-send-email 1.9.1 X-Virus-Scanned: ClamAV using ClamSMTP Cc: Shawn Guo , dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 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-Virus-Scanned: ClamAV using ClamSMTP The same definition of DDC_SEGMENT_ADDR is currently defined in two places, drm_edid.c and inno_hdmi.h. Let's consolidate the definition into drm_edid.h in the same way that DDC_ADDR is defined. Signed-off-by: Shawn Guo --- drivers/gpu/drm/drm_edid.c | 1 - drivers/gpu/drm/rockchip/inno_hdmi.h | 2 -- include/drm/drm_edid.h | 1 + 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 7df26d4b7ad8..9d6735b68152 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -1191,7 +1191,6 @@ bool drm_edid_is_valid(struct edid *edid) } EXPORT_SYMBOL(drm_edid_is_valid); -#define DDC_SEGMENT_ADDR 0x30 /** * drm_do_probe_ddc_edid() - get EDID information via I2C * @data: I2C device adapter diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.h b/drivers/gpu/drm/rockchip/inno_hdmi.h index aa7c415f8cc1..b27b30934c7e 100644 --- a/drivers/gpu/drm/rockchip/inno_hdmi.h +++ b/drivers/gpu/drm/rockchip/inno_hdmi.h @@ -16,8 +16,6 @@ #ifndef __INNO_HDMI_H__ #define __INNO_HDMI_H__ -#define DDC_SEGMENT_ADDR 0x30 - enum PWR_MODE { NORMAL, LOWER_PWR, diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h index 919933d1beb4..7ee78d5c9252 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h @@ -26,6 +26,7 @@ #include #define EDID_LENGTH 128 +#define DDC_SEGMENT_ADDR 0x30 #define DDC_ADDR 0x50 #define DDC_ADDR2 0x52 /* E-DDC 1.2 - where DisplayID can hide */