Patchwork [1/5] ARM: mx53ard: Fix smsc911x driver probe

login
register
mail settings
Submitter Fabio Estevam
Date April 2, 2012, 1:39 p.m.
Message ID <1333373987-30459-1-git-send-email-fabio.estevam@freescale.com>
Download mbox | patch
Permalink /patch/150155/
State New
Headers show

Comments

Fabio Estevam - April 2, 2012, 1:39 p.m.
Fix smsc911x driver probe by adding a fixed dummy regulator.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 arch/arm/mach-imx/mach-mx53_ard.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
Sascha Hauer - April 2, 2012, 2:45 p.m.
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
> 
> 
>
Fabio Estevam - April 2, 2012, 3:02 p.m.
On Mon, Apr 2, 2012 at 11:45 AM, Sascha Hauer <s.hauer@pengutronix.de> wrote:

> 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.

Please apply this one too:
http://patchwork.ozlabs.org/patch/144942/

Thanks,

Fabio Estevam
Fabio Estevam - April 2, 2012, 3:04 p.m.
On Mon, Apr 2, 2012 at 12:02 PM, Fabio Estevam <festevam@gmail.com> wrote:

> Please apply this one too:
> http://patchwork.ozlabs.org/patch/144942/

Ops, I see this one on your branch now.

Patch

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);