From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: Arnd Bergmann <arnd@arndb.de>
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
"Russell King" <linux@arm.linux.org.uk>,
"Tony Lindgren" <tony@atomide.com>,
"Kevin Hilman" <khilman@ti.com>,
"Benoît Cousson" <b-cousson@ti.com>,
"Dmitry Torokhov" <dmitry.torokhov@gmail.com>,
"David Woodhouse" <dwmw2@infradead.org>,
"Kyungmin Park" <kyungmin.park@samsung.com>,
"Ohad Ben-Cohen" <ohad@wizery.com>,
"Grant Likely" <grant.likely@secretlab.ca>,
"Omar Ramirez Luna" <omar.ramirez@ti.com>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Tomi Valkeinen" <tomi.valkeinen@ti.com>,
"Florian Tobias Schandinat" <FlorianSchandinat@gmx.de>,
"Jarkko Nikula" <jarkko.nikula@bitmer.com>,
"Liam Girdwood" <lrg@ti.com>,
"Mark Brown" <broonie@opensource.wolfsonmicro.com>,
"Artem Bityutskiy" <artem.bityutskiy@linux.intel.com>,
"Jean Pihet" <j-pihet@ti.com>, "J Keerthy" <j-keerthy@ti.com>,
linux-omap@vger.kernel.org
Subject: Re: [PATCH 13/16] ARM: omap: move platform_data definitions
Date: Tue, 18 Sep 2012 12:57:32 +0300 [thread overview]
Message-ID: <5058458C.5010908@ti.com> (raw)
In-Reply-To: <201209121720.33822.arnd@arndb.de>
Hi Arnd,
On 09/12/2012 08:20 PM, Arnd Bergmann wrote:
> On Tuesday 11 September 2012, Peter Ujfalusi wrote:
>> OMAP McBSP has nothing to do with a dsp.
>> A better name would be: ti-mcbsp.h (or leave it as mcbsp.h)
>> McBSP stands for: Multichannel Buffered Serial Port and it is used for audio
>> connection (I2S, TDM, etc).
>
> changed to asoc-ti-mcbsp.h to, as discussed.
>
>>> .../include/plat/dsp.h => include/linux/platform_data/dsp-omap.h | 0
>>> .../plat/keypad.h => include/linux/platform_data/keypad-omap.h | 0
>>> .../plat/lcd_mipid.h => include/linux/platform_data/lcd-mipid.h | 0
>>> .../plat/nand.h => include/linux/platform_data/mtd-nand-omap2.h | 0
>>> .../onenand.h => include/linux/platform_data/mtd-onenand-omap2.h | 0
>>> .../remoteproc.h => include/linux/platform_data/remoteproc-omap.h | 0
>>> .../voltage.h => include/linux/platform_data/smartreflex-omap.h | 0
>>> .../plat/mcspi.h => include/linux/platform_data/spi-omap2-mcspi.h | 0
>>> include/linux/power/smartreflex.h | 2 +-
>>
>> Let me see these:
>>
>> This four drivers are going to be removed via sound tree.
>>> sound/soc/omap/igep0020.c | 2 +-
>>> sound/soc/omap/omap3beagle.c | 2 +-
>>> sound/soc/omap/omap3evm.c | 2 +-
>>> sound/soc/omap/overo.c | 2 +-
>>
>> The new driver which replaces these (omap-twl4030.c) does not include
>> plat/mcbsp.h
>
> For the sake of bisection, I think we should leave the patch as is.
> When merging the two branches, we will get a small conflict that
> is trivial to resolve.
>
>> From these ASoC machine drivers you can just remove the <plat/mcbsp.h>
>> include since they should not include them (I have pending patch for this to
>> be sent):
>>> sound/soc/omap/am3517evm.c | 2 +-
>>> sound/soc/omap/ams-delta.c | 2 +-
>>> sound/soc/omap/n810.c | 2 +-
>>> sound/soc/omap/omap3pandora.c | 2 +-
>>> sound/soc/omap/osk5912.c | 2 +-
>>> sound/soc/omap/rx51.c | 2 +-
>>> sound/soc/omap/sdp3430.c | 2 +-
>>> sound/soc/omap/zoom2.c | 2 +-
>>
>>> sound/soc/omap/omap-mcbsp.c | 2 +-
>>> sound/soc/omap/mcbsp.c | 2 +-
>
> Can you do that change on top of mine? I would prefer to leave it as is
> because I could create this version with a script.
>
> The alternative is that I leave the mcbsp.h file alone entirely and you
> submit a patch to fix all instances where it's used, either rename or
> remove them.
I thought I have replied to this...
Whichever way you prefer. I can craft a series to clean up the plat/mcbsp.h
usage and move the mcbsp header via ASoC tree.
I'm also fine if you do the move.
Let me know what you prefer.
Thanks,
Péter
next prev parent reply other threads:[~2012-09-18 9:56 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1347368245-30989-1-git-send-email-arnd@arndb.de>
2012-09-11 12:59 ` [PATCH 00/16] ARM: big platform data header rename Arnd Bergmann
2012-09-11 12:59 ` [PATCH 01/16] ARM: at91: move platform_data definitions Arnd Bergmann
2012-09-11 12:59 ` [PATCH 02/16] ARM: davinci: " Arnd Bergmann
2012-09-11 13:05 ` Felipe Balbi
2012-09-12 10:42 ` Hebbar, Gururaja
2012-09-12 17:11 ` Arnd Bergmann
2012-09-13 7:00 ` Hebbar, Gururaja
2012-09-11 12:59 ` [PATCH 03/16] ARM: ep93xx: " Arnd Bergmann
2012-09-11 16:26 ` H Hartley Sweeten
2012-09-11 17:16 ` Arnd Bergmann
2012-09-11 22:56 ` Ryan Mallon
2012-09-14 3:18 ` Vinod Koul
2012-09-11 12:59 ` [PATCH 04/16] ARM: imx: " Arnd Bergmann
2012-09-11 13:40 ` Guennadi Liakhovetski
2012-09-11 14:10 ` Arnd Bergmann
2012-09-11 14:31 ` Guennadi Liakhovetski
2012-09-12 15:52 ` Arnd Bergmann
2012-09-13 7:21 ` Shawn Guo
2012-09-11 13:45 ` Sascha Hauer
2012-09-14 3:17 ` Vinod Koul
2012-09-11 12:59 ` [PATCH 05/16] ARM: msm: " Arnd Bergmann
2012-09-11 21:07 ` David Brown
2012-09-11 12:59 ` [PATCH 06/16] ARM: netx: " Arnd Bergmann
2012-09-11 13:35 ` Sascha Hauer
2012-09-11 12:59 ` [PATCH 08/16] ARM: sa1100: " Arnd Bergmann
2012-09-11 12:59 ` [PATCH 09/16] ARM: tegra: " Arnd Bergmann
2012-09-11 15:35 ` Stephen Warren
2012-09-12 16:21 ` Arnd Bergmann
2012-09-12 17:29 ` Stephen Warren
2012-09-11 15:42 ` Chris Ball
2012-09-11 17:05 ` Arnd Bergmann
2012-09-11 17:11 ` Chris Ball
2012-09-12 16:42 ` Chris Brand
2012-09-11 12:59 ` [PATCH 10/16] ARM: vt8500: " Arnd Bergmann
2012-09-11 20:54 ` Tony Prisk
2012-09-11 12:59 ` [PATCH 11/16] ARM: w90x900: " Arnd Bergmann
2012-09-11 12:59 ` [PATCH 12/16] ARM: nomadik: " Arnd Bergmann
2012-09-11 13:07 ` Felipe Balbi
2012-09-11 13:31 ` Linus Walleij
2012-09-11 13:46 ` Arnd Bergmann
2012-09-12 16:24 ` Arnd Bergmann
2012-09-11 18:29 ` Alessandro Rubini
2012-09-11 12:59 ` [PATCH 13/16] ARM: omap: " Arnd Bergmann
2012-09-11 13:52 ` Peter Ujfalusi
2012-09-12 17:20 ` Arnd Bergmann
2012-09-18 9:57 ` Peter Ujfalusi [this message]
2012-09-19 14:49 ` Arnd Bergmann
2012-09-12 7:16 ` Pihet-XID, Jean
2012-09-12 17:15 ` Arnd Bergmann
2012-09-12 17:40 ` Pihet-XID, Jean
2012-09-11 13:20 ` [PATCH 01/16] ARM: at91: " Jean-Christophe PLAGNIOL-VILLARD
2012-09-11 13:35 ` Nicolas Ferre
2012-09-14 3:18 ` Vinod Koul
2012-09-11 13:02 ` [PATCH 13/16] ARM: omap: " Arnd Bergmann
2012-09-11 13:02 ` [PATCH 14/16] ARM: orion: " Arnd Bergmann
2012-09-11 13:11 ` Thomas Petazzoni
2012-09-11 13:02 ` [PATCH 15/16] ARM: samsung: " Arnd Bergmann
2012-09-11 13:07 ` Felipe Balbi
2012-09-11 17:12 ` Jeff Garzik
2012-09-12 2:20 ` Kukjin Kim
2012-09-12 5:44 ` Kyungmin Park
2012-09-11 13:02 ` [PATCH 16/16] ARM: spear: " Arnd Bergmann
2012-09-12 3:17 ` viresh kumar
2012-09-11 14:06 ` [PATCH 13/16] ARM: omap: " Shilimkar, Santosh
2012-09-11 14:17 ` Arnd Bergmann
2012-09-11 14:24 ` Shilimkar, Santosh
2012-09-11 16:09 ` Vaibhav Hiremath
2012-09-11 17:04 ` Arnd Bergmann
2012-09-11 17:36 ` Tony Lindgren
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=5058458C.5010908@ti.com \
--to=peter.ujfalusi@ti.com \
--cc=FlorianSchandinat@gmx.de \
--cc=arnd@arndb.de \
--cc=artem.bityutskiy@linux.intel.com \
--cc=b-cousson@ti.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=dmitry.torokhov@gmail.com \
--cc=dwmw2@infradead.org \
--cc=grant.likely@secretlab.ca \
--cc=gregkh@linuxfoundation.org \
--cc=j-keerthy@ti.com \
--cc=j-pihet@ti.com \
--cc=jarkko.nikula@bitmer.com \
--cc=khilman@ti.com \
--cc=kyungmin.park@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=lrg@ti.com \
--cc=ohad@wizery.com \
--cc=omar.ramirez@ti.com \
--cc=tomi.valkeinen@ti.com \
--cc=tony@atomide.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox