[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1426155862.14455.19.camel@pengutronix.de>
Date: Thu, 12 Mar 2015 11:24:22 +0100
From: Philipp Zabel <p.zabel@...gutronix.de>
To: Yakir Yang <ykk@...k-chips.com>
Cc: djkurtz@...omium.org, dianders@...omium.org,
linux-rockchip@...ts.infradead.org,
David Airlie <airlied@...ux.ie>,
Russell King <rmk+kernel@....linux.org.uk>,
Andy Yan <andy.yan@...k-chips.com>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Fabio Estevam <fabio.estevam@...escale.com>,
dri-devel@...ts.freedesktop.org, linux-kernel@...r.kernel.org,
mmind00@...glemail.com, marcheu@...omium.org,
mark.yao@...k-chips.com
Subject: Re: [PATCH v4 02/15] drm: bridge/dw_hdmi: wrap irq control in
fucntions
Hi Yakir,
Am Samstag, den 28.02.2015, 21:28 -0500 schrieb Yakir Yang:
> Wrap irq control in functions, and then we can call in
> dw_hdmi_bind/dw_hdmi_unbind/dw_hdmi_resume/dw_hdmi_suspend
> functions.
>
> Signed-off-by: Yakir Yang <ykk@...k-chips.com>
[...]
> @@ -1702,17 +1722,8 @@ EXPORT_SYMBOL_GPL(dw_hdmi_unbind);
> int dw_hdmi_suspend(struct device *dev)
> {
> struct dw_hdmi *hdmi = dev_get_drvdata(dev);
> - u8 ih_mute;
> -
> - /* Disable all interrupts */
> - hdmi_writeb(hdmi, ~0, HDMI_IH_MUTE_PHY_STAT0);
> -
> - /* Disable top level interrupt bits in HDMI block */
> - ih_mute = hdmi_readb(hdmi, HDMI_IH_MUTE) |
> - HDMI_IH_MUTE_MUTE_WAKEUP_INTERRUPT |
> - HDMI_IH_MUTE_MUTE_ALL_INTERRUPT;
>
> - hdmi_writeb(hdmi, ih_mute, HDMI_IH_MUTE);
> + hdmi_mute_interrupts(hdmi);
>
> return 0;
> }
> @@ -1722,19 +1733,7 @@ int dw_hdmi_resume(struct device *dev)
> {
> struct dw_hdmi *hdmi = dev_get_drvdata(dev);
>
> - /*
> - * Configure registers related to HDMI interrupt
> - * generation before registering IRQ.
> - */
> - hdmi_writeb(hdmi, HDMI_PHY_HPD, HDMI_PHY_POL0);
> -
> - /* Clear Hotplug interrupts */
> - hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD, HDMI_IH_PHY_STAT0);
> -
> - dw_hdmi_fb_registered(hdmi);
> -
> - /* Unmute interrupts */
> - hdmi_writeb(hdmi, ~HDMI_IH_PHY_STAT0_HPD, HDMI_IH_MUTE_PHY_STAT0);
> + hdmi_unmute_interrupts(hdmi);
>
> return 0;
> }
Here you remove code added in the previous patch.
It would be better to just apply patch 2 first and then rebase patch 1
on top of it.
regards
Philipp
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists