diff --git a/build_patches/openwrt/0240-rb5009-poe-spi.patch b/build_patches/openwrt/0240-rb5009-poe-spi.patch index adafdaee..ee9307d7 100644 --- a/build_patches/openwrt/0240-rb5009-poe-spi.patch +++ b/build_patches/openwrt/0240-rb5009-poe-spi.patch @@ -1,17 +1,17 @@ -From 6a7095d0873f9a836fe65746c4df46f83644c2e5 Mon Sep 17 00:00:00 2001 +From 1910773e7bc06f0aa659d05f88bb7655cd66b306 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= Date: Tue, 27 Feb 2024 00:02:36 +0100 Subject: [PATCH] rb5009 poe spi --- - .../boot/dts/marvell/armada-7040-rb5009.dts | 28 +++++++++++++++++++ - 1 file changed, 28 insertions(+) + .../boot/dts/marvell/armada-7040-rb5009.dts | 35 +++++++++++++++++++ + 1 file changed, 35 insertions(+) diff --git a/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-7040-rb5009.dts b/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-7040-rb5009.dts -index 0c9742d2d8..cd11facc25 100644 +index 0c9742d2d8..81c413dfb7 100644 --- a/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-7040-rb5009.dts +++ b/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-7040-rb5009.dts -@@ -374,3 +374,31 @@ +@@ -374,3 +381,40 @@ reg = <0x10 0x6>; }; }; @@ -43,6 +43,15 @@ index 0c9742d2d8..cd11facc25 100644 + spi-max-frequency = <2000000>; + }; +}; ++ ++&cp0_gpio1 { ++ enable-poe-power { ++ gpio-hog; ++ gpios = <8 GPIO_ACTIVE_HIGH>; ++ output-high; ++ line-name = "enable PoE chip"; ++ }; ++}; -- 2.43.2 diff --git a/src/packages/fff/mtpoe_ctrl/Makefile b/src/packages/fff/mtpoe_ctrl/Makefile index b3cc4c8a..76feccd6 100644 --- a/src/packages/fff/mtpoe_ctrl/Makefile +++ b/src/packages/fff/mtpoe_ctrl/Makefile @@ -5,10 +5,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mtpoe_ctrl -PKG_SOURCE_VERSION:=7dc4c48c7840031ed319b6d94d21606f1fbec046 -#PKG_MIRROR_HASH:=fedc3f0fa11d7f7b21e33f28d88cd607ad951877aab55d964b1653d45f04b5d7 -PKG_VERSION:=1.15.1 -PKG_RELEASE:=20 +PKG_SOURCE_VERSION:=d4dfc54f4fe8c6565d585b6a27730e4980b3103d +PKG_MIRROR_HASH:=898d93a7917b5462a2b4e00aee34f610c65e798cff82e81a77a2221140697411 +PKG_VERSION:=1.15.2 +PKG_RELEASE:=21 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/fblaese/mtpoe_ctrl.git @@ -37,8 +37,6 @@ define Package/mtpoe_ctrl/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/bins/mtpoe_ctrl $(1)/usr/bin/ $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/99-mtpoe_ctrl $(1)/etc/init.d/ - $(INSTALL_DIR) $(1)/etc/uci-defaults - $(INSTALL_BIN) ./files/mtpoe_ctrl.defaults $(1)/etc/uci-defaults/ endef $(eval $(call BuildPackage,mtpoe_ctrl)) diff --git a/src/packages/fff/mtpoe_ctrl/files/99-mtpoe_ctrl b/src/packages/fff/mtpoe_ctrl/files/99-mtpoe_ctrl index 8fb76581..ebfcacab 100644 --- a/src/packages/fff/mtpoe_ctrl/files/99-mtpoe_ctrl +++ b/src/packages/fff/mtpoe_ctrl/files/99-mtpoe_ctrl @@ -1,8 +1,18 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2018 Sergey Sergeev adron@yapic.net START=11 -start() { - /usr/bin/mtpoe_ctrl --action=load_poe_from_uci >/dev/null 2>&1 +USE_PROCD=1 + +start_service() { + procd_open_instance + procd_set_param command /usr/bin/mtpoe_ctrl --action=load_poe_from_uci + procd_set_param stdout 1 + procd_set_param stderr 1 + procd_close_instance +} + +service_triggers() +{ + procd_add_reload_trigger system } diff --git a/src/packages/fff/mtpoe_ctrl/files/mtpoe_ctrl.defaults b/src/packages/fff/mtpoe_ctrl/files/mtpoe_ctrl.defaults deleted file mode 100644 index b930fa36..00000000 --- a/src/packages/fff/mtpoe_ctrl/files/mtpoe_ctrl.defaults +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -uci -q get network.@poe[0] || { - num=0 - board=$(cat /tmp/sysinfo/board_name) - case "$board" in - rb-750p-pbr2|\ - mikrotik,routerboard-960pgs) - num=4 - ;; - mikrotik,rb5009upr) - num=8 - ;; - *) - return 0 - ;; - esac - if [ "$num" -gt 0 ]; then - uci add network poe - n=0 - while [ "$n" -lt "$num" ]; do - uci set network.@poe[0].port$n='0' - n=$((n + 1)) - done - uci commit network.@poe[0] - fi -}