| Message ID | 1353944420-3972-1-git-send-email-broonie@opensource.wolfsonmicro.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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.
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.
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
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.
On Fri, Nov 30, 2012 at 08:00:10PM +0900, Kukjin Kim wrote: > 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? They didn't seem to have broken anything in -next for me, though I suspect you'll have bisection breakage for Exynos as the platform data is being removed separately to the driver update to not look for it.
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; };
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(+)