From 47381aadd545bf1fb92159fac5c43e92749a10fe Mon Sep 17 00:00:00 2001 From: Deng Qingfang Date: Fri, 14 Dec 2018 18:15:52 +0800 Subject: [PATCH] ramips: several fixes for HC5x61 - Mark other partitions as read-only for HC5x61 - Only enable USB and PCIe for HC5761/HC5861 HC5661 doesn't have a USB port, and there is nothing attached to its PCIe. - Fix HC5761 switch ports HC5761 has only 3 ethernet ports (1x WAN + 2x LAN). Remove unused ports. - Fix HC5861 5GHz radio HC5861 has MT7612EN 5GHz WiFi chip, not MT7610EN. - Fix HC5761/HC5861 WiFi LEDs After 5GHz is enabled, it becomes wlan0. And 2.4GHz would be wlan1. - Fix HC5x61 image size It should be 15872k (0xf80000) Signed-off-by: Deng Qingfang --- .../linux/ramips/base-files/etc/board.d/01_leds | 10 +++------- .../ramips/base-files/etc/board.d/02_network | 7 ++++++- target/linux/ramips/dts/HC5761.dts | 12 ++++++++++++ target/linux/ramips/dts/HC5861.dts | 12 ++++++++++++ target/linux/ramips/dts/HC5X61.dtsi | 17 +++++------------ target/linux/ramips/image/mt7620.mk | 10 +++++----- 6 files changed, 43 insertions(+), 25 deletions(-) diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds index f8c4b05b9a..0fca40e1e0 100755 --- a/target/linux/ramips/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/base-files/etc/board.d/01_leds @@ -167,15 +167,11 @@ hc5661a) ucidef_set_led_netdev "internet" "internet" "$boardname:blue:internet" "eth0.2" set_wifi_led "$boardname:blue:wlan2g" ;; -hc5761) - ucidef_set_led_netdev "internet" "internet" "$boardname:blue:internet" "eth0.2" - set_wifi_led "$boardname:blue:wlan2g" - ucidef_set_led_netdev "wifi5g" "wifi5g" "$boardname:blue:wlan5g" "rai0" - ;; +hc5761|\ hc5861) ucidef_set_led_netdev "internet" "internet" "$boardname:blue:internet" "eth0.2" - set_wifi_led "$boardname:blue:wlan2g" - ucidef_set_led_netdev "wifi5g" "wifi5g" "$boardname:blue:wlan5g" "rai0" + ucidef_set_led_netdev "wifi5g" "wifi5g" "$boardname:blue:wlan5g" "wlan0" + ucidef_set_led_netdev "wifi2g" "wifi2g" "$boardname:blue:wlan2g" "wlan1" ;; hg255d) set_wifi_led "$boardname:green:wlan" diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network index 2f5005009a..eed8d50392 100755 --- a/target/linux/ramips/base-files/etc/board.d/02_network +++ b/target/linux/ramips/base-files/etc/board.d/02_network @@ -304,7 +304,8 @@ ramips_setup_interfaces() ucidef_add_switch "switch1" \ "1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "6@eth0" ;; - hc5*61|\ + hc5661|\ + hc5861|\ y1s) ucidef_add_switch "switch0" \ "1:lan" "2:lan" "3:lan" "4:lan" "5:lan" "0:wan" "6@eth0" @@ -327,6 +328,10 @@ ramips_setup_interfaces() "0:lan" "1:lan" "2:lan" "3:lan" "6t@eth0" ucidef_set_interface_wan "usb0" ;; + hc5761) + ucidef_add_switch "switch0" \ + "1:lan" "4:lan" "0:wan" "6@eth0" + ;; mzk-dp150n|\ vocore-8M|\ vocore-16M) diff --git a/target/linux/ramips/dts/HC5761.dts b/target/linux/ramips/dts/HC5761.dts index 785535811d..31ed99ad09 100644 --- a/target/linux/ramips/dts/HC5761.dts +++ b/target/linux/ramips/dts/HC5761.dts @@ -38,6 +38,18 @@ }; }; +&ehci { + status = "okay"; +}; + +&ohci { + status = "okay"; +}; + +&pcie { + status = "okay"; +}; + &pcie0 { mt76@0,0 { reg = <0x0000 0 0 0 0>; diff --git a/target/linux/ramips/dts/HC5861.dts b/target/linux/ramips/dts/HC5861.dts index f157991d91..519996486c 100644 --- a/target/linux/ramips/dts/HC5861.dts +++ b/target/linux/ramips/dts/HC5861.dts @@ -60,6 +60,14 @@ }; }; +&ehci { + status = "okay"; +}; + +&ohci { + status = "okay"; +}; + ðernet { status = "okay"; mtd-mac-address = <&factory 0x4>; @@ -98,6 +106,10 @@ mediatek,port4 = "gmac"; }; +&pcie { + status = "okay"; +}; + &pcie0 { mt76@0,0 { reg = <0x0000 0 0 0 0>; diff --git a/target/linux/ramips/dts/HC5X61.dtsi b/target/linux/ramips/dts/HC5X61.dtsi index 256d94a250..8da05adeef 100644 --- a/target/linux/ramips/dts/HC5X61.dtsi +++ b/target/linux/ramips/dts/HC5X61.dtsi @@ -67,6 +67,7 @@ partition@0 { label = "u-boot"; reg = <0x0 0x30000>; + read-only; }; partition@30000 { @@ -78,6 +79,7 @@ factory: partition@40000 { label = "factory"; reg = <0x40000 0x10000>; + read-only; }; partition@50000 { @@ -89,29 +91,24 @@ partition@fd0000 { label = "hwf_config"; reg = <0xfd0000 0x10000>; + read-only; }; bdinfo: partition@fe0000 { label = "bdinfo"; reg = <0xfe0000 0x10000>; + read-only; }; partition@ff0000 { label = "backup"; reg = <0xff0000 0x10000>; + read-only; }; }; }; }; -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; - ðernet { pinctrl-names = "default"; pinctrl-0 = <&ephy_pins>; @@ -129,10 +126,6 @@ pinctrl-0 = <&pa_pins>; }; -&pcie { - status = "okay"; -}; - &pinctrl { state_default: pinctrl0 { gpio { diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk index 10c3748885..3a8b04a39c 100644 --- a/target/linux/ramips/image/mt7620.mk +++ b/target/linux/ramips/image/mt7620.mk @@ -297,15 +297,15 @@ TARGET_DEVICES += gl-mt750 define Device/hc5661 DTS := HC5661 - IMAGE_SIZE := $(ralink_default_fw_size_16M) + IMAGE_SIZE := 15872k DEVICE_TITLE := HiWiFi HC5661 - DEVICE_PACKAGES := kmod-usb2 kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := kmod-sdhci-mt7620 endef TARGET_DEVICES += hc5661 define Device/hc5761 DTS := HC5761 - IMAGE_SIZE := $(ralink_default_fw_size_16M) + IMAGE_SIZE := 15872k DEVICE_TITLE := HiWiFi HC5761 DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport endef @@ -313,9 +313,9 @@ TARGET_DEVICES += hc5761 define Device/hc5861 DTS := HC5861 - IMAGE_SIZE := $(ralink_default_fw_size_16M) + IMAGE_SIZE := 15872k DEVICE_TITLE := HiWiFi HC5861 - DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport endef TARGET_DEVICES += hc5861 -- 2.25.1