Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758211AbbBEPzN (ORCPT ); Thu, 5 Feb 2015 10:55:13 -0500 Received: from mail-vc0-f169.google.com ([209.85.220.169]:48734 "EHLO mail-vc0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757675AbbBEPzK (ORCPT ); Thu, 5 Feb 2015 10:55:10 -0500 MIME-Version: 1.0 In-Reply-To: <1422976340-30118-1-git-send-email-ykk@rock-chips.com> References: <1422975418-13302-1-git-send-email-ykk@rock-chips.com> <1422976340-30118-1-git-send-email-ykk@rock-chips.com> From: Daniel Kurtz Date: Thu, 5 Feb 2015 23:54:49 +0800 X-Google-Sender-Auth: 8MGUz3KOXhBiYcj_CcafwjgoGLw Message-ID: Subject: Re: [PATCH v3 05/15] drm: bridge/dw_hdmi: combine hdmi_set_clock_regenerator_n() and hdmi_regenerate_cts() To: Yakir Yang Cc: David Airlie , Russell King , Philipp Zabel , Fabio Estevam , Shawn Guo , Rob Clark , Mark Yao , Daniel Vetter , dri-devel , "linux-kernel@vger.kernel.org" , Arnd Bergmann , Sean Cross , Jyri Sarha , Ben Zhang , alsa-devel@alsa-project.org, Heiko Stuebner , "linux-arm-kernel@lists.infradead.org" , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , "open list:OPEN FIRMWARE AND..." , =?UTF-8?Q?Heiko_St=C3=BCbner?= , Douglas Anderson , =?UTF-8?Q?St=C3=A9phane_Marchesin?= , "open list:ARM/Rockchip SoC..." Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2379 Lines: 62 On Tue, Feb 3, 2015 at 11:12 PM, Yakir Yang wrote: > Signed-off-by: Yakir Yang Reviewed-by: Daniel Kurtz > --- > Changes in v3: > - Combine hdmi_set_clock_regenerator_n() and hdmi_regenerate_cts() > > Changes in v2: None > > drivers/gpu/drm/bridge/dw_hdmi.c | 16 ++++++---------- > 1 file changed, 6 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/dw_hdmi.c b/drivers/gpu/drm/bridge/dw_hdmi.c > index 7b5b664..262163f 100644 > --- a/drivers/gpu/drm/bridge/dw_hdmi.c > +++ b/drivers/gpu/drm/bridge/dw_hdmi.c > @@ -196,19 +196,16 @@ static void hdmi_mask_writeb(struct dw_hdmi *hdmi, u8 data, unsigned int reg, > hdmi_modb(hdmi, data << shift, mask, reg); > } > > -static void hdmi_set_clock_regenerator_n(struct dw_hdmi *hdmi, > - unsigned int value) > +static void hdmi_set_clock_regenerator(struct dw_hdmi *hdmi, > + unsigned int n, unsigned int cts) > { > - hdmi_writeb(hdmi, value & 0xff, HDMI_AUD_N1); > - hdmi_writeb(hdmi, (value >> 8) & 0xff, HDMI_AUD_N2); > - hdmi_writeb(hdmi, (value >> 16) & 0x0f, HDMI_AUD_N3); > + hdmi_writeb(hdmi, n & 0xff, HDMI_AUD_N1); > + hdmi_writeb(hdmi, (n >> 8) & 0xff, HDMI_AUD_N2); > + hdmi_writeb(hdmi, (n >> 16) & 0x0f, HDMI_AUD_N3); > > /* nshift factor = 0 */ > hdmi_modb(hdmi, 0, HDMI_AUD_CTS3_N_SHIFT_MASK, HDMI_AUD_CTS3); > -} > > -static void hdmi_regenerate_cts(struct dw_hdmi *hdmi, unsigned int cts) > -{ > /* Must be set/cleared first */ > hdmi_modb(hdmi, 0, HDMI_AUD_CTS3_CTS_MANUAL, HDMI_AUD_CTS3); > > @@ -374,8 +371,7 @@ static void hdmi_set_clk_regenerator(struct dw_hdmi *hdmi, > __func__, hdmi->sample_rate, hdmi->ratio, > pixel_clk, clk_n, clk_cts); > > - hdmi_set_clock_regenerator_n(hdmi, clk_n); > - hdmi_regenerate_cts(hdmi, clk_cts); > + hdmi_set_clock_regenerator(hdmi, clk_n, clk_cts); > } > > static void hdmi_init_clk_regenerator(struct dw_hdmi *hdmi) > -- > 2.1.2 > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/