From: Ricardo Neri <ricardo.neri@ti.com>
To: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: mythripk@ti.com, s-chereau@ti.com, x0055901@ti.com,
vaibhav.bedia@ti.com, s-guiriec@ti.com, lrg@ti.com,
peter.ujfalusi@ti.com, agraf@suse.de, research@ottomaneng.com,
linux-omap@vger.kernel.org
Subject: Re: [PATCH 05/10] OMAPDSS: HDMI: Decouple HDMI audio from ASoC
Date: Tue, 24 Apr 2012 22:44:13 -0500 [thread overview]
Message-ID: <4F97730D.7020707@ti.com> (raw)
In-Reply-To: <1335187509.1535.37.camel@lappy>
On 04/23/2012 08:25 AM, Tomi Valkeinen wrote:
> On Wed, 2012-03-28 at 16:38 -0600, Ricardo Neri wrote:
>> Instead of having OMAPDSS HDMI audio functionality depending on the
>> ASoC HDMI audio driver, use a new config option so that
>> potential users, including ASoC, may select if needed.
>>
>> Signed-off-by: Ricardo Neri<ricardo.neri@ti.com>
>> ---
>> drivers/video/omap2/dss/Kconfig | 4 ++++
>> drivers/video/omap2/dss/dss_features.c | 3 +--
>> drivers/video/omap2/dss/ti_hdmi.h | 6 ++----
>> drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c | 3 +--
>> drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h | 5 +----
>> 5 files changed, 9 insertions(+), 12 deletions(-)
>>
>> diff --git a/drivers/video/omap2/dss/Kconfig b/drivers/video/omap2/dss/Kconfig
>> index 7be7c06..b492001 100644
>> --- a/drivers/video/omap2/dss/Kconfig
>> +++ b/drivers/video/omap2/dss/Kconfig
>> @@ -68,6 +68,10 @@ config OMAP4_DSS_HDMI
>> HDMI Interface. This adds the High Definition Multimedia Interface.
>> See http://www.hdmi.org/ for HDMI specification.
>>
>> +config OMAP4_DSS_HDMI_AUDIO
>> + bool
>> + depends on OMAP4_DSS_HDMI
>> +
>> config OMAP2_DSS_SDI
>> bool "SDI support"
>> depends on ARCH_OMAP3
>> diff --git a/drivers/video/omap2/dss/dss_features.c b/drivers/video/omap2/dss/dss_features.c
>> index c1839e2..399a28a 100644
>> --- a/drivers/video/omap2/dss/dss_features.c
>> +++ b/drivers/video/omap2/dss/dss_features.c
>> @@ -497,8 +497,7 @@ static const struct ti_hdmi_ip_ops omap4_hdmi_functions = {
>> .dump_core = ti_hdmi_4xxx_core_dump,
>> .dump_pll = ti_hdmi_4xxx_pll_dump,
>> .dump_phy = ti_hdmi_4xxx_phy_dump,
>> -#if defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI) || \
>> - defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI_MODULE)
>> +#if defined(CONFIG_OMAP4_DSS_HDMI_AUDIO)
>> .audio_enable = ti_hdmi_4xxx_wp_audio_enable,
>> .audio_start = ti_hdmi_4xxx_audio_start,
>> #endif
>> diff --git a/drivers/video/omap2/dss/ti_hdmi.h b/drivers/video/omap2/dss/ti_hdmi.h
>> index 529e227..211da6f 100644
>> --- a/drivers/video/omap2/dss/ti_hdmi.h
>> +++ b/drivers/video/omap2/dss/ti_hdmi.h
>> @@ -110,8 +110,7 @@ struct ti_hdmi_ip_ops {
>>
>> void (*dump_phy)(struct hdmi_ip_data *ip_data, struct seq_file *s);
>>
>> -#if defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI) || \
>> - defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI_MODULE)
>> +#if defined(CONFIG_OMAP4_DSS_HDMI_AUDIO)
>> void (*audio_enable)(struct hdmi_ip_data *ip_data, bool start);
>>
>> void (*audio_start)(struct hdmi_ip_data *ip_data, bool start);
>> @@ -145,8 +144,7 @@ void ti_hdmi_4xxx_wp_dump(struct hdmi_ip_data *ip_data, struct seq_file *s);
>> void ti_hdmi_4xxx_pll_dump(struct hdmi_ip_data *ip_data, struct seq_file *s);
>> void ti_hdmi_4xxx_core_dump(struct hdmi_ip_data *ip_data, struct seq_file *s);
>> void ti_hdmi_4xxx_phy_dump(struct hdmi_ip_data *ip_data, struct seq_file *s);
>> -#if defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI) || \
>> - defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI_MODULE)
>> +#if defined(CONFIG_OMAP4_DSS_HDMI_AUDIO)
>> void ti_hdmi_4xxx_wp_audio_enable(struct hdmi_ip_data *ip_data, bool enable);
>> void ti_hdmi_4xxx_audio_start(struct hdmi_ip_data *ip_data, bool enable);
>> #endif
>> diff --git a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c b/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c
>> index e6fa61d..e06139a 100644
>> --- a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c
>> +++ b/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c
>> @@ -1030,8 +1030,7 @@ void ti_hdmi_4xxx_phy_dump(struct hdmi_ip_data *ip_data, struct seq_file *s)
>> DUMPPHY(HDMI_TXPHY_PAD_CFG_CTRL);
>> }
>>
>> -#if defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI) || \
>> - defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI_MODULE)
>> +#if defined(CONFIG_OMAP4_DSS_HDMI_AUDIO)
>> void hdmi_wp_audio_config_format(struct hdmi_ip_data *ip_data,
>> struct hdmi_audio_format *aud_fmt)
>> {
>> diff --git a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h b/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h
>> index 9fa5cb1..222cc16 100644
>> --- a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h
>> +++ b/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h
>> @@ -26,8 +26,6 @@
>> #include "ti_hdmi.h"
>> #if defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI) || \
>> defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI_MODULE)
>> -#include<sound/soc.h>
>> -#include<sound/pcm_params.h>
>
> Unrelated change. And... is there something wrong with this? Shouldn't
> the defines above be changed?
Yes. The defines should have changed. I will also remove the #includes
in a separate patch.
BR,
Ricardo
>
> Tomi
next prev parent reply other threads:[~2012-04-25 3:44 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-28 22:38 [PATCH 00/10] OMAPDSS: HDMI: Prepare for OMAP5 and DSS dev driver audio support Ricardo Neri
2012-03-28 22:38 ` [PATCH 01/10] OMAPDSS: HDMI: Remove ASoC codec Ricardo Neri
2012-04-23 13:17 ` Tomi Valkeinen
2012-04-25 2:27 ` Ricardo Neri
2012-03-28 22:38 ` [PATCH 02/10] OMAPDSS: HDMI: OMAP4: Remove CEA-861 audio infoframe and IEC-60958 enums Ricardo Neri
2012-04-23 13:12 ` Tomi Valkeinen
2012-04-25 3:37 ` Ricardo Neri
2012-04-27 1:32 ` Ricardo Neri
2012-04-27 6:31 ` Tomi Valkeinen
2012-03-28 22:38 ` [PATCH 03/10] OMAPDSS: HDMI: OMAP4: Correcty typo in I2S definitions Ricardo Neri
2012-04-23 12:42 ` Tomi Valkeinen
2012-04-25 3:39 ` Ricardo Neri
2012-03-28 22:38 ` [PATCH 04/10] OMAPDSS: HDMI: OMAP4: Decouple wrapper enable and audio start Ricardo Neri
2012-03-28 22:38 ` [PATCH 05/10] OMAPDSS: HDMI: Decouple HDMI audio from ASoC Ricardo Neri
2012-04-23 13:25 ` Tomi Valkeinen
2012-04-25 3:44 ` Ricardo Neri [this message]
2012-03-28 22:38 ` [PATCH 06/10] OMAPDSS: HDMI: OMAP4: Expand configuration for IEC-60958 audio Ricardo Neri
2012-03-28 22:38 ` [PATCH 07/10] OMAPDSS: HDMI: Relocate N/CTS calculation Ricardo Neri
2012-03-28 22:38 ` [PATCH 08/10] OMAPDSS: HDMI: Add support for more audio sample rates in " Ricardo Neri
2012-03-28 22:38 ` [PATCH 09/10] OMAPDSS: HDMI: OMAP4: Add an audio configuration function Ricardo Neri
2012-03-28 22:38 ` [PATCH 10/10] OMAPDSS: HDMI: Implement DSS driver interface for audio Ricardo Neri
2012-04-23 13:01 ` Tomi Valkeinen
2012-04-25 4:48 ` Ricardo Neri
2012-04-25 6:19 ` Tomi Valkeinen
2012-04-25 23:01 ` Ricardo Neri
2012-04-26 7:31 ` Tomi Valkeinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F97730D.7020707@ti.com \
--to=ricardo.neri@ti.com \
--cc=agraf@suse.de \
--cc=linux-omap@vger.kernel.org \
--cc=lrg@ti.com \
--cc=mythripk@ti.com \
--cc=peter.ujfalusi@ti.com \
--cc=research@ottomaneng.com \
--cc=s-chereau@ti.com \
--cc=s-guiriec@ti.com \
--cc=tomi.valkeinen@ti.com \
--cc=vaibhav.bedia@ti.com \
--cc=x0055901@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.