* [PATCH 16/30] usb/musb: HDRC depends on TWL4030_CORE for OMAP3/4
From: Felipe Balbi @ 2011-10-02 18:59 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1317566760-25681-17-git-send-email-arnd@arndb.de>
Hi,
On Sun, Oct 02, 2011 at 04:45:46PM +0200, Arnd Bergmann wrote:
> The musb_hdrc driver tries to select TWL4030_USB or TWL6030_USB
> on some platforms, but those symbols in turn depend on TWL4030_CORE.
the very fact that MUSB tries to select those is wrong. That's also some
buggy legacy crap which is still floating around...
MUSB does not depend on TWL4030. MUSB depends on a PHY being available,
no matter which one.
IMHO, this would be better moved to board definition, ideally with an
option for selecting some symbol as module (as I have suggested before).
Ideally, all those broken dependencies on MUSB would be cut down to
depends on USB && USB_GADGET.
--
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 490 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20111002/2bbe1108/attachment.sig>
^ permalink raw reply
* [PATCH 21/30] sound/soc/omap: limit to omap2plus
From: Mark Brown @ 2011-10-02 19:18 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1317566760-25681-22-git-send-email-arnd@arndb.de>
On Sun, Oct 02, 2011 at 04:45:51PM +0200, Arnd Bergmann wrote:
> These drivers do not build correctly on omap1, so only allow
> selecting them on omap2 or higher.
No, OMAP1 is supposed to work and people actively seem to care about it.
If there's some problem with OMAP1 then please report it so that it can
be fixed.
You should also *always* both CC maintainers and relevant mailing lists
on patches so they can see what's going on (I'm being especially grumpy
now because you really should know better), and my previous comments
about subject lines also apply.
^ permalink raw reply
* [PATCH 01/30] sound/omap: omap_mcpdm_remove cannot be __devexit
From: Mark Brown @ 2011-10-02 19:24 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1317566760-25681-2-git-send-email-arnd@arndb.de>
On Sun, Oct 02, 2011 at 04:45:31PM +0200, Arnd Bergmann wrote:
> omap_mcpdm_remove is used from asoc_mcpdm_probe, which is an
> initcall, and must not be discarded when HOTPLUG is disabled.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Jarkko Nikula <jarkko.nikula@bitmer.com>
I've applied this, thanks. It'd be helpful if you could say if you're
working on Linus' tree rather than -next, this one doesn't actually
apply against -next as the driver has been totally rewritten.
^ permalink raw reply
* [GIT PULL] Samsung devel-2 for v3.2
From: Mark Brown @ 2011-10-02 19:29 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <002001cc80e5$3e497790$badc66b0$%kim@samsung.com>
On Sun, Oct 02, 2011 at 06:25:36PM +0900, Kukjin Kim wrote:
> gpio/samsung: gpio-samsung.c to support Samsung GPIOs
As I reported the other day this change breaks the boot early on on the
Cragganmore S3C6410 based systems (I've not actually fired up my
SMDK6410 but I suspect it may have issues too). I did make some brief
attempts to debug but as there's no console output at all and the diff
is rather large it's not easy to see what's gone wrong.
^ permalink raw reply
* [PATCH 15/30] usb/musb: use a Kconfig choice to pick the right DMA method
From: Arnd Bergmann @ 2011-10-02 19:44 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20111002185608.GA25690@legolas.emea.dhcp.ti.com>
On Sunday 02 October 2011 21:56:09 Felipe Balbi wrote:
>
> > Unfortunately, even with the dma parts out of the way there is
> > a lot that needs to be done to make musb, ehci or ohci
> > really cross-platform. Right now, you can only have one
> > platform driver glue for each of those drivers, and they
>
> that's not true for musb. I can already compile am35x and omap2430
> together. TUSB is a different story though. With a small effort, we
> could also allow DaVinci and the like to compile cleanly and work.
Ok, good.
> > should eventually be converted to a large library module for
> > the core, with independent platform driver front-end, similar
>
> that's how MUSB works now and that's what I have been discussing with
> Alan Stern for the past month or so, wrt to *HCI. There are even patches
> floating on linux-usb right now trying to hash out the problems.
Ah, glad to see that is happening. I can probably get rid of a bunch
of randconfig patches I have for those then.
> Maybe you should have consulted the maintainers of those drivers before
> making such statements.
>
> MUSB is not the best example because of its history. I understand the
> DMA part is still really messy, but we have been working very hard to
> hash the problems and still allow new glue layers to be merged.
Sorry if I have made my statement sound like an accusation, it wasn't
meant as one, merely as a sigh at having identified yet another area
that needs to be changed in order to have cross-platform ARM kernels
working in every case.
> How about taking a sneak pick at what the code does right now ? As of
> today, I can even even have all UDC controller drivers into one kernel
> and I generally compile x86 with all controllers available. There's some
> very small work that has to be done on each of the UDC drivers to remove
> any references to <arch/..> <asm/..> and <plat/..> headers but that work
> in in progress.
I didn't really see any problems with UDC at all. What I saw were a lot
of build problems with the musb host side, and I rewrote this patch half
a dozen times before I ended up with a version that consistently built
without making the code look worse.
I also agree that the musb implementation is less of a problem than
ohci/ehci in its current form, as it already is layered in the right
way. I did not attempt to turn the Kconfig 'choice' statement there
into a flat list though, so I wouldn't know what problems to expect.
Arnd
^ permalink raw reply
* [PATCH 02/26] sound/pxa-zylonite: use a valid device for dev_err()
From: Arnd Bergmann @ 2011-10-02 19:48 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20111002184417.GE2857@opensource.wolfsonmicro.com>
On Sunday 02 October 2011 19:44:17 Mark Brown wrote:
> On Sun, Oct 02, 2011 at 08:36:14PM +0200, Arnd Bergmann wrote:
>
> > I also have a few sound/soc fixes in the respective samsung and
> > omap series, so if you prefer I can move them to a sound/soc
> > series and submit them all at once to you instead.
>
> Please do. It's probably not so important at this point in the release
> cycle but we've got a tendency to run into cross tree issues with ASoC
> and when it's not trivial build stuff I'd rather review anyway.
>
> Please split the OMAP stuff out, Liam manages the tree for those when
> he's available (though right now he's only intermittently online so I'm
> applying those too).
Almost all the patches I have are both trivial and unimportant corner
cases. I'm removing the ones I have from all the other branches now
and will try to get them to you both asap.
> > The subject line was hand-written, any problem in there is purely
> > my own. What is the naming you want for sound/soc, should I use
> > "ASoC: pxa-zylonite:" or "sound/soc/pxa/zylonite:" or something
> > else?
>
> ASoC: is the bit that I'm looking for.
Ok, got it.
Arnd
^ permalink raw reply
* [PATCH 0/6] ASoC fixes from ARM randconfig builds
From: Arnd Bergmann @ 2011-10-02 20:27 UTC (permalink / raw)
To: linux-arm-kernel
Hi Mark,
As promised, here are the remaining ASoC patches from my
randconfig series. I hope I managed to get the submission
right this time. I've left out the ones that you already
took or NAKed, so this is shorter than I expected.
Arnd
Arnd Bergmann (6):
ASoC: codecs/wm8682: use __devexit_p
ASoC: codecs: AK4641 depends on GPIOLIB
ASoC: imx: eukrea_tlv320 needs i2c
ASoC: sh: use correct __iomem annotations
ASoC: samsung: fix Kconfig dependencies
ASoC: samsung: add missing __devexit_p() annotations
sound/soc/codecs/Kconfig | 2 +-
sound/soc/codecs/wm8782.c | 2 +-
sound/soc/imx/Kconfig | 1 +
sound/soc/samsung/Kconfig | 4 ++++
sound/soc/samsung/ac97.c | 2 +-
sound/soc/samsung/i2s.c | 2 +-
sound/soc/sh/fsi.c | 10 +++++-----
7 files changed, 14 insertions(+), 9 deletions(-)
--
1.7.5.4
^ permalink raw reply
* [PATCH 1/6] ASoC: codecs/wm8682: use __devexit_p
From: Arnd Bergmann @ 2011-10-02 20:27 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1317587284-2776-1-git-send-email-arnd@arndb.de>
This fixes a build error when CONFIG_HOTPLUG is disabled.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Ian Lartey <ian@opensource.wolfsonmicro.com>
Cc: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
---
sound/soc/codecs/wm8782.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sound/soc/codecs/wm8782.c b/sound/soc/codecs/wm8782.c
index a2a09f8..f2ced71 100644
--- a/sound/soc/codecs/wm8782.c
+++ b/sound/soc/codecs/wm8782.c
@@ -60,7 +60,7 @@ static struct platform_driver wm8782_codec_driver = {
.owner = THIS_MODULE,
},
.probe = wm8782_probe,
- .remove = wm8782_remove,
+ .remove = __devexit_p(wm8782_remove),
};
static int __init wm8782_init(void)
--
1.7.5.4
^ permalink raw reply related
* [PATCH 2/6] ASoC: codecs: AK4641 depends on GPIOLIB
From: Arnd Bergmann @ 2011-10-02 20:28 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1317587284-2776-1-git-send-email-arnd@arndb.de>
This driver only builds correctly on platforms that use
GPIOLIB. Disable it otherwise.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Dmitry Artamonow <mad_soft@inbox.ru>
---
sound/soc/codecs/Kconfig | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 665d924..4d41447 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -21,7 +21,7 @@ config SND_SOC_ALL_CODECS
select SND_SOC_ADS117X
select SND_SOC_AK4104 if SPI_MASTER
select SND_SOC_AK4535 if I2C
- select SND_SOC_AK4641 if I2C
+ select SND_SOC_AK4641 if I2C && GPIOLIB
select SND_SOC_AK4642 if I2C
select SND_SOC_AK4671 if I2C
select SND_SOC_ALC5623 if I2C
--
1.7.5.4
^ permalink raw reply related
* [PATCH 3/6] ASoC: imx: eukrea_tlv320 needs i2c
From: Arnd Bergmann @ 2011-10-02 20:28 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1317587284-2776-1-git-send-email-arnd@arndb.de>
Add a missing dependency that is required for random configurations.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: "Eric B?nard" <eric@eukrea.com>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
---
sound/soc/imx/Kconfig | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/sound/soc/imx/Kconfig b/sound/soc/imx/Kconfig
index bb699bb..dcd954b 100644
--- a/sound/soc/imx/Kconfig
+++ b/sound/soc/imx/Kconfig
@@ -50,6 +50,7 @@ config SND_SOC_EUKREA_TLV320
|| MACH_EUKREA_MBIMXSD25_BASEBOARD \
|| MACH_EUKREA_MBIMXSD35_BASEBOARD \
|| MACH_EUKREA_MBIMXSD51_BASEBOARD
+ depends on I2C
select SND_SOC_TLV320AIC23
select SND_MXC_SOC_FIQ
help
--
1.7.5.4
^ permalink raw reply related
* [PATCH 4/6] ASoC: sh: use correct __iomem annotations
From: Arnd Bergmann @ 2011-10-02 20:28 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1317587284-2776-1-git-send-email-arnd@arndb.de>
This removes a few unnecessary type casts and avoids
sparse warnings.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Cc: Paul Mundt <lethal@linux-sh.org>
---
sound/soc/sh/fsi.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index 8e112cc..916b9f9 100644
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -210,7 +210,7 @@ struct fsi_master {
* basic read write function
*/
-static void __fsi_reg_write(u32 reg, u32 data)
+static void __fsi_reg_write(u32 __iomem *reg, u32 data)
{
/* valid data area is 24bit */
data &= 0x00ffffff;
@@ -218,12 +218,12 @@ static void __fsi_reg_write(u32 reg, u32 data)
__raw_writel(data, reg);
}
-static u32 __fsi_reg_read(u32 reg)
+static u32 __fsi_reg_read(u32 __iomem *reg)
{
return __raw_readl(reg);
}
-static void __fsi_reg_mask_set(u32 reg, u32 mask, u32 data)
+static void __fsi_reg_mask_set(u32 __iomem *reg, u32 mask, u32 data)
{
u32 val = __fsi_reg_read(reg);
@@ -250,7 +250,7 @@ static u32 _fsi_master_read(struct fsi_master *master, u32 reg)
unsigned long flags;
spin_lock_irqsave(&master->lock, flags);
- ret = __fsi_reg_read((u32)(master->base + reg));
+ ret = __fsi_reg_read(master->base + reg);
spin_unlock_irqrestore(&master->lock, flags);
return ret;
@@ -264,7 +264,7 @@ static void _fsi_master_mask_set(struct fsi_master *master,
unsigned long flags;
spin_lock_irqsave(&master->lock, flags);
- __fsi_reg_mask_set((u32)(master->base + reg), mask, data);
+ __fsi_reg_mask_set(master->base + reg, mask, data);
spin_unlock_irqrestore(&master->lock, flags);
}
--
1.7.5.4
^ permalink raw reply related
* [PATCH 5/6] ASoC: samsung: fix Kconfig dependencies
From: Arnd Bergmann @ 2011-10-02 20:28 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1317587284-2776-1-git-send-email-arnd@arndb.de>
SND_SOC_WM8994 can only be selected if the respective MFD driver is
present.
SND_SAMSUNG_AC97 must not be builtin if SND_SOC_ALL_CODECS is
set to building all drivers as modules.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Jassi Brar <jassisinghbrar@gmail.com>
Cc: Sangbeom Kim <sbkim73@samsung.com>
---
sound/soc/samsung/Kconfig | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
index 65f980e..cb63cd0 100644
--- a/sound/soc/samsung/Kconfig
+++ b/sound/soc/samsung/Kconfig
@@ -25,6 +25,7 @@ config SND_SAMSUNG_PCM
config SND_SAMSUNG_AC97
tristate
+ depends on SND_SOC_ALL_CODECS=n || SND_SOC_ALL_CODECS
select SND_SOC_AC97_BUS
config SND_SAMSUNG_SPDIF
@@ -64,6 +65,7 @@ config SND_SOC_SAMSUNG_SMDK_WM8580
config SND_SOC_SAMSUNG_SMDK_WM8994
tristate "SoC I2S Audio support for WM8994 on SMDK"
depends on SND_SOC_SAMSUNG && (MACH_SMDKV310 || MACH_SMDKC210)
+ depends on MFD_WM8994
select SND_SOC_WM8994
select SND_SAMSUNG_I2S
help
@@ -151,6 +153,7 @@ config SND_SOC_GONI_AQUILA_WM8994
tristate "SoC I2S Audio support for AQUILA/GONI - WM8994"
depends on SND_SOC_SAMSUNG && (MACH_GONI || MACH_AQUILA)
select SND_SAMSUNG_I2S
+ depends on MFD_WM8994
select SND_SOC_WM8994
help
Say Y if you want to add support for SoC audio on goni or aquila
@@ -174,6 +177,7 @@ config SND_SOC_SMDK_WM8580_PCM
config SND_SOC_SMDK_WM8994_PCM
tristate "SoC PCM Audio support for WM8994 on SMDK"
depends on SND_SOC_SAMSUNG && (MACH_SMDKC210 || MACH_SMDKV310)
+ depends on MFD_WM8994
select SND_SOC_WM8994
select SND_SAMSUNG_PCM
help
--
1.7.5.4
^ permalink raw reply related
* [PATCH 6/6] ASoC: samsung: add missing __devexit_p() annotations
From: Arnd Bergmann @ 2011-10-02 20:28 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1317587284-2776-1-git-send-email-arnd@arndb.de>
Drivers that refer to a __devexit function in an operations
structure need to annotate that pointer with __devexit_p so
replace it with a NULL pointer when the section gets discarded.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Jassi Brar <jassisinghbrar@gmail.com>
Cc: Sangbeom Kim <sbkim73@samsung.com>
---
sound/soc/samsung/ac97.c | 2 +-
sound/soc/samsung/i2s.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/samsung/ac97.c b/sound/soc/samsung/ac97.c
index f97110e..65ea538 100644
--- a/sound/soc/samsung/ac97.c
+++ b/sound/soc/samsung/ac97.c
@@ -495,7 +495,7 @@ static __devexit int s3c_ac97_remove(struct platform_device *pdev)
static struct platform_driver s3c_ac97_driver = {
.probe = s3c_ac97_probe,
- .remove = s3c_ac97_remove,
+ .remove = __devexit_p(s3c_ac97_remove),
.driver = {
.name = "samsung-ac97",
.owner = THIS_MODULE,
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index c086b78..0c9ac20 100644
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -1136,7 +1136,7 @@ static __devexit int samsung_i2s_remove(struct platform_device *pdev)
static struct platform_driver samsung_i2s_driver = {
.probe = samsung_i2s_probe,
- .remove = samsung_i2s_remove,
+ .remove = __devexit_p(samsung_i2s_remove),
.driver = {
.name = "samsung-i2s",
.owner = THIS_MODULE,
--
1.7.5.4
^ permalink raw reply related
* [PATCH 1/6] ASoC: codecs/wm8682: use __devexit_p
From: Mark Brown @ 2011-10-02 20:36 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1317587284-2776-2-git-send-email-arnd@arndb.de>
On Sun, Oct 02, 2011 at 10:27:59PM +0200, Arnd Bergmann wrote:
> This fixes a build error when CONFIG_HOTPLUG is disabled.
Axel Lin sent a patch for this recently, it's already been merged.
> sound/soc/codecs/wm8782.c | 2 +-
Your subject line doesn't match the file you're changing.
^ permalink raw reply
* [PATCH 2/6] ASoC: codecs: AK4641 depends on GPIOLIB
From: Mark Brown @ 2011-10-02 20:41 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1317587284-2776-3-git-send-email-arnd@arndb.de>
On Sun, Oct 02, 2011 at 10:28:00PM +0200, Arnd Bergmann wrote:
> This driver only builds correctly on platforms that use
> GPIOLIB. Disable it otherwise.
No, gpiolib is one implementation of the GPIO API but if platforms want
to go and define their own that's currently OK (personally I think at
this point we should just be converting all the stragglers over to
gpiolib). As things stand we shouldn't have dependencies on a
particular implementation of the API.
^ permalink raw reply
* [PATCH 5/6] ASoC: samsung: fix Kconfig dependencies
From: Mark Brown @ 2011-10-02 20:47 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1317587284-2776-6-git-send-email-arnd@arndb.de>
On Sun, Oct 02, 2011 at 10:28:03PM +0200, Arnd Bergmann wrote:
> config SND_SAMSUNG_AC97
> tristate
> + depends on SND_SOC_ALL_CODECS=n || SND_SOC_ALL_CODECS
> select SND_SOC_AC97_BUS
No, I'm not sure what the problem you're trying to fix here but this
looks pretty terrible. SND_SOC_ALL_CODECS is a debugging tool for build
coverage, we shouldn't be restricting actual useful drivers based on it.
What is the intention of this change and why does it only apply to the
Samsung platform? It all looks very magic.
> config SND_SOC_SAMSUNG_SMDK_WM8994
> tristate "SoC I2S Audio support for WM8994 on SMDK"
> depends on SND_SOC_SAMSUNG && (MACH_SMDKV310 || MACH_SMDKC210)
> + depends on MFD_WM8994
> select SND_SOC_WM8994
This is non-idiomatic - we always select the CODEC drivers rather than
depending on them for usability.
Please also split the two changes you're doing here into separate
patches. I might've applied the wm8994 bit but it's squashed in with
the AC'97 change...
^ permalink raw reply
* [PATCH 6/6] ASoC: samsung: add missing __devexit_p() annotations
From: Mark Brown @ 2011-10-02 20:48 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1317587284-2776-7-git-send-email-arnd@arndb.de>
On Sun, Oct 02, 2011 at 10:28:04PM +0200, Arnd Bergmann wrote:
> Drivers that refer to a __devexit function in an operations
> structure need to annotate that pointer with __devexit_p so
> replace it with a NULL pointer when the section gets discarded.
Again Axel already fixed these (and the other Samsung CPU drivers).
^ permalink raw reply
* [PATCH 3/6] ASoC: imx: eukrea_tlv320 needs i2c
From: Mark Brown @ 2011-10-02 20:49 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1317587284-2776-4-git-send-email-arnd@arndb.de>
On Sun, Oct 02, 2011 at 10:28:01PM +0200, Arnd Bergmann wrote:
> Add a missing dependency that is required for random configurations.
Applied, thanks.
^ permalink raw reply
* [PATCH 4/6] ASoC: sh: use correct __iomem annotations
From: Mark Brown @ 2011-10-02 20:50 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1317587284-2776-5-git-send-email-arnd@arndb.de>
On Sun, Oct 02, 2011 at 10:28:02PM +0200, Arnd Bergmann wrote:
> This removes a few unnecessary type casts and avoids
> sparse warnings.
Applied, thanks.
^ permalink raw reply
* [PATCH 2/6] ASoC: codecs: AK4641 depends on GPIOLIB
From: Arnd Bergmann @ 2011-10-02 20:53 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20111002204106.GB5811@opensource.wolfsonmicro.com>
On Sunday 02 October 2011 21:41:07 Mark Brown wrote:
> On Sun, Oct 02, 2011 at 10:28:00PM +0200, Arnd Bergmann wrote:
> > This driver only builds correctly on platforms that use
> > GPIOLIB. Disable it otherwise.
>
> No, gpiolib is one implementation of the GPIO API but if platforms want
> to go and define their own that's currently OK (personally I think at
> this point we should just be converting all the stragglers over to
> gpiolib). As things stand we shouldn't have dependencies on a
> particular implementation of the API.
Thanks for the explanation!
Is there any other symbol that I can test then?
I noticed that a lot of places use 'depends on GPIOLIB' or
'#ifdef CONFIG_GPIOLIB', are those usually wrong, too?
Arnd
^ permalink raw reply
* [PATCH] mach-integrator: remove VGA_CONSOLE from defconfig
From: Linus Walleij @ 2011-10-02 21:11 UTC (permalink / raw)
To: linux-arm-kernel
After scratching my head for a while fighting strange boot delays
and hangs, I realized that the VGA_CONSOLE code is just poking
around in the PCI memory space at random. It really has no clue
whether there is a VGA card in the first slot or not, and it
doesn't in any way try to determine if there is one. It doesn't
belong in the defconfig, people with VGA cards in their
Integrators can reenable this and fix it properly.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
arch/arm/configs/integrator_defconfig | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/arm/configs/integrator_defconfig b/arch/arm/configs/integrator_defconfig
index 1103f62..f26460d 100644
--- a/arch/arm/configs/integrator_defconfig
+++ b/arch/arm/configs/integrator_defconfig
@@ -66,6 +66,7 @@ CONFIG_FB_MODE_HELPERS=y
CONFIG_FB_MATROX=y
CONFIG_FB_MATROX_MILLENIUM=y
CONFIG_FB_MATROX_MYSTIQUE=y
+# CONFIG_VGA_CONSOLE is not set
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_PL030=y
CONFIG_EXT2_FS=y
--
1.7.6.2
^ permalink raw reply related
* [PATCH 5/6] ASoC: samsung: fix Kconfig dependencies
From: Arnd Bergmann @ 2011-10-02 21:14 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20111002204729.GC5811@opensource.wolfsonmicro.com>
On Sunday 02 October 2011 21:47:30 Mark Brown wrote:
> On Sun, Oct 02, 2011 at 10:28:03PM +0200, Arnd Bergmann wrote:
>
> > config SND_SAMSUNG_AC97
> > tristate
> > + depends on SND_SOC_ALL_CODECS=n || SND_SOC_ALL_CODECS
> > select SND_SOC_AC97_BUS
>
> No, I'm not sure what the problem you're trying to fix here but this
> looks pretty terrible. SND_SOC_ALL_CODECS is a debugging tool for build
> coverage, we shouldn't be restricting actual useful drivers based on it.
> What is the intention of this change and why does it only apply to the
> Samsung platform? It all looks very magic.
It's a bug that I only observed on exynos4, and it could be that
this patch didn't actually solve it in the end. I'll drop it for
now and do a better report when the problem comes back.
I remember that I never fully understood what was going on either,
and I suspected a problem with Kconfig resulting in some builtin
ac97 code referencing symbols that are enabled in a module when
SND_SOC_ALL_CODECS=m.
> > config SND_SOC_SAMSUNG_SMDK_WM8994
> > tristate "SoC I2S Audio support for WM8994 on SMDK"
> > depends on SND_SOC_SAMSUNG && (MACH_SMDKV310 || MACH_SMDKC210)
> > + depends on MFD_WM8994
> > select SND_SOC_WM8994
>
> This is non-idiomatic - we always select the CODEC drivers rather than
> depending on them for usability.
Ok. I did this patch before the MFD_SUPPORT option was removed, so I did
not want to add both 'select MFD_WM8994' and 'select MFD_SUPPORT' here.
So should SND_SOC_WM8994 instead select MFD_WM8994? That would mean adding
the select only in one place.
Arnd
8<---
ASoC: codecs: SND_SOC_WM8994 requires MFD_WM8994
The samsung SMDK platform can select SND_SOC_WM8994 while the
necessary MFD driver is not present. Always select MFD_WM8994
now in order to satisfy the build dependencies.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 4d41447..b7b9ddc 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -92,7 +92,7 @@ config SND_SOC_ALL_CODECS
select SND_SOC_WM8990 if I2C
select SND_SOC_WM8991 if I2C
select SND_SOC_WM8993 if I2C
- select SND_SOC_WM8994 if MFD_WM8994
+ select SND_SOC_WM8994
select SND_SOC_WM8995 if SND_SOC_I2C_AND_SPI
select SND_SOC_WM8996 if I2C
select SND_SOC_WM9081 if I2C
@@ -373,6 +373,7 @@ config SND_SOC_WM8993
config SND_SOC_WM8994
tristate
+ select MFD_WM8994
config SND_SOC_WM8995
tristate
^ permalink raw reply related
* [PATCH v2] mach-ep93xx: break out GPIO driver specifics
From: Linus Walleij @ 2011-10-02 21:15 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20111001223914.GP11710@n2100.arm.linux.org.uk>
2011/10/2 Russell King - ARM Linux <linux@arm.linux.org.uk>:
> On Tue, Sep 20, 2011 at 10:32:13PM +0200, Linus Walleij wrote:
>
>> It'd dependent on Russells cleanups so it'll go through Russells
>> tree and his gpio cleanup branch there.
>
> It's dependent on other stuff elsewhere too:
>
> error: patch failed: drivers/gpio/gpio-ep93xx.c:24
> error: drivers/gpio/gpio-ep93xx.c: patch does not apply
>
> According to your patch, line 24 onwards is:
>
> ?#include <linux/module.h>
>
> ?#include <mach/hardware.h>
>
> whereas I have this around line 24:
>
> ?#include <linux/basic_mmio_gpio.h>
>
> ?#include <mach/hardware.h>
Aha it's that moduleh git that is changing stuff all over the place.
> So I've applied this with GNU patch instead, accepting the one line of
> fuzz:
>
> Hunk #1 succeeded at 23 with fuzz 1 (offset -1 lines).
>
> As a result, I expect sfr will report a trivial merge conflict here.
OK thanks Russell that seems to get this one in atleast,
if I run into more trouble we should just call it a day with this
stuff for this merge window so we don't get too much conflicts
piled up.
Yours,
Linus Walleij
^ permalink raw reply
* [PATCH 4/6] ASoC: sh: use correct __iomem annotations
From: Arnd Bergmann @ 2011-10-02 21:20 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20111002205008.GB4506@opensource.wolfsonmicro.com>
On Sunday 02 October 2011 21:50:09 Mark Brown wrote:
> On Sun, Oct 02, 2011 at 10:28:02PM +0200, Arnd Bergmann wrote:
> > This removes a few unnecessary type casts and avoids
> > sparse warnings.
>
> Applied, thanks.
Thank you very much for the realtime feedback and patch applying.
Arnd
^ permalink raw reply
* [PATCH 1/2 v2] plat-pxa: move PXA GPIO driver to GPIO subsystem
From: Linus Walleij @ 2011-10-02 21:24 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20111001224421.GQ11710@n2100.arm.linux.org.uk>
2011/10/2 Russell King - ARM Linux <linux@arm.linux.org.uk>:
> On Tue, Sep 27, 2011 at 12:56:45PM +0200, Linus Walleij wrote:
>> ?obj-$(CONFIG_GPIO_PL061) ? ? += gpio-pl061.o
>> +obj-$(CONFIG_PLAT_PXA) ? ? ? ? ? ? ? += gpio-pxa.o
>> ?obj-$(CONFIG_GPIO_RDC321X) ? += gpio-rdc321x.o
>
> This is not what my drivers/gpio/Makefile contains. ?I've applied this
> patch with GNU patch with fuzz 2, resulting in:
>
> diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
> index 84bc738..19c5d27 100644
> --- a/drivers/gpio/Makefile
> +++ b/drivers/gpio/Makefile
> @@ -40,6 +40,7 @@ obj-$(CONFIG_GPIO_PCA953X) ? ?+= gpio-pca953x.o
> ?obj-$(CONFIG_GPIO_PCF857X) ? ? += gpio-pcf857x.o
> ?obj-$(CONFIG_GPIO_PCH) ? ? ? ? += gpio-pch.o
> ?obj-$(CONFIG_GPIO_PL061) ? ? ? += gpio-pl061.o
> +obj-$(CONFIG_PLAT_PXA) ? ? ? ? += gpio-pxa.o
> ?obj-$(CONFIG_GPIO_RDC321X) ? ? += gpio-rdc321x.o
>
> ?obj-$(CONFIG_GPIO_PLAT_SAMSUNG) ? ? ? ?+= gpio-plat-samsung.o
>
> This will probably conflict with Grant's tree.
Yes luckily it looks pretty trivial.
Haojioan is working on cleanups to this driver that need to be rebased
on top of this and submitted through your branch in order for us not
to create even more conflicts.
Feel free to drop any of this stuff if it's just causing trouble, it can
surely wait until the next merge window if need be.
Yours,
Linus Walleij
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox