| Message ID | 1385801473-97460-1-git-send-email-gwenhael.goavec-merou@armadeus.com |
|---|---|
| State | New |
| Headers | show |
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 >
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@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@80030000 { > @@ -131,6 +141,8 @@ > > ahb@80080000 { > usb0: usb@80080000 { > + pinctrl-names = "default"; > + pinctrl-0 = <&usb0_otg_apf28dev>; > vbus-supply = <®_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 >
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
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
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"))
Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com> --- arch/arm/mach-mxs/mach-mxs.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)