Re: [PATCH 09/13] Add dummy smsc911x regulators to omap3evm.

2012-03-22 Thread Koen Kooi 

Op 22 mrt. 2012, om 06:19 heeft Russ Dill het volgende geschreven:

 Signed-off-by: Russ Dill russ.d...@ti.com
 ---
 arch/arm/mach-omap2/board-omap3evm.c |   15 ++-
 1 files changed, 6 insertions(+), 9 deletions(-)
 
 diff --git a/arch/arm/mach-omap2/board-omap3evm.c 
 b/arch/arm/mach-omap2/board-omap3evm.c
 index a659e19..6a5e57c 100644
 --- a/arch/arm/mach-omap2/board-omap3evm.c
 +++ b/arch/arm/mach-omap2/board-omap3evm.c
 @@ -114,15 +114,6 @@ static struct omap_smsc911x_platform_data smsc911x_cfg = 
 {
 
 static inline void __init omap3evm_init_smsc911x(void)
 {
 - struct clk *l3ck;
 - unsigned int rate;
 -
 - l3ck = clk_get(NULL, l3_ck);
 - if (IS_ERR(l3ck))
 - rate = 1;
 - else
 - rate = clk_get_rate(l3ck);

The above hunk gets added/removed multiple times during this patch series, a 
rebase -i mishap?

regards,

Koen--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 09/13] Add dummy smsc911x regulators to omap3evm.

2012-03-22 Thread Russ Dill 
On Thu, Mar 22, 2012 at 12:07 AM, Koen Kooi k...@dominion.thruhere.net wrote:

 Op 22 mrt. 2012, om 06:19 heeft Russ Dill het volgende geschreven:

 Signed-off-by: Russ Dill russ.d...@ti.com
 ---
 arch/arm/mach-omap2/board-omap3evm.c |   15 ++-
 1 files changed, 6 insertions(+), 9 deletions(-)

 diff --git a/arch/arm/mach-omap2/board-omap3evm.c 
 b/arch/arm/mach-omap2/board-omap3evm.c
 index a659e19..6a5e57c 100644
 --- a/arch/arm/mach-omap2/board-omap3evm.c
 +++ b/arch/arm/mach-omap2/board-omap3evm.c
 @@ -114,15 +114,6 @@ static struct omap_smsc911x_platform_data smsc911x_cfg 
 = {

 static inline void __init omap3evm_init_smsc911x(void)
 {
 -     struct clk *l3ck;
 -     unsigned int rate;
 -
 -     l3ck = clk_get(NULL, l3_ck);
 -     if (IS_ERR(l3ck))
 -             rate = 1;
 -     else
 -             rate = clk_get_rate(l3ck);

 The above hunk gets added/removed multiple times during this patch series, a 
 rebase -i mishap?

Yes, its a rebase -i mishap. I have no idea how it did that as all I
was doing was rewording. I can resend the series
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 09/13] Add dummy smsc911x regulators to omap3evm.

2012-03-21 Thread Russ Dill 
Signed-off-by: Russ Dill russ.d...@ti.com
---
 arch/arm/mach-omap2/board-omap3evm.c |   15 ++-
 1 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/arch/arm/mach-omap2/board-omap3evm.c 
b/arch/arm/mach-omap2/board-omap3evm.c
index a659e19..6a5e57c 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -114,15 +114,6 @@ static struct omap_smsc911x_platform_data smsc911x_cfg = {
 
 static inline void __init omap3evm_init_smsc911x(void)
 {
-   struct clk *l3ck;
-   unsigned int rate;
-
-   l3ck = clk_get(NULL, l3_ck);
-   if (IS_ERR(l3ck))
-   rate = 1;
-   else
-   rate = clk_get_rate(l3ck);
-
/* Configure ethernet controller reset gpio */
if (cpu_is_omap3430()) {
if (get_omap3_evm_rev() == OMAP3EVM_BOARD_GEN_1)
@@ -632,9 +623,15 @@ static void __init omap3_evm_wl12xx_init(void)
 #endif
 }
 
+static struct regulator_consumer_supply dummy_supplies[] = {
+   REGULATOR_SUPPLY(vddvario, smsc911x.0),
+   REGULATOR_SUPPLY(vdd33a, smsc911x.0),
+};
+
 static void __init omap3_evm_init(void)
 {
omap3_evm_get_revision();
+   regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));
 
if (cpu_is_omap3630())
omap3_mux_init(omap36x_board_mux, OMAP_PACKAGE_CBB);
-- 
1.7.9.1

--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html