ARM: SAMSUNG: Fix build of I2S driver

Commit 48a2050d36f0da5a7d22e3bd7dbf3bf8a5a538bc (ARM: SAMSUNG: Delete the unnecessary variable) removed the src_clk field from the platform data header for the I2S driver without a corresponding change having been made in the I2S driver to stop using the field, causing build breaks.

This change should not be being made independently of removal of the uses of the field since it will cause build failures in any tree where it has been merged but the removals have not been merged. Currently the removal of the users in the ASoC driver has not been merged.

Signed-off-by Mark Brown <[email protected]>

---
 include/linux/platform_data/asoc-s3c.h |    6 ++++++
 1 file changed, 6 insertions(+)

include/linux/platform_data/asoc-s3c.h +6 -1

index 8827259..aa9875f 100644
@@ -38,6 +38,12 @@ struct samsung_i2s {
 #define QUIRK_NEED_RSTCLR	(1 << 3)
 	/* Quirks of the I2S controller */
 	u32 quirks;
+
+	/*
+	 * Array of clock names that can be used to generate I2S signals.
+	 * Also corresponds to clocks of I2SMOD[10]
+	 */
+	const char **src_clk;
 	dma_addr_t idma_addr;
 };
 
--

1.7.10.4

I checked Samsung audio driver stuff just now. If you don't mind, I will drop the patch 48a2050d ("ARM: SAMSUNG: Delete the unnecessary variable") instead of applying this.

If any unprepared patches for Samsung audio in my tree, please let me know.

Quoted 3 lines · Kukjin Kim

I checked Samsung audio driver stuff just now. If you don't mind, I will drop the patch 48a2050d ("ARM: SAMSUNG: Delete the unnecessary variable") instead of applying this.

That works just as well for me, thanks. Padma, as I said in the commit log this should be done as part of a single patch series rather than sending separately to ARM or ASoC so that both trees continue to build at each point.

Quoted 2 lines

If any unprepared patches for Samsung audio in my tree, please let me know.

Will do.

Quoted 2 lines · Kukjin Kim

I checked Samsung audio driver stuff just now. If you don't mind, I will drop the patch 48a2050d ("ARM: SAMSUNG: Delete the unnecessary

Quoted 1 line

instead of applying this.

That works just as well for me, thanks. Padma, as I said in the commit log this should be done as part of a single patch series rather than sending separately to ARM or ASoC so that both trees continue to build at each point.

Quoted 1 line

If any unprepared patches for Samsung audio in my tree, please let me

know.

Will do.

Mark, I'm holding on Padma's changes for Samsung audio.

If any updates about this from your side?

Is it ok to send current next/audio-samsung in my tree to upstream for v3.8?