at91sam9g20ek: add fixed-value regulator for wm8731
PATCH 1/2 at91sam9g20ek: add fixed-value regulator for wm8731
If CONFIG_REGULATOR is enabled, wm8731 fails on AT91SAM9G20EK board, since codec driver requires several voltage supplies and none are provided currently. As requires voltages are hardwired to 3V3, use fixed voltage regulator for this chip.
--- arch/arm/mach-at91/board-sam9g20ek.c | 45 ++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-)
arch/arm/mach-at91/board-sam9g20ek.c +45 -0
@@ -28,6 +28,9 @@#include <linux/gpio_keys.h> #include <linux/input.h> #include <linux/clk.h> +#include <linux/regulator/machine.h> +#include <linux/regulator/fixed.h> +#include <linux/regulator/consumer.h> #include <mach/hardware.h> #include <asm/setup.h>
@@ -283,6 +286,46 @@ static void __init ek_add_device_buttons(void)static void __init ek_add_device_buttons (void ) {}#endif +#if defined(CONFIG_REGULATOR_FIXED_VOLTAGE ) || defined(CONFIG_REGULATOR_FIXED_VOLTAGE_MODULE ) +static struct regulator_consumer_supply ek_audio_consumer_supplies[] = { +REGULATOR_SUPPLY ("AVDD" ,"0-001b" ), +REGULATOR_SUPPLY ("HPVDD" ,"0-001b" ), +REGULATOR_SUPPLY ("DBVDD" ,"0-001b" ), +REGULATOR_SUPPLY ("DCVDD" ,"0-001b" ), +}; + +static struct regulator_init_data ek_avdd_reg_init_data = { + .constraints = { + .name ="3V3" , + .valid_ops_mask =REGULATOR_CHANGE_STATUS , + }, + .consumer_supplies = ek_audio_consumer_supplies, + .num_consumer_supplies =ARRAY_SIZE (ek_audio_consumer_supplies), +}; + +static struct fixed_voltage_config ek_vdd_pdata = { + .supply_name ="board-3V3" , + .microvolts =3300000 , + .gpio = -EINVAL , + .enabled_at_boot =0 , + .init_data = &ek_avdd_reg_init_data, +}; +static struct platform_device ek_voltage_regulator = { + .name ="reg-fixed-voltage" , + .id =-1 , + .num_resources =0 , + .dev = { + .platform_data = &ek_vdd_pdata, + }, +}; +static void __init ek_add_regulators (void ) +{ +platform_device_register (&ek_voltage_regulator); +} +#else +static void __init ek_add_regulators (void ) {} +#endif +static struct i2c_board_info __initdata ek_i2c_devices[] = { {
@@ -308,6 +351,8 @@ static void __init ek_board_init(void)ek_add_device_nand ();/* Ethernet */ at91_add_device_eth (&ek_macb_data); +/* Regulators */ +ek_add_regulators ();/* MMC */ at91_add_device_mmc (0 , &ek_mmc_data);/* I2C */
Signature · 1 line
1.7.1
PATCH 1/2 at91sam9g20ek: add fixed-value regulator for wm8731
Any comments on these two patches? Can I submit them to patchsystem?
Without these patches the kernel with CONFIG_REGULATOR enabled is broken on sam9g20ek boards (sound won't work).
Quoted 9 lines · Dmitry Eremin-Solenikov
If
CONFIG_REGULATORis enabled, wm8731 fails on AT91SAM9G20EK board, since codec driver requires several voltage supplies and none are provided currently. As requires voltages are hardwired to 3V3, use fixed voltage regulator for this chip.Signed-off-by Dmitry Eremin-Solenikov <[email protected]>---
?arch/arm/mach-at91/board-sam9g20ek.c | ? 45 ++++++++++++++++++++++++++++++++++ ?1 files changed, 45 insertions(+), 0 deletions(-)
Signature · 2 lines
With best wishes Dmitry
PATCH 2/2 at91sam9g20ek: add fixed-value regulator for wm8731
In reply to Dmitry Eremin-SolenikovIf CONFIG_REGULATOR is enabled, wm8731 fails on AT91SAM9G20EK board, since codec driver requires several voltage supplies and none are provided currently. As requires voltages are hardwired to 3V3, use fixed voltage regulator for this chip.
--- arch/arm/mach-at91/board-sam9g20ek-2slot-mmc.c | 45 ++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-)
arch/arm/mach-at91/board-sam9g20ek-2slot-mmc.c +45 -0
@@ -26,6 +26,9 @@#include <linux/spi/spi.h> #include <linux/spi/at73c213.h> #include <linux/clk.h> +#include <linux/regulator/machine.h> +#include <linux/regulator/fixed.h> +#include <linux/regulator/consumer.h> #include <mach/hardware.h> #include <asm/setup.h>
@@ -235,6 +238,46 @@ static struct gpio_led ek_leds[] = { } }; +#if defined(CONFIG_REGULATOR_FIXED_VOLTAGE ) || defined(CONFIG_REGULATOR_FIXED_VOLTAGE_MODULE ) +static struct regulator_consumer_supply ek_audio_consumer_supplies[] = { +REGULATOR_SUPPLY ("AVDD" ,"0-001b" ), +REGULATOR_SUPPLY ("HPVDD" ,"0-001b" ), +REGULATOR_SUPPLY ("DBVDD" ,"0-001b" ), +REGULATOR_SUPPLY ("DCVDD" ,"0-001b" ), +}; + +static struct regulator_init_data ek_avdd_reg_init_data = { + .constraints = { + .name ="3V3" , + .valid_ops_mask =REGULATOR_CHANGE_STATUS , + }, + .consumer_supplies = ek_audio_consumer_supplies, + .num_consumer_supplies =ARRAY_SIZE (ek_audio_consumer_supplies), +}; + +static struct fixed_voltage_config ek_vdd_pdata = { + .supply_name ="board-3V3" , + .microvolts =3300000 , + .gpio = -EINVAL , + .enabled_at_boot =0 , + .init_data = &ek_avdd_reg_init_data, +}; +static struct platform_device ek_voltage_regulator = { + .name ="reg-fixed-voltage" , + .id =-1 , + .num_resources =0 , + .dev = { + .platform_data = &ek_vdd_pdata, + }, +}; +static void __init ek_add_regulators (void ) +{ +platform_device_register (&ek_voltage_regulator); +} +#else +static void __init ek_add_regulators (void ) {} +#endif +static struct i2c_board_info __initdata ek_i2c_devices[] = { {I2C_BOARD_INFO ("24c512" ,0x50 ),
@@ -256,6 +299,8 @@ static void __init ek_board_init(void)ek_add_device_nand ();/* Ethernet */ at91_add_device_eth (&ek_macb_data); +/* Regulators */ +ek_add_regulators ();/* MMC */ #if defined(CONFIG_MMC_ATMELMCI ) || defined(CONFIG_MMC_ATMELMCI_MODULE )at91_add_device_mci (0 , &ek_mmc_data);
Signature · 1 line
1.7.1
PATCH 2/2 at91sam9g20ek: add fixed-value regulator for wm8731
hi Dmitry,
Quoted 6 lines
If
CONFIG_REGULATORis enabled, wm8731 fails on AT91SAM9G20EK board, since codec driver requires several voltage supplies and none are provided currently. As requires voltages are hardwired to 3V3, use fixed voltage regulator for this chip.Signed-off-by Dmitry Eremin-Solenikov <[email protected]>
Please submit to the patch system.