From patchwork Sun Mar 1 02:35:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yakir Yang X-Patchwork-Id: 5906681 Return-Path: X-Original-To: patchwork-linux-rockchip@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 020EEBF440 for ; Sun, 1 Mar 2015 02:38:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CEDB72028D for ; Sun, 1 Mar 2015 02:38:32 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E102A2021B for ; Sun, 1 Mar 2015 02:38:31 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YRtm3-0002fh-1X; Sun, 01 Mar 2015 02:38:31 +0000 Received: from regular1.263xmail.com ([211.150.99.137]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YRtlz-0002cW-Ra for linux-rockchip@lists.infradead.org; Sun, 01 Mar 2015 02:38:29 +0000 Received: from ykk?rock-chips.com (unknown [192.168.167.12]) by regular1.263xmail.com (Postfix) with SMTP id 9DD086DE0; Sun, 1 Mar 2015 10:37:57 +0800 (CST) X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-ADDR-CHECKED: 0 Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.263.net (Postfix) with ESMTP id 5C37C392; Sun, 1 Mar 2015 10:37:55 +0800 (CST) X-RL-SENDER: ykk@rock-chips.com X-FST-TO: djkurtz@chromium.org X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: ykk@rock-chips.com X-UNIQUE-TAG: <38b2b764b47b41ecd959033eb744793e> X-ATTACHMENT-NUM: 0 X-SENDER: ykk@rock-chips.com X-DNS-TYPE: 0 Received: from localhost.localdomain (unknown [58.22.7.114]) by smtp.263.net (Postfix) whith ESMTP id 9677ZOWPB5; Sun, 01 Mar 2015 10:37:56 +0800 (CST) From: Yakir Yang To: djkurtz@chromium.org, dianders@chromium.org, linux-rockchip@lists.infradead.org Subject: [PATCH v4 04/15] drm: bridge/dw_hdmi: add identification registers parse and record Date: Sat, 28 Feb 2015 21:35:59 -0500 Message-Id: <1425177359-1918-1-git-send-email-ykk@rock-chips.com> X-Mailer: git-send-email 2.1.2 In-Reply-To: <1425175834-24661-1-git-send-email-ykk@rock-chips.com> References: <1425175834-24661-1-git-send-email-ykk@rock-chips.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150228_183828_878079_F42D5A80 X-CRM114-Status: UNSURE ( 6.57 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) Cc: Fabio Estevam , mmind00@googlemail.com, marcheu@chromium.org, David Airlie , Greg Kroah-Hartman , Yakir Yang , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Philipp Zabel , Andy Yan , Russell King , mark.yao@rock-chips.com X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_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 By parsing the identification registers we can know what functions are present on the hdmi ip. Signed-off-by: Yakir Yang --- Changes in v4: -Correct phy_type assignment bug Changes in v3: - Add ID registers parse and record Changes in v2: None drivers/gpu/drm/bridge/dw_hdmi.c | 59 ++++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/bridge/dw_hdmi.h | 23 ++++++++++++++++ 2 files changed, 82 insertions(+) diff --git a/drivers/gpu/drm/bridge/dw_hdmi.c b/drivers/gpu/drm/bridge/dw_hdmi.c index 08f10da..937beed 100644 --- a/drivers/gpu/drm/bridge/dw_hdmi.c +++ b/drivers/gpu/drm/bridge/dw_hdmi.c @@ -79,6 +79,23 @@ static const u16 csc_coeff_rgb_in_eitu709[3][4] = { { 0x6756, 0x78ab, 0x2000, 0x0200 } }; +struct hdmi_id { + u8 design; + u8 revision; + + bool prepen; + bool audspdif; + bool audi2s; + bool hdmi14; + bool csc; + bool hdcp; + bool hdmi20; + bool confapb; + bool ahbauddma; + bool gpaud; + u8 phy_type; +}; + struct hdmi_vmode { bool mdvi; bool mhsyncpolarity; @@ -111,6 +128,8 @@ struct dw_hdmi { struct clk *isfr_clk; struct clk *iahb_clk; + struct hdmi_id id; + struct hdmi_data_info hdmi_data; const struct dw_hdmi_plat_data *plat_data; @@ -1259,6 +1278,36 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, struct drm_display_mode *mode) return 0; } +static void hdmi_parse_id(struct dw_hdmi *hdmi) +{ + u8 config0_id, config1_id, config2_id, config3_id; + + config0_id = hdmi_readb(hdmi, HDMI_CONFIG0_ID); + config1_id = hdmi_readb(hdmi, HDMI_CONFIG1_ID); + config2_id = hdmi_readb(hdmi, HDMI_CONFIG2_ID); + config3_id = hdmi_readb(hdmi, HDMI_CONFIG3_ID); + + hdmi->id.prepen = config0_id & HDMI_CONFIG0_ID_PREPEN ? true : false; + hdmi->id.audi2s = config0_id & HDMI_CONFIG0_ID_AUDI2S ? true : false; + hdmi->id.hdmi14 = config0_id & HDMI_CONFIG0_ID_HDMI14 ? true : false; + hdmi->id.hdcp = config0_id & HDMI_CONFIG0_ID_HDCP ? true : false; + hdmi->id.csc = config0_id & HDMI_CONFIG0_ID_CSC ? true : false; + hdmi->id.audspdif = config0_id & HDMI_CONFIG0_ID_AUDSPDIF ? + true : false; + + hdmi->id.confapb = config1_id & HDMI_CONFIG1_ID_CONFAPB ? true : false; + hdmi->id.hdmi20 = config1_id & HDMI_CONFIG1_ID_HDMI20 ? true : false; + + hdmi->id.phy_type = config2_id; + + hdmi->id.gpaud = config3_id & HDMI_CONFIG3_ID_GPAUD ? true : false; + hdmi->id.ahbauddma = config3_id & HDMI_CONFIG3_ID_AHBAUDDMA ? + true : false; + + hdmi->id.design = hdmi_readb(hdmi, HDMI_DESIGN_ID); + hdmi->id.revision = hdmi_readb(hdmi, HDMI_REVISION_ID); +} + /* Wait until we are registered to enable interrupts */ static int dw_hdmi_fb_registered(struct dw_hdmi *hdmi) { @@ -1670,6 +1719,16 @@ int dw_hdmi_bind(struct device *dev, struct device *master, hdmi_readb(hdmi, HDMI_PRODUCT_ID0), hdmi_readb(hdmi, HDMI_PRODUCT_ID1)); + /* Config IDs */ + dev_info(dev, + "Detected HDMI config_id 0x%x:0x%x:0x%x:0x%x\n", + hdmi_readb(hdmi, HDMI_CONFIG0_ID), + hdmi_readb(hdmi, HDMI_CONFIG1_ID), + hdmi_readb(hdmi, HDMI_CONFIG2_ID), + hdmi_readb(hdmi, HDMI_CONFIG3_ID)); + + hdmi_parse_id(hdmi); + initialize_hdmi_ih_mutes(hdmi); ret = devm_request_threaded_irq(dev, irq, dw_hdmi_hardirq, diff --git a/drivers/gpu/drm/bridge/dw_hdmi.h b/drivers/gpu/drm/bridge/dw_hdmi.h index 175dbc8..e4ba634 100644 --- a/drivers/gpu/drm/bridge/dw_hdmi.h +++ b/drivers/gpu/drm/bridge/dw_hdmi.h @@ -545,6 +545,29 @@ #define HDMI_I2CM_FS_SCL_LCNT_0_ADDR 0x7E12 enum { +/* HDMI_CONFIG0_ID */ + HDMI_CONFIG0_ID_PREPEN = 0x80, + HDMI_CONFIG0_ID_AUDSPDIF = 0x20, + HDMI_CONFIG0_ID_AUDI2S = 0x10, + HDMI_CONFIG0_ID_HDMI14 = 0x08, + HDMI_CONFIG0_ID_CSC = 0x04, + HDMI_CONFIG0_ID_HDCP = 0x01, + +/* HDMI_CONFIG1_ID */ + HDMI_CONFIG1_ID_HDMI20 = 0x20, + HDMI_CONFIG1_ID_CONFAPB = 0x02, + +/* HDMI_CONFIG2_ID */ + HDMI_CONFIG2_ID_PHY_GEN2 = 0xf2, + HDMI_CONFIG2_ID_PHY_GEN2_HECA = 0xe2, + HDMI_CONFIG2_ID_PHY_HDMI_MHL = 0xc2, + HDMI_CONFIG2_ID_PHY_HDMI_MHL_HECA = 0xb2, + HDMI_CONFIG2_ID_LEGACY_PHY = 0x00, + +/* HDMI_CONFIG3_ID */ + HDMI_CONFIG3_ID_AHBAUDDMA = 0x02, + HDMI_CONFIG3_ID_GPAUD = 0x01, + /* IH_FC_INT2 field values */ HDMI_IH_FC_INT2_OVERFLOW_MASK = 0x03, HDMI_IH_FC_INT2_LOW_PRIORITY_OVERFLOW = 0x02,