* [PATCH 2/5] ARM: mx31lite: Fix smsc911x driver probe
2012-04-02 13:39 [PATCH 1/5] ARM: mx53ard: Fix smsc911x driver probe Fabio Estevam
@ 2012-04-02 13:39 ` Fabio Estevam
2012-04-02 13:39 ` [PATCH 3/5] ARM: mx31lilly: " Fabio Estevam
` (3 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Fabio Estevam @ 2012-04-02 13:39 UTC (permalink / raw)
To: linux-arm-kernel
Fix smsc911x driver probe by adding a fixed dummy regulator.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
arch/arm/mach-imx/mach-mx31lite.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-imx/mach-mx31lite.c b/arch/arm/mach-imx/mach-mx31lite.c
index ef80751..0abef5f 100644
--- a/arch/arm/mach-imx/mach-mx31lite.c
+++ b/arch/arm/mach-imx/mach-mx31lite.c
@@ -29,6 +29,8 @@
#include <linux/usb/ulpi.h>
#include <linux/mtd/physmap.h>
#include <linux/delay.h>
+#include <linux/regulator/machine.h>
+#include <linux/regulator/fixed.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
@@ -226,6 +228,11 @@ void __init mx31lite_map_io(void)
static int mx31lite_baseboard;
core_param(mx31lite_baseboard, mx31lite_baseboard, int, 0444);
+static struct regulator_consumer_supply dummy_supplies[] = {
+ REGULATOR_SUPPLY("vdd33a", "smsc911x"),
+ REGULATOR_SUPPLY("vddvario", "smsc911x"),
+};
+
static void __init mx31lite_init(void)
{
int ret;
@@ -259,6 +266,8 @@ static void __init mx31lite_init(void)
if (usbh2_pdata.otg)
imx31_add_mxc_ehci_hs(2, &usbh2_pdata);
+ regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));
+
/* SMSC9117 IRQ pin */
ret = gpio_request(IOMUX_TO_GPIO(MX31_PIN_SFS6), "sms9117-irq");
if (ret)
--
1.7.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 3/5] ARM: mx31lilly: Fix smsc911x driver probe
2012-04-02 13:39 [PATCH 1/5] ARM: mx53ard: Fix smsc911x driver probe Fabio Estevam
2012-04-02 13:39 ` [PATCH 2/5] ARM: mx31lite: " Fabio Estevam
@ 2012-04-02 13:39 ` Fabio Estevam
2012-04-02 13:39 ` [PATCH 4/5] ARM: kzm_arm11_01: " Fabio Estevam
` (2 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Fabio Estevam @ 2012-04-02 13:39 UTC (permalink / raw)
To: linux-arm-kernel
Fix smsc911x driver probe by adding a fixed dummy regulator.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
arch/arm/mach-imx/mach-mx31lilly.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-imx/mach-mx31lilly.c b/arch/arm/mach-imx/mach-mx31lilly.c
index 02401bb..83714b0 100644
--- a/arch/arm/mach-imx/mach-mx31lilly.c
+++ b/arch/arm/mach-imx/mach-mx31lilly.c
@@ -34,6 +34,8 @@
#include <linux/mfd/mc13783.h>
#include <linux/usb/otg.h>
#include <linux/usb/ulpi.h>
+#include <linux/regulator/machine.h>
+#include <linux/regulator/fixed.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
@@ -242,6 +244,11 @@ static struct platform_device *devices[] __initdata = {
static int mx31lilly_baseboard;
core_param(mx31lilly_baseboard, mx31lilly_baseboard, int, 0444);
+static struct regulator_consumer_supply dummy_supplies[] = {
+ REGULATOR_SUPPLY("vdd33a", "smsc911x"),
+ REGULATOR_SUPPLY("vddvario", "smsc911x"),
+};
+
static void __init mx31lilly_board_init(void)
{
imx31_soc_init();
@@ -280,6 +287,8 @@ static void __init mx31lilly_board_init(void)
imx31_add_spi_imx1(&spi1_pdata);
spi_register_board_info(&mc13783_dev, 1);
+ regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));
+
platform_add_devices(devices, ARRAY_SIZE(devices));
/* USB */
--
1.7.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 4/5] ARM: kzm_arm11_01: Fix smsc911x driver probe
2012-04-02 13:39 [PATCH 1/5] ARM: mx53ard: Fix smsc911x driver probe Fabio Estevam
2012-04-02 13:39 ` [PATCH 2/5] ARM: mx31lite: " Fabio Estevam
2012-04-02 13:39 ` [PATCH 3/5] ARM: mx31lilly: " Fabio Estevam
@ 2012-04-02 13:39 ` Fabio Estevam
2012-04-02 13:39 ` [PATCH 5/5] ARM: armadillo5x0: " Fabio Estevam
2012-04-02 14:45 ` [PATCH 1/5] ARM: mx53ard: " Sascha Hauer
4 siblings, 0 replies; 8+ messages in thread
From: Fabio Estevam @ 2012-04-02 13:39 UTC (permalink / raw)
To: linux-arm-kernel
Fix smsc911x driver probe by adding a fixed dummy regulator.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
arch/arm/mach-imx/mach-kzm_arm11_01.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-imx/mach-kzm_arm11_01.c b/arch/arm/mach-imx/mach-kzm_arm11_01.c
index fc78e80..8d88bb0 100644
--- a/arch/arm/mach-imx/mach-kzm_arm11_01.c
+++ b/arch/arm/mach-imx/mach-kzm_arm11_01.c
@@ -24,6 +24,8 @@
#include <linux/serial_8250.h>
#include <linux/smsc911x.h>
#include <linux/types.h>
+#include <linux/regulator/machine.h>
+#include <linux/regulator/fixed.h>
#include <asm/irq.h>
#include <asm/mach-types.h>
@@ -166,6 +168,11 @@ static struct platform_device kzm_smsc9118_device = {
},
};
+static struct regulator_consumer_supply dummy_supplies[] = {
+ REGULATOR_SUPPLY("vdd33a", "smsc911x"),
+ REGULATOR_SUPPLY("vddvario", "smsc911x"),
+};
+
static int __init kzm_init_smsc9118(void)
{
/*
@@ -174,6 +181,8 @@ static int __init kzm_init_smsc9118(void)
mxc_iomux_mode(IOMUX_MODE(MX31_PIN_GPIO1_2, IOMUX_CONFIG_GPIO));
gpio_request(IOMUX_TO_GPIO(MX31_PIN_GPIO1_2), "smsc9118-int");
gpio_direction_input(IOMUX_TO_GPIO(MX31_PIN_GPIO1_2));
+
+ regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));
return platform_device_register(&kzm_smsc9118_device);
}
--
1.7.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 5/5] ARM: armadillo5x0: Fix smsc911x driver probe
2012-04-02 13:39 [PATCH 1/5] ARM: mx53ard: Fix smsc911x driver probe Fabio Estevam
` (2 preceding siblings ...)
2012-04-02 13:39 ` [PATCH 4/5] ARM: kzm_arm11_01: " Fabio Estevam
@ 2012-04-02 13:39 ` Fabio Estevam
2012-04-02 14:45 ` [PATCH 1/5] ARM: mx53ard: " Sascha Hauer
4 siblings, 0 replies; 8+ messages in thread
From: Fabio Estevam @ 2012-04-02 13:39 UTC (permalink / raw)
To: linux-arm-kernel
Fix smsc911x driver probe by adding a fixed dummy regulator.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
arch/arm/mach-imx/mach-armadillo5x0.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-imx/mach-armadillo5x0.c b/arch/arm/mach-imx/mach-armadillo5x0.c
index 27bc27e..c650145 100644
--- a/arch/arm/mach-imx/mach-armadillo5x0.c
+++ b/arch/arm/mach-imx/mach-armadillo5x0.c
@@ -38,6 +38,8 @@
#include <linux/usb/otg.h>
#include <linux/usb/ulpi.h>
#include <linux/delay.h>
+#include <linux/regulator/machine.h>
+#include <linux/regulator/fixed.h>
#include <mach/hardware.h>
#include <asm/mach-types.h>
@@ -479,6 +481,11 @@ static struct platform_device *devices[] __initdata = {
&armadillo5x0_smc911x_device,
};
+static struct regulator_consumer_supply dummy_supplies[] = {
+ REGULATOR_SUPPLY("vdd33a", "smsc911x"),
+ REGULATOR_SUPPLY("vddvario", "smsc911x"),
+};
+
/*
* Perform board specific initializations
*/
@@ -489,6 +496,8 @@ static void __init armadillo5x0_init(void)
mxc_iomux_setup_multiple_pins(armadillo5x0_pins,
ARRAY_SIZE(armadillo5x0_pins), "armadillo5x0");
+ regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));
+
platform_add_devices(devices, ARRAY_SIZE(devices));
imx_add_gpio_keys(&armadillo5x0_button_data);
imx31_add_imx_i2c1(NULL);
--
1.7.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 1/5] ARM: mx53ard: Fix smsc911x driver probe
2012-04-02 13:39 [PATCH 1/5] ARM: mx53ard: Fix smsc911x driver probe Fabio Estevam
` (3 preceding siblings ...)
2012-04-02 13:39 ` [PATCH 5/5] ARM: armadillo5x0: " Fabio Estevam
@ 2012-04-02 14:45 ` Sascha Hauer
2012-04-02 15:02 ` Fabio Estevam
4 siblings, 1 reply; 8+ messages in thread
From: Sascha Hauer @ 2012-04-02 14:45 UTC (permalink / raw)
To: linux-arm-kernel
Hi Fabio,
On Mon, Apr 02, 2012 at 10:39:43AM -0300, Fabio Estevam wrote:
> Fix smsc911x driver probe by adding a fixed dummy regulator.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
The series looks good, I applied it to my fixes branch. Unless no
objections to this one come up I'll send a pull request tomorrow. Please
check git://git.pengutronix.de/git/imx/linux-2.6.git imx-fixes and
let me know if I have missed something.
Sascha
> ---
> arch/arm/mach-imx/mach-mx53_ard.c | 8 ++++++++
> 1 files changed, 8 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-imx/mach-mx53_ard.c b/arch/arm/mach-imx/mach-mx53_ard.c
> index 753f4fc..0564198 100644
> --- a/arch/arm/mach-imx/mach-mx53_ard.c
> +++ b/arch/arm/mach-imx/mach-mx53_ard.c
> @@ -23,6 +23,8 @@
> #include <linux/delay.h>
> #include <linux/gpio.h>
> #include <linux/smsc911x.h>
> +#include <linux/regulator/machine.h>
> +#include <linux/regulator/fixed.h>
>
> #include <mach/common.h>
> #include <mach/hardware.h>
> @@ -214,6 +216,11 @@ static int weim_cs_config(void)
> return 0;
> }
>
> +static struct regulator_consumer_supply dummy_supplies[] = {
> + REGULATOR_SUPPLY("vdd33a", "smsc911x"),
> + REGULATOR_SUPPLY("vddvario", "smsc911x"),
> +};
> +
> void __init imx53_ard_common_init(void)
> {
> mxc_iomux_v3_setup_multiple_pads(mx53_ard_pads,
> @@ -232,6 +239,7 @@ static void __init mx53_ard_board_init(void)
>
> imx53_ard_common_init();
> mx53_ard_io_init();
> + regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));
> platform_add_devices(devices, ARRAY_SIZE(devices));
>
> imx53_add_sdhci_esdhc_imx(0, &mx53_ard_sd1_data);
> --
> 1.7.1
>
>
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 8+ messages in thread