* [PATCH 1/3] omap: rx51: Remove __initdata from rx51_tpa6130a2_data
@ 2010-12-17 19:18 Jarkko Nikula
2010-12-17 19:18 ` [PATCH 2/3] omap: rx51: Remove extra tlv320aic3x.h inclusion Jarkko Nikula
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Jarkko Nikula @ 2010-12-17 19:18 UTC (permalink / raw)
To: linux-arm-kernel
If the TPA6130 is compiled as module the id and power_gpio values are
arbitrary at module probing time since the rx51_tpa6130a2_data was marked as
__initdata.
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
---
For 2.6.38 as the TPA6130 is not used in 2.6.37.
---
arch/arm/mach-omap2/board-rx51-peripherals.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
index 126b724..cde6847 100644
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -719,7 +719,7 @@ static struct twl4030_platform_data rx51_twldata __initdata = {
.vio = &rx51_vio,
};
-static struct tpa6130a2_platform_data rx51_tpa6130a2_data __initdata = {
+static struct tpa6130a2_platform_data rx51_tpa6130a2_data = {
.id = TPA6130A2,
.power_gpio = 98,
};
--
1.7.2.3
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/3] omap: rx51: Remove extra tlv320aic3x.h inclusion 2010-12-17 19:18 [PATCH 1/3] omap: rx51: Remove __initdata from rx51_tpa6130a2_data Jarkko Nikula @ 2010-12-17 19:18 ` Jarkko Nikula 2010-12-17 19:18 ` [PATCH 3/3] omap: rx51: Add supplies and data for codec b part of TLV320AIC34 Jarkko Nikula 2010-12-18 0:24 ` [PATCH 1/3] omap: rx51: Remove __initdata from rx51_tpa6130a2_data Tony Lindgren 2 siblings, 0 replies; 6+ messages in thread From: Jarkko Nikula @ 2010-12-17 19:18 UTC (permalink / raw) To: linux-arm-kernel Remove second tlv320aic3x.h inclusion that came along the commit f0fba2a "ASoC: multi-component - ASoC Multi-Component Support". Signed-off-by: Jarkko Nikula <jhnikula@gmail.com> Cc: Liam Girdwood <lrg@slimlogic.co.uk> --- Clearly for 2.6.38 as harmless issue. --- arch/arm/mach-omap2/board-rx51-peripherals.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index cde6847..6114e47 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c @@ -23,7 +23,6 @@ #include <linux/gpio.h> #include <linux/gpio_keys.h> #include <linux/mmc/host.h> -#include <sound/tlv320aic3x.h> #include <plat/mcspi.h> #include <plat/board.h> -- 1.7.2.3 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] omap: rx51: Add supplies and data for codec b part of TLV320AIC34 2010-12-17 19:18 [PATCH 1/3] omap: rx51: Remove __initdata from rx51_tpa6130a2_data Jarkko Nikula 2010-12-17 19:18 ` [PATCH 2/3] omap: rx51: Remove extra tlv320aic3x.h inclusion Jarkko Nikula @ 2010-12-17 19:18 ` Jarkko Nikula 2010-12-18 0:24 ` [PATCH 1/3] omap: rx51: Remove __initdata from rx51_tpa6130a2_data Tony Lindgren 2 siblings, 0 replies; 6+ messages in thread From: Jarkko Nikula @ 2010-12-17 19:18 UTC (permalink / raw) To: linux-arm-kernel Upcoming ASoC core and tlv320aic3x changes makes possible to take b part of TLV320AIC34 into use on RX51/N900. Prepare to this by adding virtual supplies and platform data for b part of the codec. Signed-off-by: Jarkko Nikula <jhnikula@gmail.com> --- arch/arm/mach-omap2/board-rx51-peripherals.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index 6114e47..ca8cecd 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c @@ -343,6 +343,8 @@ static struct regulator_consumer_supply rx51_vmmc2_supplies[] = { /* tlv320aic3x analog supplies */ REGULATOR_SUPPLY("AVDD", "2-0018"), REGULATOR_SUPPLY("DRVDD", "2-0018"), + REGULATOR_SUPPLY("AVDD", "2-0019"), + REGULATOR_SUPPLY("DRVDD", "2-0019"), /* tpa6130a2 */ REGULATOR_SUPPLY("Vdd", "2-0060"), /* Keep vmmc as last item. It is not iterated for newer boards */ @@ -353,6 +355,8 @@ static struct regulator_consumer_supply rx51_vio_supplies[] = { /* tlv320aic3x digital supplies */ REGULATOR_SUPPLY("IOVDD", "2-0018"), REGULATOR_SUPPLY("DVDD", "2-0018"), + REGULATOR_SUPPLY("IOVDD", "2-0019"), + REGULATOR_SUPPLY("DVDD", "2-0019"), }; #if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE) @@ -743,11 +747,19 @@ static struct aic3x_pdata rx51_aic3x_data = { .gpio_reset = 60, }; +static struct aic3x_pdata rx51_aic3x_data2 = { + .gpio_reset = 60, +}; + static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_2[] = { { I2C_BOARD_INFO("tlv320aic3x", 0x18), .platform_data = &rx51_aic3x_data, }, + { + I2C_BOARD_INFO("tlv320aic3x", 0x19), + .platform_data = &rx51_aic3x_data2, + }, #if defined(CONFIG_SENSORS_TSL2563) || defined(CONFIG_SENSORS_TSL2563_MODULE) { I2C_BOARD_INFO("tsl2563", 0x29), -- 1.7.2.3 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 1/3] omap: rx51: Remove __initdata from rx51_tpa6130a2_data 2010-12-17 19:18 [PATCH 1/3] omap: rx51: Remove __initdata from rx51_tpa6130a2_data Jarkko Nikula 2010-12-17 19:18 ` [PATCH 2/3] omap: rx51: Remove extra tlv320aic3x.h inclusion Jarkko Nikula 2010-12-17 19:18 ` [PATCH 3/3] omap: rx51: Add supplies and data for codec b part of TLV320AIC34 Jarkko Nikula @ 2010-12-18 0:24 ` Tony Lindgren 2010-12-18 18:17 ` [PATCHv2] omap: rx51: Switch rx51_tpa6130a2_data __initdata to __initdata_or_module Jarkko Nikula 2 siblings, 1 reply; 6+ messages in thread From: Tony Lindgren @ 2010-12-18 0:24 UTC (permalink / raw) To: linux-arm-kernel * Jarkko Nikula <jhnikula@gmail.com> [101217 11:16]: > If the TPA6130 is compiled as module the id and power_gpio values are > arbitrary at module probing time since the rx51_tpa6130a2_data was marked as > __initdata. > > Signed-off-by: Jarkko Nikula <jhnikula@gmail.com> > --- > For 2.6.38 as the TPA6130 is not used in 2.6.37. > --- > arch/arm/mach-omap2/board-rx51-peripherals.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c > index 126b724..cde6847 100644 > --- a/arch/arm/mach-omap2/board-rx51-peripherals.c > +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c > @@ -719,7 +719,7 @@ static struct twl4030_platform_data rx51_twldata __initdata = { > .vio = &rx51_vio, > }; > > -static struct tpa6130a2_platform_data rx51_tpa6130a2_data __initdata = { > +static struct tpa6130a2_platform_data rx51_tpa6130a2_data = { > .id = TPA6130A2, > .power_gpio = 98, > }; How about __initdata_or_module instead of __initdata? Regards, Tony ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCHv2] omap: rx51: Switch rx51_tpa6130a2_data __initdata to __initdata_or_module 2010-12-18 0:24 ` [PATCH 1/3] omap: rx51: Remove __initdata from rx51_tpa6130a2_data Tony Lindgren @ 2010-12-18 18:17 ` Jarkko Nikula 2010-12-21 1:14 ` Tony Lindgren 0 siblings, 1 reply; 6+ messages in thread From: Jarkko Nikula @ 2010-12-18 18:17 UTC (permalink / raw) To: linux-arm-kernel If the TPA6130 is compiled as module the id and power_gpio values are arbitrary at module probing time since the rx51_tpa6130a2_data was marked as __initdata. Fix this by using __initdata_or_module. Then __initdata is defined only if the kernel is built without CONFIG_MODULES and omitted otherwise. Signed-off-by: Jarkko Nikula <jhnikula@gmail.com> --- For 2.6.38 as the TPA6130 is not used in 2.6.37. v2 - __initdata not removed but replaced with __initdata_or_module. Thanks to Tony Lindgren <tony@atomide.com> for hint. --- arch/arm/mach-omap2/board-rx51-peripherals.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index 7ea2081..fd95ccf 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c @@ -722,7 +722,7 @@ static struct twl4030_platform_data rx51_twldata __initdata = { .vio = &rx51_vio, }; -static struct tpa6130a2_platform_data rx51_tpa6130a2_data __initdata = { +static struct tpa6130a2_platform_data rx51_tpa6130a2_data __initdata_or_module = { .id = TPA6130A2, .power_gpio = 98, }; -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCHv2] omap: rx51: Switch rx51_tpa6130a2_data __initdata to __initdata_or_module 2010-12-18 18:17 ` [PATCHv2] omap: rx51: Switch rx51_tpa6130a2_data __initdata to __initdata_or_module Jarkko Nikula @ 2010-12-21 1:14 ` Tony Lindgren 0 siblings, 0 replies; 6+ messages in thread From: Tony Lindgren @ 2010-12-21 1:14 UTC (permalink / raw) To: linux-arm-kernel * Jarkko Nikula <jhnikula@gmail.com> [101218 10:17]: > If the TPA6130 is compiled as module the id and power_gpio values are > arbitrary at module probing time since the rx51_tpa6130a2_data was marked as > __initdata. Fix this by using __initdata_or_module. Then __initdata is > defined only if the kernel is built without CONFIG_MODULES and omitted > otherwise. Thanks applying. Tony ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-12-21 1:14 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-12-17 19:18 [PATCH 1/3] omap: rx51: Remove __initdata from rx51_tpa6130a2_data Jarkko Nikula 2010-12-17 19:18 ` [PATCH 2/3] omap: rx51: Remove extra tlv320aic3x.h inclusion Jarkko Nikula 2010-12-17 19:18 ` [PATCH 3/3] omap: rx51: Add supplies and data for codec b part of TLV320AIC34 Jarkko Nikula 2010-12-18 0:24 ` [PATCH 1/3] omap: rx51: Remove __initdata from rx51_tpa6130a2_data Tony Lindgren 2010-12-18 18:17 ` [PATCHv2] omap: rx51: Switch rx51_tpa6130a2_data __initdata to __initdata_or_module Jarkko Nikula 2010-12-21 1:14 ` Tony Lindgren
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).