Skip to content

Cleanup ZBT-WE826 DTS, add USB WWAN kmods #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ndoo wants to merge 1 commit into from
Closed

Cleanup ZBT-WE826 DTS, add USB WWAN kmods #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion target/linux/ramips/base-files/etc/diag.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,8 @@ get_status_led() {
status_led="$board:amber:cpu"
;;
oy-0001|\
sl-r7205)
sl-r7205|\
zbt-we826)
status_led="$board:green:wifi"
;;
psr-680w)
Expand Down
237 changes: 119 additions & 118 deletions target/linux/ramips/dts/ZBT-WE826.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,122 +3,123 @@
#include "mt7620a.dtsi"

/ {
compatible = "zbtlink,zbt-we826", "ralink,mt7620a-soc";
model = "ZBT-WE826";

chosen {
bootargs = "console=ttyS0,115200";
};

palmbus@10000000 {
gpio0: gpio@600 {
status = "okay";
};

gpio1: gpio@638 {
status = "okay";
};

gpio3: gpio@688 {
status = "okay";
};

spi@b00 {
status = "okay";

en25q128@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "w25q128";
reg = <0 0>;
linux,modalias = "m25p80";
spi-max-frequency = <10000000>;

partition@0 {
label = "u-boot";
reg = <0x0 0x30000>;
read-only;
};

partition@30000 {
label = "u-boot-env";
reg = <0x30000 0x10000>;
read-only;
};

factory: partition@40000 {
label = "factory";
reg = <0x40000 0x10000>;
read-only;
};

partition@50000 {
label = "firmware";
reg = <0x50000 0xfb0000>;
};
};
};
};

sdhci@10130000 {
status = "okay";
};

ehci@101c0000 {
status = "okay";
};

ohci@101c1000 {
status = "okay";
};

ethernet@10100000 {
mtd-mac-address = <&factory 0x4>;
ralink,port-map = "wllll";
};

wmac@10180000 {
ralink,mtd-eeprom = <&factory 0>;
};

pinctrl {
state_default: pinctrl0 {
default {
ralink,group = "i2c", "uartf", "wled", "spi refclk", "pa";
ralink,function = "gpio";
};
};
};

gpio-leds {
compatible = "gpio-leds";
power {
label = "zbt-we826:green:power";
gpios = <&gpio1 14 0>;
};
usb {
label = "zbt-we826:green:usb";
gpios = <&gpio1 15 0>;
};
air {
label = "zbt-we826:green:wifi";
gpios = <&gpio3 0 1>;
};
};

gpio-keys-polled {
compatible = "gpio-keys-polled";
#address-cells = <1>;
#size-cells = <0>;
poll-interval = <20>;
reset {
label = "reset";
gpios = <&gpio0 1 1>;
linux,code = <0x198>;
};
};

pcie@10140000 {
status = "okay";
};
compatible = "zbtlink,zbt-we826", "ralink,mt7620a-soc";
model = "ZBT-WE826";

chosen {
bootargs = "console=ttyS0,115200";
};

palmbus@10000000 {
gpio0: gpio@600 {
status = "okay";
};

gpio1: gpio@638 {
status = "okay";
};

gpio3: gpio@688 {
status = "okay";
};

spi@b00 {
status = "okay";

en25q128@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "w25q128";
reg = <0 0>;
linux,modalias = "m25p80";
spi-max-frequency = <10000000>;

partition@0 {
label = "u-boot";
reg = <0x0 0x30000>;
read-only;
};

partition@30000 {
label = "u-boot-env";
reg = <0x30000 0x10000>;
read-only;
};

factory: partition@40000 {
label = "factory";
reg = <0x40000 0x10000>;
read-only;
};

partition@50000 {
label = "firmware";
reg = <0x50000 0xfb0000>;
};
};
};
};

sdhci@10130000 {
status = "okay";
};

ehci@101c0000 {
status = "okay";
};

ohci@101c1000 {
status = "okay";
};

ethernet@10100000 {
mtd-mac-address = <&factory 0x4>;
ralink,port-map = "wllll";
};

wmac@10180000 {
ralink,mtd-eeprom = <&factory 0>;
};

pinctrl {
state_default: pinctrl0 {
default {
ralink,group = "i2c", "uartf", "wled", "spi refclk", "pa";
ralink,function = "gpio";
};
};
};

gpio-leds {
compatible = "gpio-leds";
power {
label = "zbt-we826:green:power";
gpios = <&gpio1 14 0>;
};
usb {
label = "zbt-we826:green:usb";
gpios = <&gpio1 15 0>;
};
air {
label = "zbt-we826:green:wifi";
gpios = <&gpio3 0 1>;
};
};

gpio-keys-polled {
compatible = "gpio-keys-polled";
#address-cells = <1>;
#size-cells = <0>;
poll-interval = <20>;
reset {
label = "reset";
gpios = <&gpio0 1 1>;
linux,code = <0x198>;
};
};

pcie@10140000 {
status = "okay";
};

};
8 changes: 4 additions & 4 deletions target/linux/ramips/mt7620/profiles/zbt.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
#

define Profile/ZBT-WE826
NAME:=ZBT-WE826 Device
NAME:=ZBT-WE826
PACKAGES:=\
kmod-scsi-core kmod-scsi-generic kmod-mmc kmod-sdhci \
block-mount kmod-usb-core kmod-usb-dwc2 kmod-usb2 kmod-usb-ohci \
kmod-mt76
kmod-mt76 kmod-scsi-core kmod-scsi-generic kmod-mmc kmod-sdhci \
block-mount kmod-usb-core kmod-usb2 kmod-usb-ohci kmod-usb-serial \
kmod-usb-serial-option kmod-usb-serial-wwan comgt wwan
Copy link
Member

@pepe2k pepe2k May 12, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The general convention is to deploy image with only basic and really needed packages.

This model is available (directly from manufacturer) without the WWAN card, so you shouldn't add custom packages here as the user will be able to install them later.

Remember that there is no way to remove packages which are included/builtin in squashfs image - removing/uninstalling them will not free up space on the FLASH.

Copy link
Contributor Author

@ndoo ndoo May 12, 2016 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

@blogic blogic May 12, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On 12/05/2016 10:04, Andrew Yong wrote:

In target/linux/ramips/mt7620/profiles/zbt.mk
#1 (comment):

 PACKAGES:=\

  •    kmod-scsi-core kmod-scsi-generic kmod-mmc kmod-sdhci \

  •    block-mount kmod-usb-core kmod-usb-dwc2 kmod-usb2 kmod-usb-ohci \

  •    kmod-mt76

  •    kmod-mt76 kmod-scsi-core kmod-scsi-generic kmod-mmc kmod-sdhci \

  •    block-mount kmod-usb-core kmod-usb2 kmod-usb-ohci kmod-usb-serial \

  •    kmod-usb-serial-option kmod-usb-serial-wwan comgt wwan

Understood. The SDHC modules should remain though, as the connector is
soldered on.

—
You are receiving this because you modified the open/close state.
Reply to this email directly or view it on GitHub
https://github.com/lede-project/source/pull/1/files/aa6b387161fe65b44216824a4c2c0f9f71a86ffd#r62979358

but its the wrong module. did you test the connector ?

Copy link
Contributor Author

@ndoo ndoo May 12, 2016 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

endef

define Profile/ZBT-WE826/Description
Expand Down