[1/4] ASoC: SOF: rename SOUNDWIRE to ALH
diff mbox series

Message ID 20190815155032.29181-2-pierre-louis.bossart@linux.intel.com
State New
Headers show
Series
  • [1/4] ASoC: SOF: rename SOUNDWIRE to ALH
Related show

Commit Message

Pierre-Louis Bossart Aug. 15, 2019, 3:50 p.m. UTC
From: Bard liao <yung-chuan.liao@linux.intel.com>

Rename SOUNDWIRE to ALH.

Signed-off-by: Bard liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 include/sound/sof/dai.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Mark Brown Aug. 15, 2019, 5:08 p.m. UTC | #1
On Thu, Aug 15, 2019 at 10:50:29AM -0500, Pierre-Louis Bossart wrote:
> From: Bard liao <yung-chuan.liao@linux.intel.com>
>
> Rename SOUNDWIRE to ALH.

What's this patch based on, it doesn't seem to be something upstream?

Description: [1/4] ASoC: SOF: rename SOUNDWIRE to ALH
Applying: ASoC: SOF: rename SOUNDWIRE to ALH
error: sha1 information is lacking or useless (include/sound/sof/dai.h).
error: could not build fake ancestor
Patch failed at 0001 ASoC: SOF: rename SOUNDWIRE to ALH
Pierre-Louis Bossart Aug. 15, 2019, 6:30 p.m. UTC | #2
On 8/15/19 12:08 PM, Mark Brown wrote:
> On Thu, Aug 15, 2019 at 10:50:29AM -0500, Pierre-Louis Bossart wrote:
>> From: Bard liao <yung-chuan.liao@linux.intel.com>
>>
>> Rename SOUNDWIRE to ALH.
> 
> What's this patch based on, it doesn't seem to be something upstream?
> 
> Description: [1/4] ASoC: SOF: rename SOUNDWIRE to ALH
> Applying: ASoC: SOF: rename SOUNDWIRE to ALH
> error: sha1 information is lacking or useless (include/sound/sof/dai.h).
> error: could not build fake ancestor
> Patch failed at 0001 ASoC: SOF: rename SOUNDWIRE to ALH

ok so this is upstream but the patch will not apply if you didn't take 
Daniel's iMX patches, which change the same dai.h file in '[PATCH 3/3] 
ASoC: SOF: topology: Add dummy support for i.MX8 DAIs'

I'll resubmit this separately.
Pierre-Louis Bossart Aug. 15, 2019, 7:22 p.m. UTC | #3
On 8/15/19 1:30 PM, Pierre-Louis Bossart wrote:
> 
> 
> On 8/15/19 12:08 PM, Mark Brown wrote:
>> On Thu, Aug 15, 2019 at 10:50:29AM -0500, Pierre-Louis Bossart wrote:
>>> From: Bard liao <yung-chuan.liao@linux.intel.com>
>>>
>>> Rename SOUNDWIRE to ALH.
>>
>> What's this patch based on, it doesn't seem to be something upstream?
>>
>> Description: [1/4] ASoC: SOF: rename SOUNDWIRE to ALH
>> Applying: ASoC: SOF: rename SOUNDWIRE to ALH
>> error: sha1 information is lacking or useless (include/sound/sof/dai.h).
>> error: could not build fake ancestor
>> Patch failed at 0001 ASoC: SOF: rename SOUNDWIRE to ALH
> 
> ok so this is upstream but the patch will not apply if you didn't take 
> Daniel's iMX patches, which change the same dai.h file in '[PATCH 3/3] 
> ASoC: SOF: topology: Add dummy support for i.MX8 DAIs'
> 
> I'll resubmit this separately

Just resent a separate set of patches which combine i.MX8 and intel new 
DAI definitions. Putting them in different series was a mistake in 
hindsight since the same files are changed, sorry about that.

Patch
diff mbox series

diff --git a/include/sound/sof/dai.h b/include/sound/sof/dai.h
index 7a84f7fb460a..6b296df242bd 100644
--- a/include/sound/sof/dai.h
+++ b/include/sound/sof/dai.h
@@ -49,7 +49,7 @@  enum sof_ipc_dai_type {
 	SOF_DAI_INTEL_SSP,		/**< Intel SSP */
 	SOF_DAI_INTEL_DMIC,		/**< Intel DMIC */
 	SOF_DAI_INTEL_HDA,		/**< Intel HD/A */
-	SOF_DAI_INTEL_SOUNDWIRE,	/**< Intel SoundWire */
+	SOF_DAI_INTEL_ALH,		/**< Intel ALH  */
 	SOF_DAI_IMX_SAI,		/**< i.MX SAI */
 	SOF_DAI_IMX_ESAI,		/**< i.MX ESAI */
 };