| Message ID | 20161227175837.28970-2-robertcnelson@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Dec 27, 2016 at 11:58 AM, Robert Nelson <robertcnelson@gmail.com> wrote: > BeagleBone Black Wireless is clone of the BeagleBone Black (BBB) with the Ethernet > replaced by a TI wl1835 wireless module. > > This board can be indentified by the BWAx value after A335BNLT (BBB) in the at24 eeprom: > BWAx [aa 55 33 ee 41 33 33 35 42 4e 4c 54 42 57 41 35 |.U3.A335BNLTBWA5|] > > http://beagleboard.org/black-wireless > https://github.com/beagleboard/beaglebone-black-wireless > > firmware: https://github.com/beagleboard/beaglebone-black-wireless/tree/master/firmware Tony, this firmware should be there shortly, i have a pull request setup for Jason: https://github.com/beagleboard/beaglebone-black-wireless/pull/5 Regards,
* Robert Nelson <robertcnelson@gmail.com> [161227 10:02]: > On Tue, Dec 27, 2016 at 11:58 AM, Robert Nelson <robertcnelson@gmail.com> wrote: > > BeagleBone Black Wireless is clone of the BeagleBone Black (BBB) with the Ethernet > > replaced by a TI wl1835 wireless module. > > > > This board can be indentified by the BWAx value after A335BNLT (BBB) in the at24 eeprom: > > BWAx [aa 55 33 ee 41 33 33 35 42 4e 4c 54 42 57 41 35 |.U3.A335BNLTBWA5|] > > > > http://beagleboard.org/black-wireless > > https://github.com/beagleboard/beaglebone-black-wireless > > > > firmware: https://github.com/beagleboard/beaglebone-black-wireless/tree/master/firmware > > Tony, this firmware should be there shortly, i have a pull request > setup for Jason: > > https://github.com/beagleboard/beaglebone-black-wireless/pull/5 OK great, good to have these working out of the box with mainline kernel :) Tony
* Tony Lindgren <tony@atomide.com> [161227 10:15]: > * Robert Nelson <robertcnelson@gmail.com> [161227 10:02]: > > On Tue, Dec 27, 2016 at 11:58 AM, Robert Nelson <robertcnelson@gmail.com> wrote: > > > BeagleBone Black Wireless is clone of the BeagleBone Black (BBB) with the Ethernet > > > replaced by a TI wl1835 wireless module. > > > > > > This board can be indentified by the BWAx value after A335BNLT (BBB) in the at24 eeprom: > > > BWAx [aa 55 33 ee 41 33 33 35 42 4e 4c 54 42 57 41 35 |.U3.A335BNLTBWA5|] > > > > > > http://beagleboard.org/black-wireless > > > https://github.com/beagleboard/beaglebone-black-wireless > > > > > > firmware: https://github.com/beagleboard/beaglebone-black-wireless/tree/master/firmware > > > > Tony, this firmware should be there shortly, i have a pull request > > setup for Jason: > > > > https://github.com/beagleboard/beaglebone-black-wireless/pull/5 > > OK great, good to have these working out of the box with mainline > kernel :) Hmm so is this firmware file also something that should really be generated separately for each board? Or can the same one be used for all BBB black wireless and green boards? See the LKML thread "[PATCH 0/6] wl1251: Fix MAC address for Nokia N900", at least with wl1251 the calibration has been done for each n900 device during production. Regards, Tony
On Tue, Dec 27, 2016 at 12:56 PM, Tony Lindgren <tony@atomide.com> wrote: > * Tony Lindgren <tony@atomide.com> [161227 10:15]: >> * Robert Nelson <robertcnelson@gmail.com> [161227 10:02]: >> > On Tue, Dec 27, 2016 at 11:58 AM, Robert Nelson <robertcnelson@gmail.com> wrote: >> > > BeagleBone Black Wireless is clone of the BeagleBone Black (BBB) with the Ethernet >> > > replaced by a TI wl1835 wireless module. >> > > >> > > This board can be indentified by the BWAx value after A335BNLT (BBB) in the at24 eeprom: >> > > BWAx [aa 55 33 ee 41 33 33 35 42 4e 4c 54 42 57 41 35 |.U3.A335BNLTBWA5|] >> > > >> > > http://beagleboard.org/black-wireless >> > > https://github.com/beagleboard/beaglebone-black-wireless >> > > >> > > firmware: https://github.com/beagleboard/beaglebone-black-wireless/tree/master/firmware >> > >> > Tony, this firmware should be there shortly, i have a pull request >> > setup for Jason: >> > >> > https://github.com/beagleboard/beaglebone-black-wireless/pull/5 >> >> OK great, good to have these working out of the box with mainline >> kernel :) > > Hmm so is this firmware file also something that should really be generated > separately for each board? Or can the same one be used for all BBB black > wireless and green boards? > > See the LKML thread "[PATCH 0/6] wl1251: Fix MAC address for Nokia N900", > at least with wl1251 the calibration has been done for each n900 device > during production. From what i can tell from TI, it should be good for all wl1835 modules that use two wifi antenna's. (that's the magic in: WL1835MOD_INI_C2PC.ini) We are using the same wl18xx-conf.bin firmware for: Original CircuitCo (now out of production) wl1835mod cape for BeagleBone Black updated GateWay Cape from embest (this was meant to replace the wl1835mod cape) SeeedStudio BeagleBone Green Wireless BeagleBone Black Wireless and the upcoming: (jason just sent me the next alpha, so i'll have a patch after i verify all changes..) BeagleBone Blue For FCC testing, this was the same firmware (wl18xx-conf.bin) that SeeedStudio used when they did the official FCC testing on the Green Wireless. I believe GHI Electronics did the same with the BeagleBone Black Wireless, but i wasn't CC'ed in that email conversation, so i can't say with 100% certainty.. Regards,
> On Dec 27, 2016, at 11:58 AM, Robert Nelson <robertcnelson@gmail.com> wrote: > > BeagleBone Black Wireless is clone of the BeagleBone Black (BBB) with the Ethernet > replaced by a TI wl1835 wireless module. > > This board can be indentified by the BWAx value after A335BNLT (BBB) in the at24 eeprom: > BWAx [aa 55 33 ee 41 33 33 35 42 4e 4c 54 42 57 41 35 |.U3.A335BNLTBWA5|] I believe the correct statement is BWxx, but BWBx reserves the option to be software incompatible in some way. My preference is to have it boot anyway, but I believe that is only dependent in the bootloader. > > http://beagleboard.org/black-wireless > https://github.com/beagleboard/beaglebone-black-wireless > > firmware: https://github.com/beagleboard/beaglebone-black-wireless/tree/master/firmware > wl18xx mac address: /proc/device-tree/ocp/ethernet@4a100000/slave@4a100200/mac-address > > Signed-off-by: Robert Nelson <robertcnelson@gmail.com> > CC: Tony Lindgren <tony@atomide.com> > CC: Jason Kridner <jkridner@beagleboard.org> > --- > arch/arm/boot/dts/Makefile | 1 + > arch/arm/boot/dts/am335x-boneblack-wireless.dts | 109 ++++++++++++++++++++++++ > 2 files changed, 110 insertions(+) > create mode 100644 arch/arm/boot/dts/am335x-boneblack-wireless.dts > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > index cccdbcb557b6..9415a49bd11b 100644 > --- a/arch/arm/boot/dts/Makefile > +++ b/arch/arm/boot/dts/Makefile > @@ -563,6 +563,7 @@ dtb-$(CONFIG_SOC_AM33XX) += \ > am335x-base0033.dtb \ > am335x-bone.dtb \ > am335x-boneblack.dtb \ > + am335x-boneblack-wireless.dtb \ > am335x-bonegreen.dtb \ > am335x-chiliboard.dtb \ > am335x-cm-t335.dtb \ > diff --git a/arch/arm/boot/dts/am335x-boneblack-wireless.dts b/arch/arm/boot/dts/am335x-boneblack-wireless.dts > new file mode 100644 > index 000000000000..105bd10655f7 > --- /dev/null > +++ b/arch/arm/boot/dts/am335x-boneblack-wireless.dts > @@ -0,0 +1,109 @@ > +/* > + * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/ > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as > + * published by the Free Software Foundation. > + */ > +/dts-v1/; > + > +#include "am33xx.dtsi" > +#include "am335x-bone-common.dtsi" > +#include "am335x-boneblack-common.dtsi" > +#include <dt-bindings/interrupt-controller/irq.h> > + > +/ { > + model = "TI AM335x BeagleBone Black Wireless"; > + compatible = "ti,am335x-bone-black-wireless", "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx"; > + > + wlan_en_reg: fixedregulator@2 { > + compatible = "regulator-fixed"; > + regulator-name = "wlan-en-regulator"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <1800000>; > + startup-delay-us= <70000>; > + > + /* WL_EN */ > + gpio = <&gpio3 9 0>; > + enable-active-high; > + }; > +}; > + > +&am33xx_pinmux { > + bt_pins: pinmux_bt_pins { > + pinctrl-single,pins = < > + AM33XX_IOPAD(0x928, PIN_OUTPUT_PULLUP | MUX_MODE7) /* gmii1_txd0.gpio0_28 - BT_EN */ > + >; > + }; > + > + mmc3_pins: pinmux_mmc3_pins { > + pinctrl-single,pins = < > + AM33XX_IOPAD(0x93c, PIN_INPUT_PULLUP | MUX_MODE6 ) /* (L15) gmii1_rxd1.mmc2_clk */ > + AM33XX_IOPAD(0x914, PIN_INPUT_PULLUP | MUX_MODE6 ) /* (J16) gmii1_txen.mmc2_cmd */ > + AM33XX_IOPAD(0x918, PIN_INPUT_PULLUP | MUX_MODE5 ) /* (J17) gmii1_rxdv.mmc2_dat0 */ > + AM33XX_IOPAD(0x91c, PIN_INPUT_PULLUP | MUX_MODE5 ) /* (J18) gmii1_txd3.mmc2_dat1 */ > + AM33XX_IOPAD(0x920, PIN_INPUT_PULLUP | MUX_MODE5 ) /* (K15) gmii1_txd2.mmc2_dat2 */ > + AM33XX_IOPAD(0x908, PIN_INPUT_PULLUP | MUX_MODE5 ) /* (H16) gmii1_col.mmc2_dat3 */ > + >; > + }; > + > + uart3_pins: pinmux_uart3_pins { > + pinctrl-single,pins = < > + AM33XX_IOPAD(0x934, PIN_INPUT_PULLUP | MUX_MODE1) /* gmii1_rxd3.uart3_rxd */ > + AM33XX_IOPAD(0x938, PIN_OUTPUT_PULLDOWN | MUX_MODE1) /* gmii1_rxd2.uart3_txd */ > + AM33XX_IOPAD(0x948, PIN_INPUT | MUX_MODE3) /* mdio_data.uart3_ctsn */ > + AM33XX_IOPAD(0x94c, PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* mdio_clk.uart3_rtsn */ > + >; > + }; > + > + wl18xx_pins: pinmux_wl18xx_pins { > + pinctrl-single,pins = < > + AM33XX_IOPAD(0x92c, PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gmii1_txclk.gpio3_9 WL_EN */ > + AM33XX_IOPAD(0x944, PIN_INPUT_PULLDOWN | MUX_MODE7) /* rmii1_refclk.gpio0_29 WL_IRQ */ > + AM33XX_IOPAD(0x930, PIN_OUTPUT_PULLUP | MUX_MODE7) /* gmii1_rxclk.gpio3_10 LS_BUF_EN */ > + >; > + }; > +}; > + > +&mac { > + status = "disabled"; > +}; > + > +&mmc3 { > + dmas = <&edma_xbar 12 0 1 > + &edma_xbar 13 0 2>; > + dma-names = "tx", "rx"; > + status = "okay"; > + vmmc-supply = <&wlan_en_reg>; > + bus-width = <4>; > + non-removable; > + cap-power-off-card; > + ti,needs-special-hs-handling; > + keep-power-in-suspend; > + pinctrl-names = "default"; > + pinctrl-0 = <&mmc3_pins &wl18xx_pins>; > + > + #address-cells = <1>; > + #size-cells = <0>; > + wlcore: wlcore@2 { > + compatible = "ti,wl1835"; > + reg = <2>; > + interrupt-parent = <&gpio0>; > + interrupts = <29 IRQ_TYPE_EDGE_RISING>; > + }; > +}; > + > +&uart3 { > + pinctrl-names = "default"; > + pinctrl-0 = <&uart3_pins &bt_pins>; > + status = "okay"; > +}; > + > +&gpio3 { > + ls_buf_en { > + gpio-hog; > + gpios = <10 GPIO_ACTIVE_HIGH>; > + output-high; > + line-name = "LS_BUF_EN"; > + }; > +}; > -- > 2.11.0 >
* Jason Kridner <jkridner@gmail.com> [161228 13:27]: > > > > On Dec 27, 2016, at 11:58 AM, Robert Nelson <robertcnelson@gmail.com> wrote: > > > > BeagleBone Black Wireless is clone of the BeagleBone Black (BBB) with the Ethernet > > replaced by a TI wl1835 wireless module. > > > > This board can be indentified by the BWAx value after A335BNLT (BBB) in the at24 eeprom: > > BWAx [aa 55 33 ee 41 33 33 35 42 4e 4c 54 42 57 41 35 |.U3.A335BNLTBWA5|] > > I believe the correct statement is BWxx, but BWBx reserves the option to be software incompatible in some way. My preference is to have it boot anyway, but I believe that is only dependent in the bootloader. So does this patch need updating for that? Regards, Tony
> On Jan 3, 2017, at 3:11 PM, Tony Lindgren <tony@atomide.com> wrote: > > * Jason Kridner <jkridner@gmail.com> [161228 13:27]: >> >> >>> On Dec 27, 2016, at 11:58 AM, Robert Nelson <robertcnelson@gmail.com> wrote: >>> >>> BeagleBone Black Wireless is clone of the BeagleBone Black (BBB) with the Ethernet >>> replaced by a TI wl1835 wireless module. >>> >>> This board can be indentified by the BWAx value after A335BNLT (BBB) in the at24 eeprom: >>> BWAx [aa 55 33 ee 41 33 33 35 42 4e 4c 54 42 57 41 35 |.U3.A335BNLTBWA5|] >> >> I believe the correct statement is BWxx, but BWBx reserves the option to be software incompatible in some way. My preference is to have it boot anyway, but I believe that is only dependent in the bootloader. > > So does this patch need updating for that? No, it is bootloader controlled. > > Regards, > > Tony
* Jason Kridner <jkridner@gmail.com> [170103 12:30]: > > > > On Jan 3, 2017, at 3:11 PM, Tony Lindgren <tony@atomide.com> wrote: > > > > * Jason Kridner <jkridner@gmail.com> [161228 13:27]: > >> > >> > >>> On Dec 27, 2016, at 11:58 AM, Robert Nelson <robertcnelson@gmail.com> wrote: > >>> > >>> BeagleBone Black Wireless is clone of the BeagleBone Black (BBB) with the Ethernet > >>> replaced by a TI wl1835 wireless module. > >>> > >>> This board can be indentified by the BWAx value after A335BNLT (BBB) in the at24 eeprom: > >>> BWAx [aa 55 33 ee 41 33 33 35 42 4e 4c 54 42 57 41 35 |.U3.A335BNLTBWA5|] > >> > >> I believe the correct statement is BWxx, but BWBx reserves the option to be software incompatible in some way. My preference is to have it boot anyway, but I believe that is only dependent in the bootloader. > > > > So does this patch need updating for that? > > No, it is bootloader controlled. What about the patch description? Does it need updating or is that an Acked-by? Tony
* Jason Kridner <jkridner@gmail.com> [170103 12:58]: > Asked-by: Jason Kridner <jdk@ti.com> > > Sorry for the phone mailer (HTML). OK fixed that to Acked-by :) Applied into omap-for-v4.11/dt and pushed out. BBB Green Wireless seems to work nicely for WLAN out of the box with these patches :) Regards, Tony
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index cccdbcb557b6..9415a49bd11b 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -563,6 +563,7 @@ dtb-$(CONFIG_SOC_AM33XX) += \ am335x-base0033.dtb \ am335x-bone.dtb \ am335x-boneblack.dtb \ + am335x-boneblack-wireless.dtb \ am335x-bonegreen.dtb \ am335x-chiliboard.dtb \ am335x-cm-t335.dtb \ diff --git a/arch/arm/boot/dts/am335x-boneblack-wireless.dts b/arch/arm/boot/dts/am335x-boneblack-wireless.dts new file mode 100644 index 000000000000..105bd10655f7 --- /dev/null +++ b/arch/arm/boot/dts/am335x-boneblack-wireless.dts @@ -0,0 +1,109 @@ +/* + * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +/dts-v1/; + +#include "am33xx.dtsi" +#include "am335x-bone-common.dtsi" +#include "am335x-boneblack-common.dtsi" +#include <dt-bindings/interrupt-controller/irq.h> + +/ { + model = "TI AM335x BeagleBone Black Wireless"; + compatible = "ti,am335x-bone-black-wireless", "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx"; + + wlan_en_reg: fixedregulator@2 { + compatible = "regulator-fixed"; + regulator-name = "wlan-en-regulator"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + startup-delay-us= <70000>; + + /* WL_EN */ + gpio = <&gpio3 9 0>; + enable-active-high; + }; +}; + +&am33xx_pinmux { + bt_pins: pinmux_bt_pins { + pinctrl-single,pins = < + AM33XX_IOPAD(0x928, PIN_OUTPUT_PULLUP | MUX_MODE7) /* gmii1_txd0.gpio0_28 - BT_EN */ + >; + }; + + mmc3_pins: pinmux_mmc3_pins { + pinctrl-single,pins = < + AM33XX_IOPAD(0x93c, PIN_INPUT_PULLUP | MUX_MODE6 ) /* (L15) gmii1_rxd1.mmc2_clk */ + AM33XX_IOPAD(0x914, PIN_INPUT_PULLUP | MUX_MODE6 ) /* (J16) gmii1_txen.mmc2_cmd */ + AM33XX_IOPAD(0x918, PIN_INPUT_PULLUP | MUX_MODE5 ) /* (J17) gmii1_rxdv.mmc2_dat0 */ + AM33XX_IOPAD(0x91c, PIN_INPUT_PULLUP | MUX_MODE5 ) /* (J18) gmii1_txd3.mmc2_dat1 */ + AM33XX_IOPAD(0x920, PIN_INPUT_PULLUP | MUX_MODE5 ) /* (K15) gmii1_txd2.mmc2_dat2 */ + AM33XX_IOPAD(0x908, PIN_INPUT_PULLUP | MUX_MODE5 ) /* (H16) gmii1_col.mmc2_dat3 */ + >; + }; + + uart3_pins: pinmux_uart3_pins { + pinctrl-single,pins = < + AM33XX_IOPAD(0x934, PIN_INPUT_PULLUP | MUX_MODE1) /* gmii1_rxd3.uart3_rxd */ + AM33XX_IOPAD(0x938, PIN_OUTPUT_PULLDOWN | MUX_MODE1) /* gmii1_rxd2.uart3_txd */ + AM33XX_IOPAD(0x948, PIN_INPUT | MUX_MODE3) /* mdio_data.uart3_ctsn */ + AM33XX_IOPAD(0x94c, PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* mdio_clk.uart3_rtsn */ + >; + }; + + wl18xx_pins: pinmux_wl18xx_pins { + pinctrl-single,pins = < + AM33XX_IOPAD(0x92c, PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gmii1_txclk.gpio3_9 WL_EN */ + AM33XX_IOPAD(0x944, PIN_INPUT_PULLDOWN | MUX_MODE7) /* rmii1_refclk.gpio0_29 WL_IRQ */ + AM33XX_IOPAD(0x930, PIN_OUTPUT_PULLUP | MUX_MODE7) /* gmii1_rxclk.gpio3_10 LS_BUF_EN */ + >; + }; +}; + +&mac { + status = "disabled"; +}; + +&mmc3 { + dmas = <&edma_xbar 12 0 1 + &edma_xbar 13 0 2>; + dma-names = "tx", "rx"; + status = "okay"; + vmmc-supply = <&wlan_en_reg>; + bus-width = <4>; + non-removable; + cap-power-off-card; + ti,needs-special-hs-handling; + keep-power-in-suspend; + pinctrl-names = "default"; + pinctrl-0 = <&mmc3_pins &wl18xx_pins>; + + #address-cells = <1>; + #size-cells = <0>; + wlcore: wlcore@2 { + compatible = "ti,wl1835"; + reg = <2>; + interrupt-parent = <&gpio0>; + interrupts = <29 IRQ_TYPE_EDGE_RISING>; + }; +}; + +&uart3 { + pinctrl-names = "default"; + pinctrl-0 = <&uart3_pins &bt_pins>; + status = "okay"; +}; + +&gpio3 { + ls_buf_en { + gpio-hog; + gpios = <10 GPIO_ACTIVE_HIGH>; + output-high; + line-name = "LS_BUF_EN"; + }; +};
BeagleBone Black Wireless is clone of the BeagleBone Black (BBB) with the Ethernet replaced by a TI wl1835 wireless module. This board can be indentified by the BWAx value after A335BNLT (BBB) in the at24 eeprom: BWAx [aa 55 33 ee 41 33 33 35 42 4e 4c 54 42 57 41 35 |.U3.A335BNLTBWA5|] http://beagleboard.org/black-wireless https://github.com/beagleboard/beaglebone-black-wireless firmware: https://github.com/beagleboard/beaglebone-black-wireless/tree/master/firmware wl18xx mac address: /proc/device-tree/ocp/ethernet@4a100000/slave@4a100200/mac-address Signed-off-by: Robert Nelson <robertcnelson@gmail.com> CC: Tony Lindgren <tony@atomide.com> CC: Jason Kridner <jkridner@beagleboard.org> --- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/am335x-boneblack-wireless.dts | 109 ++++++++++++++++++++++++ 2 files changed, 110 insertions(+) create mode 100644 arch/arm/boot/dts/am335x-boneblack-wireless.dts