Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kirkwood: kernel: 6.12: refresh patches

Browse source 
Most of them were manually refreshed.

Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/19069
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Pawel Dembicki 2025-06-08 08:22:00 +02:00 committed by Hauke Mehrtens
parent fa862776a3
commit 52d9f37e54
15 changed files with 69 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
target/linux/kirkwood/patches-6.12/100-ib62x0.patch
View file

@ -16,23 +16,23 @@
memory { memory {
device_type = "memory"; device_type = "memory";
@@ -81,12 +88,12 @@ @@ -79,12 +86,12 @@
&pmx_led_usb_transfer>; &pmx_led_usb_transfer>;
pinctrl-names = "default"; pinctrl-names = "default";
- green-os { - led-green-os {
+ led_green_os: green-os { + led_green_os: led-green-os {
label = "ib62x0:green:os"; label = "ib62x0:green:os";
gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>;
- default-state = "keep"; - default-state = "keep";
+ default-state = "on"; + default-state = "on";
}; };
- red-os { - led-red-os {
+ led_red_os: red-os { + led_red_os: led-red-os {
label = "ib62x0:red:os"; label = "ib62x0:red:os";
gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>;
}; };
@@ -118,13 +125,13 @@ @@ -116,13 +123,13 @@
}; };
partition@100000 { partition@100000 {

10
target/linux/kirkwood/patches-6.12/101-iconnect.patch
View file

@ -27,19 +27,19 @@
gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
default-state = "on"; default-state = "on";
}; };
- power-blue { - led-power-blue {
+ led_power_blue: power-blue { + led_power_blue: led-power-blue {
label = "power:blue"; label = "power:blue";
gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
- default-state = "keep"; - default-state = "keep";
+ default-state = "on"; + default-state = "on";
}; };
- power-red { - led-power-red {
+ led_power_red: power-red { + led_power_red: led-power-red {
label = "power:red"; label = "power:red";
gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
}; };
@@ -146,28 +151,23 @@ @@ -144,28 +149,23 @@
status = "okay"; status = "okay";
partition@0 { partition@0 {

8
target/linux/kirkwood/patches-6.12/102-dockstar.patch
View file

@ -18,15 +18,15 @@
pinctrl-0 = <&pmx_led_green &pmx_led_orange>; pinctrl-0 = <&pmx_led_green &pmx_led_orange>;
pinctrl-names = "default"; pinctrl-names = "default";
- health { - led-health {
+ led_health: health { + led_health: led-health {
label = "status:green:health"; label = "status:green:health";
gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
- default-state = "keep"; - default-state = "keep";
+ default-state = "on"; + default-state = "on";
}; };
- fault { - led-fault {
+ led_fault: fault { + led_fault: led-fault {
label = "status:orange:fault"; label = "status:orange:fault";
gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
}; };

12
target/linux/kirkwood/patches-6.12/103-iomega-ix2-200.patch
View file

@ -18,23 +18,23 @@
&pmx_led_rebuild &pmx_led_health >; &pmx_led_rebuild &pmx_led_health >;
pinctrl-names = "default"; pinctrl-names = "default";
- power_led { - led-power-led {
+ led_power: power_led { + led_power: led-power-led {
label = "status:white:power_led"; label = "status:white:power_led";
gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
- default-state = "keep"; - default-state = "keep";
+ default-state = "on"; + default-state = "on";
}; };
rebuild_led { led-rebuild-led {
label = "status:white:rebuild_led"; label = "status:white:rebuild_led";
gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
}; };
- health_led { - led-health-led {
+ led_health: health_led { + led_health: health_led {
label = "status:red:health_led"; label = "status:red:health_led";
gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
}; };
@@ -186,19 +193,19 @@ @@ -184,19 +191,19 @@
}; };
partition@a0000 { partition@a0000 {
@ -60,7 +60,7 @@
}; };
}; };
@@ -211,7 +218,7 @@ @@ -209,7 +216,7 @@
}; };
&eth0 { &eth0 {

10
target/linux/kirkwood/patches-6.12/105-linksys-viper-dts.patch
View file

@ -11,19 +11,19 @@
serial0 = &uart0; serial0 = &uart0;
}; };
@@ -56,9 +60,10 @@ @@ -54,9 +58,10 @@
pinctrl-0 = < &pmx_led_white_health &pmx_led_white_pulse >; pinctrl-0 = < &pmx_led_white_health &pmx_led_white_pulse >;
pinctrl-names = "default"; pinctrl-names = "default";
- white-health { - led-white-health {
+ led_white_health: white-health { + led_white_health: led-white-health {
label = "viper:white:health"; label = "viper:white:health";
gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
+ default-state = "on"; + default-state = "on";
}; };
white-pulse { led-white-pulse {
@@ -114,23 +119,23 @@ @@ -112,23 +117,23 @@
}; };
partition@200000 { partition@200000 {

8
target/linux/kirkwood/patches-6.12/106-goflexnet.patch
View file

@ -18,15 +18,15 @@
>; >;
pinctrl-names = "default"; pinctrl-names = "default";
- health { - led-health {
+ led_health: health { + led_health: led-health {
label = "status:green:health"; label = "status:green:health";
gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
- default-state = "keep"; - default-state = "keep";
+ default-state = "on"; + default-state = "on";
}; };
- fault { - led-fault {
+ led_fault: fault { + led_fault: led-fault {
label = "status:orange:fault"; label = "status:orange:fault";
gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
}; };

2
target/linux/kirkwood/patches-6.12/107-01-zyxel-nsa3x0-common-nand-partitions.patch
View file

@ -1,6 +1,6 @@
--- a/arch/arm/boot/dts/marvell/kirkwood-nsa3x0-common.dtsi --- a/arch/arm/boot/dts/marvell/kirkwood-nsa3x0-common.dtsi
+++ b/arch/arm/boot/dts/marvell/kirkwood-nsa3x0-common.dtsi +++ b/arch/arm/boot/dts/marvell/kirkwood-nsa3x0-common.dtsi
@@ -112,40 +112,16 @@ @@ -110,40 +110,16 @@
partition@0 { partition@0 {
label = "uboot"; label = "uboot";

20
target/linux/kirkwood/patches-6.12/107-03-nsa325.patch
View file

@ -18,37 +18,37 @@
&pmx_led_hdd1_green &pmx_led_hdd1_red>; &pmx_led_hdd1_green &pmx_led_hdd1_red>;
pinctrl-names = "default"; pinctrl-names = "default";
- green-sys { - led-green-sys {
+ led_green_sys: green-sys { + led_green_sys: led-green-sys {
label = "nsa325:green:sys"; label = "nsa325:green:sys";
gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
+ default-state = "on"; + default-state = "on";
}; };
- orange-sys { - led-orange-sys {
+ led_orange_sys: orange-sys { + led_orange_sys: led-orange-sys {
label = "nsa325:orange:sys"; label = "nsa325:orange:sys";
gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
}; };
green-hdd1 { led-green-hdd1 {
label = "nsa325:green:hdd1"; label = "nsa325:green:hdd1";
gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "ata1"; + linux,default-trigger = "ata1";
}; };
red-hdd1 { led-red-hdd1 {
label = "nsa325:red:hdd1"; label = "nsa325:red:hdd1";
@@ -181,6 +190,7 @@ @@ -181,6 +190,7 @@
green-hdd2 { led-green-hdd2 {
label = "nsa325:green:hdd2"; label = "nsa325:green:hdd2";
gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "ata2"; + linux,default-trigger = "ata2";
}; };
red-hdd2 { led-red-hdd2 {
label = "nsa325:red:hdd2"; label = "nsa325:red:hdd2";
@@ -189,6 +199,7 @@ @@ -189,6 +199,7 @@
green-usb { led-green-usb {
label = "nsa325:green:usb"; label = "nsa325:green:usb";
gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "usb-host"; + linux,default-trigger = "usb-host";
}; };
green-copy { led-green-copy {
label = "nsa325:green:copy"; label = "nsa325:green:copy";

16
target/linux/kirkwood/patches-6.12/109-pogoplug_v4.patch
View file

@ -21,8 +21,8 @@
stdout-path = "uart0:115200n8"; stdout-path = "uart0:115200n8";
}; };
@@ -37,8 +45,8 @@ @@ -35,8 +43,8 @@
eject { button-eject {
debounce-interval = <50>; debounce-interval = <50>;
wakeup-source; wakeup-source;
- linux,code = <KEY_EJECTCD>; - linux,code = <KEY_EJECTCD>;
@ -32,22 +32,22 @@
gpios = <&gpio0 29 GPIO_ACTIVE_LOW>; gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
}; };
}; };
@@ -48,12 +56,12 @@ @@ -46,12 +54,12 @@
pinctrl-0 = <&pmx_led_green &pmx_led_red>; pinctrl-0 = <&pmx_led_green &pmx_led_red>;
pinctrl-names = "default"; pinctrl-names = "default";
- health { - led-health {
+ led_health: health { + led_health: led-health {
label = "pogoplugv4:green:health"; label = "pogoplugv4:green:health";
gpios = <&gpio0 22 GPIO_ACTIVE_LOW>; gpios = <&gpio0 22 GPIO_ACTIVE_LOW>;
default-state = "on"; default-state = "on";
}; };
- fault { - led-fault {
+ led_fault: fault { + led_fault: led-fault {
label = "pogoplugv4:red:fault"; label = "pogoplugv4:red:fault";
gpios = <&gpio0 24 GPIO_ACTIVE_LOW>; gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
}; };
@@ -137,29 +145,19 @@ @@ -135,29 +143,19 @@
#size-cells = <1>; #size-cells = <1>;
partition@0 { partition@0 {

8
target/linux/kirkwood/patches-6.12/110-pogo_e02.patch
View file

@ -18,15 +18,15 @@
gpio-leds { gpio-leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
- health { - led-health {
+ led_health: health { + led_health: led-health {
label = "pogo_e02:green:health"; label = "pogo_e02:green:health";
gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
- default-state = "keep"; - default-state = "keep";
+ default-state = "on"; + default-state = "on";
}; };
- fault { - led-fault {
+ led_fault: fault { + led_fault: led-fault {
label = "pogo_e02:orange:fault"; label = "pogo_e02:orange:fault";
gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
}; };

8
target/linux/kirkwood/patches-6.12/111-l-50.patch
View file

@ -18,14 +18,14 @@
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
- status_green { - led-status-green {
+ led_status_green: status_green { + led_status_green: led-status-green {
label = "l-50:green:status"; label = "l-50:green:status";
gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
}; };
- status_red { - led-status-red {
+ led_status_red: status_red { + led_status_red: led-status-red {
label = "l-50:red:status"; label = "l-50:red:status";
gpios = <&gpio3 2 GPIO_ACTIVE_LOW>; gpios = <&gpio3 2 GPIO_ACTIVE_LOW>;
}; };

6
target/linux/kirkwood/patches-6.12/112-sheevaplug.patch
View file

@ -36,12 +36,12 @@
pinctrl-0 = <&pmx_led_blue &pmx_led_red>; pinctrl-0 = <&pmx_led_blue &pmx_led_red>;
pinctrl-names = "default"; pinctrl-names = "default";
- health { - led-health {
+ led_health: health { + led_health: led-health {
label = "sheevaplug:blue:health"; label = "sheevaplug:blue:health";
gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
- default-state = "keep"; - default-state = "keep";
+ default-state = "on"; + default-state = "on";
}; };
misc { led-misc {

2
target/linux/kirkwood/patches-6.12/115-nsa310s.patch
View file

@ -14,7 +14,7 @@
memory { memory {
device_type = "memory"; device_type = "memory";
reg = <0x00000000 0x10000000>; reg = <0x00000000 0x10000000>;
@@ -96,14 +103,16 @@ @@ -94,14 +101,16 @@
gpios = <&gpio0 23 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 23 GPIO_ACTIVE_HIGH>;
}; };

2
target/linux/kirkwood/patches-6.12/202-linksys-find-active-root.patch
View file

@ -40,7 +40,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
+ +
parts[i].name = partname; parts[i].name = partname;
if (of_get_property(pp, "read-only", &len)) if (of_property_read_bool(pp, "read-only"))
@@ -271,6 +280,18 @@ static int __init ofpart_parser_init(voi @@ -271,6 +280,18 @@ static int __init ofpart_parser_init(voi
return 0; return 0;
} }

15
target/linux/kirkwood/patches-6.12/203-blackarmor-nas220.patch
View file

@ -17,7 +17,7 @@
@@ -36,14 +43,14 @@ @@ -36,14 +43,14 @@
compatible = "gpio-keys"; compatible = "gpio-keys";
reset { button-reset {
- label = "Reset"; - label = "Reset";
- linux,code = <KEY_POWER>; - linux,code = <KEY_POWER>;
+ label = "Reset Button"; + label = "Reset Button";
@ -25,10 +25,9 @@
gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
}; };
- button { button-power {
- label = "Power"; - label = "Power";
- linux,code = <KEY_SLEEP>; - linux,code = <KEY_SLEEP>;
+ power {
+ label = "Power Button"; + label = "Power Button";
+ linux,code = <KEY_POWER>; + linux,code = <KEY_POWER>;
gpios = <&gpio0 26 GPIO_ACTIVE_LOW>; gpios = <&gpio0 26 GPIO_ACTIVE_LOW>;
@ -38,25 +37,25 @@
gpio-leds { gpio-leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
- blue-power { - led-blue-power {
+ led_power_blue: power_blue { + led_power_blue: led-blue-power {
label = "nas220:blue:power"; label = "nas220:blue:power";
gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "default-on"; linux,default-trigger = "default-on";
}; };
+ +
+ disk_blue { + led-blue-disk {
+ label = "nas220:blue:disk"; + label = "nas220:blue:disk";
+ gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; + gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;
+ linux,default-trigger = "disk-activity"; + linux,default-trigger = "disk-activity";
+ }; + };
+ +
+ led_status_blue: status_blue { + led_status_blue: led-blue-status {
+ label = "nas220:blue:status"; + label = "nas220:blue:status";
+ gpios = <&gpio0 23 GPIO_ACTIVE_HIGH>; + gpios = <&gpio0 23 GPIO_ACTIVE_HIGH>;
+ }; + };
+ +
+ led_status_amber: status_amber { + led_status_amber: led-amber-status {
+ label = "nas220:amber:status"; + label = "nas220:amber:status";
+ gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>; + gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>;
+ }; + };