Merge branch 'openwrt:main' into main

Author: small-white-rabbit

target/linux/mediatek/dts/mt7981b-keenetic-kap-630.dtsi

@@ -57,7 +57,7 @@
 				reg = <0x0 0x600000>;
 			};
 
-			partition@400000 {
+			partition@600000 {
 				label = "ubi";
 				reg = <0x600000 0x0>;
 			};

target/linux/mediatek/dts/mt7981b-keenetic-kn-3811.dts

@@ -98,7 +98,7 @@
 				reg = <0x0 0x600000>;
 			};
 
-			partition@400000 {
+			partition@600000 {
 				label = "ubi";
 				reg = <0x600000 0x0>;
 			};

target/linux/mediatek/dts/mt7981b-keenetic-kn-3911.dts

@@ -73,7 +73,7 @@
 				reg = <0x0 0x600000>;
 			};
 
-			partition@400000 {
+			partition@600000 {
 				label = "ubi";
 				reg = <0x600000 0x0>;
 			};

target/linux/mediatek/dts/mt7988d-keenetic-kn-1812.dtsi

@@ -140,7 +140,7 @@
 				reg = <0x0 0x600000>;
 			};
 
-			partition@400000 {
+			partition@600000 {
 				label = "ubi";
 				reg = <0x600000 0x0>;
 			};
@@ -369,7 +369,6 @@
 	nvmem-cell-names = "mac-address";
 	label = "wan";
 	phy-mode = "internal";
-	phy-connection-type = "internal";
 	phy = <&int_2p5g_phy>;
 	status = "okay";
 };
@@ -398,9 +397,11 @@
 		compatible = "ethernet-phy-ieee802.3-c45";
 		reg = <0x1b>;
 
+		interrupt-parent = <&pio>;
+		interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
 		reset-gpios = <&pio 4 GPIO_ACTIVE_LOW>;
 		reset-assert-us = <100000>;
-		reset-deassert-us = <100000>;
+		reset-deassert-us = <221000>;
 	};
 };
 
@@ -409,7 +410,6 @@
 	nvmem-cell-names = "mac-address";
 	label = "lan5";
 	phy-mode = "usxgmii";
-	phy-connection-type = "usxgmii";
 	phy = <&phy27>;
 	status = "okay";
 };
@@ -504,7 +504,7 @@
 		#address-cells = <3>;
 		#size-cells = <2>;
 
-		mt7996@0,0 {
+		mt7992@0,0 {
 			reg = <0x0000 0 0 0 0>;
 			#address-cells = <1>;
 			#size-cells = <0>;
@@ -539,7 +539,7 @@
 
 		conf {
 			groups = "mdc_mdio0";
-			drive-strength = <MTK_DRIVE_4mA>;
+			drive-strength = <MTK_DRIVE_10mA>;
 		};
 	};
 
@@ -608,3 +608,7 @@
 &tphy {
 	status = "okay";
 };
+
+&xsphy {
+	status = "okay";
+};

target/linux/mvebu/patches-6.12/903-drivers-hwmon-Add-the-IEI-WT61P803-PUZZLE-HWMON-driv.patch

@@ -53,7 +53,7 @@ Cc: Robert Marko <robert.marko@sartura.hr>
  obj-$(CONFIG_SENSORS_IBMPOWERNV)+= ibmpowernv.o
 --- /dev/null
 +++ b/drivers/hwmon/iei-wt61p803-puzzle-hwmon.c
-@@ -0,0 +1,447 @@
+@@ -0,0 +1,444 @@
 +// SPDX-License-Identifier: GPL-2.0-only
 +/* IEI WT61P803 PUZZLE MCU HWMON Driver
 + *
@@ -83,18 +83,18 @@ Cc: Robert Marko <robert.marko@sartura.hr>
 + * @tcdev:		Thermal cooling device pointer
 + * @name:		Thermal cooling device name
 + * @pwm_channel:	Controlled PWM channel (0 or 1)
-+ * @cooling_levels:	Thermal cooling device cooling levels (DT)
 + * @cur_level:		Current cooling level
 + * @num_levels:	Number of cooling levels
++ * @cooling_levels:	Thermal cooling device cooling levels (DT)
 + */
 +struct iei_wt61p803_puzzle_thermal_cooling_device {
 +	struct iei_wt61p803_puzzle_hwmon *mcu_hwmon;
 +	struct thermal_cooling_device *tcdev;
 +	char name[THERMAL_NAME_LENGTH];
 +	int pwm_channel;
-+	u32 *cooling_levels;
 +	int cur_level;
 +	u8 num_levels;
++	u32 cooling_levels[] __counted_by(num_levels);
 +};
 +
 +/**
@@ -401,13 +401,11 @@ Cc: Robert Marko <robert.marko@sartura.hr>
 +	if (!num_levels)
 +		return -EINVAL;
 +
-+	cdev = devm_kzalloc(dev, sizeof(*cdev), GFP_KERNEL);
++	cdev = devm_kzalloc(dev, struct_size(cdev, cooling_levels, num_levels), GFP_KERNEL);
 +	if (!cdev)
 +		return -ENOMEM;
 +
-+	cdev->cooling_levels = devm_kmalloc_array(dev, num_levels, sizeof(u32), GFP_KERNEL);
-+	if (!cdev->cooling_levels)
-+		return -ENOMEM;
++	cdev->num_levels = num_levels;
 +
 +	ret = fwnode_property_read_u32_array(child, "cooling-levels",
 +					     cdev->cooling_levels,
@@ -429,7 +427,6 @@ Cc: Robert Marko <robert.marko@sartura.hr>
 +
 +	cdev->mcu_hwmon = mcu_hwmon;
 +	cdev->pwm_channel = pwm_channel;
-+	cdev->num_levels = num_levels;
 +	cdev->cur_level = -1;
 +	mcu_hwmon->cdev[pwm_channel] = cdev;
 +

target/linux/realtek/dts/rtl9302_zyxel_xgs1x10-12-common.dtsi

@@ -129,14 +129,14 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 
-		SWITCH_PORT_LED(0, 1, 2, 0, usxgmii);
-		SWITCH_PORT_LED(1, 2, 2, 0, usxgmii);
-		SWITCH_PORT_LED(2, 3, 2, 0, usxgmii);
-		SWITCH_PORT_LED(3, 4, 2, 0, usxgmii);
-		SWITCH_PORT_LED(4, 5, 2, 0, usxgmii);
-		SWITCH_PORT_LED(5, 6, 2, 0, usxgmii);
-		SWITCH_PORT_LED(6, 7, 2, 0, usxgmii);
-		SWITCH_PORT_LED(7, 8, 2, 0, usxgmii);
+		SWITCH_PORT_LED(0, 1, 2, 0, usxgmii)
+		SWITCH_PORT_LED(1, 2, 2, 0, usxgmii)
+		SWITCH_PORT_LED(2, 3, 2, 0, usxgmii)
+		SWITCH_PORT_LED(3, 4, 2, 0, usxgmii)
+		SWITCH_PORT_LED(4, 5, 2, 0, usxgmii)
+		SWITCH_PORT_LED(5, 6, 2, 0, usxgmii)
+		SWITCH_PORT_LED(6, 7, 2, 0, usxgmii)
+		SWITCH_PORT_LED(7, 8, 2, 0, usxgmii)
 
 		port@24 {
 			reg = <24>;

target/linux/realtek/files-6.12/drivers/net/ethernet/rtl838x_eth.c

@@ -1475,7 +1475,7 @@ static const struct ethtool_ops rteth_ethtool_ops = {
 	.set_link_ksettings = rteth_set_link_ksettings,
 };
 
-static int rtl838x_eth_probe(struct platform_device *pdev)
+static int rteth_probe(struct platform_device *pdev)
 {
 	struct net_device *dev;
 	struct device_node *dn = pdev->dev.of_node;
@@ -1489,11 +1489,6 @@ static int rtl838x_eth_probe(struct platform_device *pdev)
 	pr_info("Probing RTL838X eth device pdev: %x, dev: %x\n",
 		(u32)pdev, (u32)(&pdev->dev));
 
-	if (!dn) {
-		dev_err(&pdev->dev, "No DT found\n");
-		return -EINVAL;
-	}
-
 	cfg = device_get_match_data(&pdev->dev);
 
 	dev = devm_alloc_etherdev_mqs(&pdev->dev, sizeof(struct rteth_ctrl), RTETH_TX_RINGS, RTETH_RX_RINGS);
@@ -1616,23 +1611,21 @@ static int rtl838x_eth_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static void rtl838x_eth_remove(struct platform_device *pdev)
+static void rteth_remove(struct platform_device *pdev)
 {
 	struct net_device *dev = platform_get_drvdata(pdev);
 	struct rteth_ctrl *ctrl = netdev_priv(dev);
 
-	if (dev) {
-		pr_info("Removing platform driver for rtl838x-eth\n");
-		rteth_hw_stop(ctrl);
+	pr_info("Removing platform driver for rtl838x-eth\n");
+	rteth_hw_stop(ctrl);
 
-		netif_tx_stop_all_queues(dev);
+	netif_tx_stop_all_queues(dev);
 
-		for (int i = 0; i < RTETH_RX_RINGS; i++)
-			netif_napi_del(&ctrl->rx_qs[i].napi);
-	}
+	for (int i = 0; i < RTETH_RX_RINGS; i++)
+		netif_napi_del(&ctrl->rx_qs[i].napi);
 }
 
-static const struct of_device_id rtl838x_eth_of_ids[] = {
+static const struct of_device_id rteth_of_ids[] = {
 	{
 		.compatible = "realtek,rtl8380-eth",
 		.data = &rteth_838x_cfg,
@@ -1651,15 +1644,15 @@ static const struct of_device_id rtl838x_eth_of_ids[] = {
 	},
 	{ /* sentinel */ }
 };
-MODULE_DEVICE_TABLE(of, rtl838x_eth_of_ids);
+MODULE_DEVICE_TABLE(of, rteth_of_ids);
 
 static struct platform_driver rtl838x_eth_driver = {
-	.probe  = rtl838x_eth_probe,
-	.remove = rtl838x_eth_remove,
+	.probe  = rteth_probe,
+	.remove = rteth_remove,
 	.driver = {
-		.name = "rtl838x-eth",
+		.name = KBUILD_MODNAME,
 		.pm = NULL,
-		.of_match_table = rtl838x_eth_of_ids,
+		.of_match_table = rteth_of_ids,
 	},
 };