Skip to content

Commit

Permalink
[bot] AutoMerging: merge all upstream's changes:
Browse files Browse the repository at this point in the history
* https://github.com/coolsnowwolf/lede:
  mediatek: fix PWM fan on BPi-R4 for 6.1 kernel
  Version update to R24.7.7
  autocore: add mediatek mt7988 cpufreq display
  mediatek: sync kernel 6.1 from upstream
  mediatek: filogic: fix HF-M7986R1 reset button
  mediatek: filogic: add HF-M7986R1 emmc sysupgrade support
  f2fs-tools: Add missing 'f2fslabel' symlink
  • Loading branch information
zesming committed Jul 4, 2024
2 parents 92c5864 + df4e307 commit 11ff365
Show file tree
Hide file tree
Showing 217 changed files with 16,176 additions and 3,046 deletions.
19 changes: 12 additions & 7 deletions package/lean/autocore/files/arm/sbin/cpuinfo
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@ elif grep -q "bcm53xx" "/etc/openwrt_release"; then
cpu_freq="$(nvram get clkfreq | awk -F ',' '{print $1}')MHz"
elif grep -q "mvebu" "/etc/openwrt_release"; then
cpu_freq="$(cat "/proc/cpuinfo" | grep "BogoMIPS" | sed -n "1p" | awk -F ': ' '{print $2}')MHz"
elif ! grep -q "filogic" "/etc/openwrt_release"; then
cpu_freq="$(expr $(cat /sys/devices/system/cpu/cpufreq/policy0/cpuinfo_cur_freq) / 1000)MHz"
if grep -q "rockchip" "/etc/openwrt_release"; then
elif grep -q "filogic" "/etc/openwrt_release"; then
[ -f "/sys/devices/system/cpu/cpufreq/policy0/cpuinfo_cur_freq" ] && big_cpu_freq="$(expr $(cat /sys/devices/system/cpu/cpufreq/policy0/cpuinfo_cur_freq) / 1000)MHz"
elif grep -q "rockchip" "/etc/openwrt_release"; then
big_cpu_freq="$(expr $(cat /sys/devices/system/cpu/cpufreq/policy4/cpuinfo_cur_freq 2>"/dev/null") / 1000 2>"/dev/null")"
[ -n "${big_cpu_freq}" ] && big_cpu_freq="${big_cpu_freq}MHz "
fi
else
cpu_freq="$(expr $(cat /sys/devices/system/cpu/cpufreq/policy0/cpuinfo_cur_freq) / 1000)MHz"
fi

if grep -q "ipq" "/etc/openwrt_release"; then
Expand All @@ -32,8 +33,12 @@ else
cpu_temp="$(awk "BEGIN{printf (\"%.1f\n\",$(cat /sys/class/thermal/thermal_zone0/temp)/1000) }")°C"
fi
if grep -q "filogic" "/etc/openwrt_release"; then
echo -n "${cpu_arch} x ${cpu_cores} (${cpu_temp})"
else
echo -n "${cpu_arch} x ${cpu_cores} (${big_cpu_freq}${cpu_freq}, ${cpu_temp})"
if [ -n "${big_cpu_freq}" ] ; then
echo -n "${cpu_arch} x ${cpu_cores} (${big_cpu_freq}, ${cpu_temp})"
else
echo -n "${cpu_arch} x ${cpu_cores} (${cpu_temp})"
fi
else
echo -n "${cpu_arch} x ${cpu_cores} (${big_cpu_freq}${cpu_freq}, ${cpu_temp})"
fi
fi
8 changes: 7 additions & 1 deletion package/lean/default-settings/files/zzz-default-settings
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,19 @@ sed -i '/option disabled/d' /etc/config/wireless
sed -i '/set wireless.radio${devidx}.disabled/d' /lib/wifi/mac80211.sh

sed -i '/DISTRIB_REVISION/d' /etc/openwrt_release
echo "DISTRIB_REVISION='R24.6.6'" >> /etc/openwrt_release
echo "DISTRIB_REVISION='R24.7.7'" >> /etc/openwrt_release
sed -i '/DISTRIB_DESCRIPTION/d' /etc/openwrt_release
echo "DISTRIB_DESCRIPTION='OpenWrt '" >> /etc/openwrt_release

sed -i '/log-facility/d' /etc/dnsmasq.conf
echo "log-facility=/dev/null" >> /etc/dnsmasq.conf

if [ -f /www/luci-static/resources/luci.js ]; then
sed -i 's/ifname/device/g' /etc/config/network
else
sed -i 's/device/ifname/g' /etc/config/network
fi

rm -rf /tmp/luci-modulecache/
rm -f /tmp/luci-indexcache

Expand Down
3 changes: 2 additions & 1 deletion package/utils/f2fs-tools/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=f2fs-tools
PKG_VERSION:=1.16.0
PKG_RELEASE:=2
PKG_RELEASE:=3

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/
Expand Down Expand Up @@ -137,6 +137,7 @@ define Package/f2fsck/install
$(LN) ../sbin/fsck.f2fs $(1)/usr/sbin/dump.f2fs
$(LN) ../sbin/fsck.f2fs $(1)/usr/sbin/sload.f2fs
$(LN) ../sbin/fsck.f2fs $(1)/usr/sbin/resize.f2fs
$(LN) ../sbin/fsck.f2fs $(1)/usr/sbin/f2fslabel
endef

Package/f2fsck-selinux/install = $(Package/f2fsck/install)
Expand Down
11 changes: 2 additions & 9 deletions target/linux/mediatek/dts/mt7986a-hf-m7986r1.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,10 @@
reg = <0 0x40000000 0 0x40000000>;
};

gpio-keys {
keys {
compatible = "gpio-keys";

// seems to conflict with pcie_clk, needs investigate
button-reset {
reset {
label = "reset";
linux,code = <KEY_RESTART>;
gpios = <&pio 9 GPIO_ACTIVE_LOW>;
Expand Down Expand Up @@ -167,11 +166,6 @@
mediatek,pull-down-adv = <1>;
output-low;
};

mux {
function = "pcie";
groups = "pcie_clk", "pcie_wake", "pcie_pereset";
};
};

usb_pins: usb-pins {
Expand Down Expand Up @@ -323,7 +317,6 @@
hs400-ds-delay = <0x14014>;
max-frequency = <200000000>;
mmc-hs200-1_8v;
mmc-hs400-1_8v;
no-sd;
no-sdio;
non-removable;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */
/dts-v1/;
/plugin/;

#include <dt-bindings/gpio/gpio.h>

/ {
compatible = "mediatek,mt7981-rfb", "mediatek,mt7981";

fragment@0 {
target = <&gmac1>;
__overlay__ {
phy-mode = "2500base-x";
phy-handle = <&phy5>;
};
};

fragment@1 {
target = <&mdio_bus>;
__overlay__ {
reset-gpios = <&pio 14 GPIO_ACTIVE_LOW>;
reset-delay-us = <600>;
reset-post-delay-us = <20000>;

phy5: ethernet-phy@5 {
reg = <5>;
compatible = "ethernet-phy-ieee802.3-c45";
phy-mode = "2500base-x";
};
};
};
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */
/dts-v1/;
/plugin/;

#include <dt-bindings/gpio/gpio.h>

/ {
compatible = "mediatek,mt7981-rfb", "mediatek,mt7981";

fragment@0 {
target = <&sw_p5>;
__overlay__ {
phy-mode = "2500base-x";
phy-handle = <&phy5>;
status = "okay";
};
};

fragment@1 {
target = <&mdio_bus>;
__overlay__ {
reset-gpios = <&pio 14 GPIO_ACTIVE_LOW>;
reset-delay-us = <600>;
reset-post-delay-us = <20000>;

phy5: ethernet-phy@5 {
reg = <5>;
compatible = "ethernet-phy-ieee802.3-c45";
phy-mode = "2500base-x";
};
};
};
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */
/dts-v1/;
/plugin/;

/ {
compatible = "mediatek,mt7981-rfb", "mediatek,mt7981";

fragment@0 {
target = <&spi0>;
__overlay__ {
status = "okay";
#address-cells = <1>;
#size-cells = <0>;

spi_nand: spi_nand@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-nand";
reg = <1>;
spi-max-frequency = <10000000>;
spi-tx-bus-width = <4>;
spi-rx-bus-width = <4>;

partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;

partition@0 {
label = "BL2";
reg = <0x00000 0x0100000>;
read-only;
};

partition@100000 {
label = "u-boot-env";
reg = <0x0100000 0x0080000>;
};

factory: partition@180000 {
label = "Factory";
reg = <0x180000 0x0200000>;
};

partition@380000 {
label = "FIP";
reg = <0x380000 0x0200000>;
};

partition@580000 {
label = "ubi";
reg = <0x580000 0x4000000>;
};
};
};
};
};

fragment@1 {
target = <&wifi>;
__overlay__ {
mediatek,mtd-eeprom = <&factory 0x0>;
status = "okay";
};
};
};
Loading

0 comments on commit 11ff365

Please sign in to comment.