* [PATCH] ARM: SAMSUNG: Fix build of I2S driver
@ 2012-11-26 15:40 Mark Brown
2012-11-27 0:33 ` Kukjin Kim
0 siblings, 1 reply; 6+ messages in thread
From: Mark Brown @ 2012-11-26 15:40 UTC (permalink / raw)
To: linux-arm-kernel
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 <broonie@opensource.wolfsonmicro.com>
---
include/linux/platform_data/asoc-s3c.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/include/linux/platform_data/asoc-s3c.h b/include/linux/platform_data/asoc-s3c.h
index 8827259..aa9875f 100644
--- a/include/linux/platform_data/asoc-s3c.h
+++ b/include/linux/platform_data/asoc-s3c.h
@@ -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
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] ARM: SAMSUNG: Fix build of I2S driver
2012-11-26 15:40 [PATCH] ARM: SAMSUNG: Fix build of I2S driver Mark Brown
@ 2012-11-27 0:33 ` Kukjin Kim
2012-11-27 6:43 ` Mark Brown
0 siblings, 1 reply; 6+ messages in thread
From: Kukjin Kim @ 2012-11-27 0:33 UTC (permalink / raw)
To: linux-arm-kernel
Mark Brown wrote:
>
> 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 <broonie@opensource.wolfsonmicro.com>
> ---
> include/linux/platform_data/asoc-s3c.h | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/include/linux/platform_data/asoc-s3c.h
> b/include/linux/platform_data/asoc-s3c.h
> index 8827259..aa9875f 100644
> --- a/include/linux/platform_data/asoc-s3c.h
> +++ b/include/linux/platform_data/asoc-s3c.h
> @@ -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.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH] ARM: SAMSUNG: Fix build of I2S driver
2012-11-27 0:33 ` Kukjin Kim
@ 2012-11-27 6:43 ` Mark Brown
2012-11-27 7:35 ` Padma Venkat
2012-11-30 11:00 ` Kukjin Kim
0 siblings, 2 replies; 6+ messages in thread
From: Mark Brown @ 2012-11-27 6:43 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2012 at 09:33:43AM +0900, Kukjin Kim wrote:
> 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.
> If any unprepared patches for Samsung audio in my tree, please let me know.
Will do.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20121127/5cc18e82/attachment.sig>
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH] ARM: SAMSUNG: Fix build of I2S driver
2012-11-27 6:43 ` Mark Brown
@ 2012-11-27 7:35 ` Padma Venkat
2012-11-30 11:00 ` Kukjin Kim
1 sibling, 0 replies; 6+ messages in thread
From: Padma Venkat @ 2012-11-27 7:35 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 27, 2012 at 12:13 PM, Mark Brown
<broonie@opensource.wolfsonmicro.com> wrote:
> On Tue, Nov 27, 2012 at 09:33:43AM +0900, Kukjin Kim wrote:
>
>> 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.
Ok. I will send as a single patch.
>
>> If any unprepared patches for Samsung audio in my tree, please let me know.
>
> Will do.
Thanks
Padma
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH] ARM: SAMSUNG: Fix build of I2S driver
2012-11-27 6:43 ` Mark Brown
2012-11-27 7:35 ` Padma Venkat
@ 2012-11-30 11:00 ` Kukjin Kim
2012-12-01 14:05 ` Mark Brown
1 sibling, 1 reply; 6+ messages in thread
From: Kukjin Kim @ 2012-11-30 11:00 UTC (permalink / raw)
To: linux-arm-kernel
Mark Brown wrote:
>
> On Tue, Nov 27, 2012 at 09:33:43AM +0900, Kukjin Kim wrote:
>
> > 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.
>
> > 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?
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-12-01 14:05 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-26 15:40 [PATCH] ARM: SAMSUNG: Fix build of I2S driver Mark Brown
2012-11-27 0:33 ` Kukjin Kim
2012-11-27 6:43 ` Mark Brown
2012-11-27 7:35 ` Padma Venkat
2012-11-30 11:00 ` Kukjin Kim
2012-12-01 14:05 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).