[PATCH 1/2] ARM: imx28: add apf28 specific initialization (macaddr)

linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed

* [PATCH 1/2] ARM: imx28: add apf28 specific initialization (macaddr)
@ 2013-11-30  8:51 Gwenhael Goavec-Merou
  2013-11-30  8:51 ` [PATCH 2/2] ARM: apf28dev: dts: set gpio polarity for usb regulator and pinctrl for regulator gpio Gwenhael Goavec-Merou
  2013-12-03  8:50 ` [PATCH 1/2] ARM: imx28: add apf28 specific initialization (macaddr) Shawn Guo
  0 siblings, 2 replies; 6+ messages in thread
From: Gwenhael Goavec-Merou @ 2013-11-30  8:51 UTC (permalink / raw)
  To: linux-arm-kernel

Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com>
---
 arch/arm/mach-mxs/mach-mxs.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
index 3982e12..02b17f7 100644
--- a/arch/arm/mach-mxs/mach-mxs.c
+++ b/arch/arm/mach-mxs/mach-mxs.c
@@ -158,6 +158,7 @@ enum mac_oui {
 	OUI_DENX,
 	OUI_CRYSTALFONTZ,
 	OUI_I2SE,
+	OUI_ARMADEUS,
 };
 
 static void __init update_fec_mac_prop(enum mac_oui oui)
@@ -217,6 +218,11 @@ static void __init update_fec_mac_prop(enum mac_oui oui)
 			macaddr[1] = 0x01;
 			macaddr[2] = 0x87;
 			break;
+		case OUI_ARMADEUS:
+			macaddr[0] = 0x00;
+			macaddr[1] = 0x1e;
+			macaddr[2] = 0xac;
+			break;
 		}
 		val = ocotp[i];
 		macaddr[3] = (val >> 16) & 0xff;
@@ -242,6 +248,11 @@ static void __init imx28_evk_init(void)
 	mxs_saif_clkmux_select(MXS_DIGCTL_SAIF_CLKMUX_EXTMSTR0);
 }
 
+static void __init imx28_apf28_init(void)
+{
+	update_fec_mac_prop(OUI_ARMADEUS);
+}
+
 static int apx4devkit_phy_fixup(struct phy_device *phy)
 {
 	phy->dev_flags |= MICREL_PHY_50MHZ_CLK;
@@ -469,6 +480,8 @@ static void __init mxs_machine_init(void)
 
 	if (of_machine_is_compatible("fsl,imx28-evk"))
 		imx28_evk_init();
+	if (of_machine_is_compatible("armadeus,imx28-apf28"))
+		imx28_apf28_init();
 	else if (of_machine_is_compatible("bluegiga,apx4devkit"))
 		apx4devkit_init();
 	else if (of_machine_is_compatible("crystalfontz,cfa10036"))
-- 
1.8.3.2

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 2/2] ARM: apf28dev: dts: set gpio polarity for usb regulator and pinctrl for regulator gpio
  2013-11-30  8:51 [PATCH 1/2] ARM: imx28: add apf28 specific initialization (macaddr) Gwenhael Goavec-Merou
@ 2013-11-30  8:51 ` Gwenhael Goavec-Merou
  2013-12-03  8:53   ` Shawn Guo
  2013-12-03  8:50 ` [PATCH 1/2] ARM: imx28: add apf28 specific initialization (macaddr) Shawn Guo
  1 sibling, 1 reply; 6+ messages in thread
From: Gwenhael Goavec-Merou @ 2013-11-30  8:51 UTC (permalink / raw)
  To: linux-arm-kernel

Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com>
---
 arch/arm/boot/dts/imx28-apf28dev.dts | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/arch/arm/boot/dts/imx28-apf28dev.dts b/arch/arm/boot/dts/imx28-apf28dev.dts
index 741aecb..334dea5 100644
--- a/arch/arm/boot/dts/imx28-apf28dev.dts
+++ b/arch/arm/boot/dts/imx28-apf28dev.dts
@@ -66,6 +66,16 @@
 					fsl,voltage = <MXS_VOLTAGE_HIGH>;
 					fsl,pull-up = <MXS_PULL_DISABLE>;
 				};
+
+				usb0_otg_apf28dev: otg-apf28dev at 0 {
+					reg = <0>;
+					fsl,pinmux-ids = <
+						MX28_PAD_LCD_D23__GPIO_1_23
+					>;
+					fsl,drive-strength = <MXS_DRIVE_4mA>;
+					fsl,voltage = <MXS_VOLTAGE_HIGH>;
+					fsl,pull-up = <MXS_PULL_DISABLE>;
+				};
 			};
 
 			lcdif at 80030000 {
@@ -131,6 +141,8 @@
 
 	ahb at 80080000 {
 		usb0: usb at 80080000 {
+			pinctrl-names = "default";
+			pinctrl-0 = <&usb0_otg_apf28dev>;
 			vbus-supply = <&reg_usb0_vbus>;
 			status = "okay";
 		};
@@ -160,6 +172,7 @@
 			regulator-min-microvolt = <5000000>;
 			regulator-max-microvolt = <5000000>;
 			gpio = <&gpio1 23 1>;
+			enable-active-high;
 		};
 	};
 
-- 
1.8.3.2

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 2/2] ARM: apf28dev: dts: set gpio polarity for usb regulator and pinctrl for regulator gpio
  2013-11-30  8:51 ` [PATCH 2/2] ARM: apf28dev: dts: set gpio polarity for usb regulator and pinctrl for regulator gpio Gwenhael Goavec-Merou
@ 2013-12-03  8:53   ` Shawn Guo
  0 siblings, 0 replies; 6+ messages in thread
From: Shawn Guo @ 2013-12-03  8:53 UTC (permalink / raw)
  To: linux-arm-kernel

On Sat, Nov 30, 2013 at 09:51:13AM +0100, Gwenhael Goavec-Merou wrote:
> Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com>

Changed the patch subject to "ARM: dts: apf28dev: ..." and applied.

Shawn

> ---
>  arch/arm/boot/dts/imx28-apf28dev.dts | 13 +++++++++++++
>  1 file changed, 13 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/imx28-apf28dev.dts b/arch/arm/boot/dts/imx28-apf28dev.dts
> index 741aecb..334dea5 100644
> --- a/arch/arm/boot/dts/imx28-apf28dev.dts
> +++ b/arch/arm/boot/dts/imx28-apf28dev.dts
> @@ -66,6 +66,16 @@
>  					fsl,voltage = <MXS_VOLTAGE_HIGH>;
>  					fsl,pull-up = <MXS_PULL_DISABLE>;
>  				};
> +
> +				usb0_otg_apf28dev: otg-apf28dev at 0 {
> +					reg = <0>;
> +					fsl,pinmux-ids = <
> +						MX28_PAD_LCD_D23__GPIO_1_23
> +					>;
> +					fsl,drive-strength = <MXS_DRIVE_4mA>;
> +					fsl,voltage = <MXS_VOLTAGE_HIGH>;
> +					fsl,pull-up = <MXS_PULL_DISABLE>;
> +				};
>  			};
>  
>  			lcdif at 80030000 {
> @@ -131,6 +141,8 @@
>  
>  	ahb at 80080000 {
>  		usb0: usb at 80080000 {
> +			pinctrl-names = "default";
> +			pinctrl-0 = <&usb0_otg_apf28dev>;
>  			vbus-supply = <&reg_usb0_vbus>;
>  			status = "okay";
>  		};
> @@ -160,6 +172,7 @@
>  			regulator-min-microvolt = <5000000>;
>  			regulator-max-microvolt = <5000000>;
>  			gpio = <&gpio1 23 1>;
> +			enable-active-high;
>  		};
>  	};
>  
> -- 
> 1.8.3.2
> 

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 1/2] ARM: imx28: add apf28 specific initialization (macaddr)
  2013-11-30  8:51 [PATCH 1/2] ARM: imx28: add apf28 specific initialization (macaddr) Gwenhael Goavec-Merou
  2013-11-30  8:51 ` [PATCH 2/2] ARM: apf28dev: dts: set gpio polarity for usb regulator and pinctrl for regulator gpio Gwenhael Goavec-Merou
@ 2013-12-03  8:50 ` Shawn Guo
  2013-12-03  8:53   ` gwenhael.goavec
  1 sibling, 1 reply; 6+ messages in thread
From: Shawn Guo @ 2013-12-03  8:50 UTC (permalink / raw)
  To: linux-arm-kernel

On Sat, Nov 30, 2013 at 09:51:12AM +0100, Gwenhael Goavec-Merou wrote:
> Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com>
> ---
>  arch/arm/mach-mxs/mach-mxs.c | 13 +++++++++++++
>  1 file changed, 13 insertions(+)
> 
> diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
> index 3982e12..02b17f7 100644
> --- a/arch/arm/mach-mxs/mach-mxs.c
> +++ b/arch/arm/mach-mxs/mach-mxs.c
> @@ -158,6 +158,7 @@ enum mac_oui {
>  	OUI_DENX,
>  	OUI_CRYSTALFONTZ,
>  	OUI_I2SE,

What tree are you based on?  I do not have this OUI_I2SE thing in my
tree.

Shawn

> +	OUI_ARMADEUS,
>  };
>  
>  static void __init update_fec_mac_prop(enum mac_oui oui)
> @@ -217,6 +218,11 @@ static void __init update_fec_mac_prop(enum mac_oui oui)
>  			macaddr[1] = 0x01;
>  			macaddr[2] = 0x87;
>  			break;
> +		case OUI_ARMADEUS:
> +			macaddr[0] = 0x00;
> +			macaddr[1] = 0x1e;
> +			macaddr[2] = 0xac;
> +			break;
>  		}
>  		val = ocotp[i];
>  		macaddr[3] = (val >> 16) & 0xff;
> @@ -242,6 +248,11 @@ static void __init imx28_evk_init(void)
>  	mxs_saif_clkmux_select(MXS_DIGCTL_SAIF_CLKMUX_EXTMSTR0);
>  }
>  
> +static void __init imx28_apf28_init(void)
> +{
> +	update_fec_mac_prop(OUI_ARMADEUS);
> +}
> +
>  static int apx4devkit_phy_fixup(struct phy_device *phy)
>  {
>  	phy->dev_flags |= MICREL_PHY_50MHZ_CLK;
> @@ -469,6 +480,8 @@ static void __init mxs_machine_init(void)
>  
>  	if (of_machine_is_compatible("fsl,imx28-evk"))
>  		imx28_evk_init();
> +	if (of_machine_is_compatible("armadeus,imx28-apf28"))
> +		imx28_apf28_init();
>  	else if (of_machine_is_compatible("bluegiga,apx4devkit"))
>  		apx4devkit_init();
>  	else if (of_machine_is_compatible("crystalfontz,cfa10036"))
> -- 
> 1.8.3.2
> 

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 1/2] ARM: imx28: add apf28 specific initialization (macaddr)
  2013-12-03  8:50 ` [PATCH 1/2] ARM: imx28: add apf28 specific initialization (macaddr) Shawn Guo
@ 2013-12-03  8:53   ` gwenhael.goavec
  2013-12-03 10:56     ` Shawn Guo
  0 siblings, 1 reply; 6+ messages in thread
From: gwenhael.goavec @ 2013-12-03  8:53 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, 3 Dec 2013 16:50:32 +0800
Shawn Guo <shawn.guo@linaro.org> wrote:

> On Sat, Nov 30, 2013 at 09:51:12AM +0100, Gwenhael Goavec-Merou wrote:
> > Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com>
> > ---
> >  arch/arm/mach-mxs/mach-mxs.c | 13 +++++++++++++
> >  1 file changed, 13 insertions(+)
> > 
> > diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
> > index 3982e12..02b17f7 100644
> > --- a/arch/arm/mach-mxs/mach-mxs.c
> > +++ b/arch/arm/mach-mxs/mach-mxs.c
> > @@ -158,6 +158,7 @@ enum mac_oui {
> >  	OUI_DENX,
> >  	OUI_CRYSTALFONTZ,
> >  	OUI_I2SE,
> 
> What tree are you based on?  I do not have this OUI_I2SE thing in my
> tree.
> 
> Shawn
> 
It's the for-next[1] branch of
git://git.linaro.org/people/shawnguo/linux-2.6.git

Gwenhael

[1]
https://git.linaro.org/gitweb?p=people/shawnguo/linux-2.6.git;a=blob;f=arch/arm/mach-mxs/mach-mxs.c;h=3982e129c054da764d6035b0d2640b0f70a44760;hb=refs/heads/for-next

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 1/2] ARM: imx28: add apf28 specific initialization (macaddr)
  2013-12-03  8:53   ` gwenhael.goavec
@ 2013-12-03 10:56     ` Shawn Guo
  0 siblings, 0 replies; 6+ messages in thread
From: Shawn Guo @ 2013-12-03 10:56 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Dec 03, 2013 at 09:53:35AM +0100, gwenhael.goavec wrote:
> On Tue, 3 Dec 2013 16:50:32 +0800
> Shawn Guo <shawn.guo@linaro.org> wrote:
> 
> > On Sat, Nov 30, 2013 at 09:51:12AM +0100, Gwenhael Goavec-Merou wrote:
> > > Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com>
> > > ---
> > >  arch/arm/mach-mxs/mach-mxs.c | 13 +++++++++++++
> > >  1 file changed, 13 insertions(+)
> > > 
> > > diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
> > > index 3982e12..02b17f7 100644
> > > --- a/arch/arm/mach-mxs/mach-mxs.c
> > > +++ b/arch/arm/mach-mxs/mach-mxs.c
> > > @@ -158,6 +158,7 @@ enum mac_oui {
> > >  	OUI_DENX,
> > >  	OUI_CRYSTALFONTZ,
> > >  	OUI_I2SE,
> > 
> > What tree are you based on?  I do not have this OUI_I2SE thing in my
> > tree.
> > 
> > Shawn
> > 
> It's the for-next[1] branch of
> git://git.linaro.org/people/shawnguo/linux-2.6.git

Sorry.  I wasn't looking at the correct branch.  Applied, thanks.

Shawn

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2013-12-03 10:56 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-30  8:51 [PATCH 1/2] ARM: imx28: add apf28 specific initialization (macaddr) Gwenhael Goavec-Merou
2013-11-30  8:51 ` [PATCH 2/2] ARM: apf28dev: dts: set gpio polarity for usb regulator and pinctrl for regulator gpio Gwenhael Goavec-Merou
2013-12-03  8:53   ` Shawn Guo
2013-12-03  8:50 ` [PATCH 1/2] ARM: imx28: add apf28 specific initialization (macaddr) Shawn Guo
2013-12-03  8:53   ` gwenhael.goavec
2013-12-03 10:56     ` Shawn Guo

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