mvebu: 6.6: refresh patches

Manually refreshed:
 * 309-linksys-status-led.patch
 * 310-linksys-use-eth0-as-cpu-port.patch
 * 320-arm-dts-armada-370-synology-ds213j-mtd-parts.patch
 * 701-mvpp2-read-mac-address-from-nvmem.patch
 * 902-drivers-mfd-Add-a-driver-for-IEI-WT61P803-PUZZLE-MCU.patch

All other patches automatically refreshed.

Signed-off-by: Stijn Segers <foss@volatilesystems.org>
This commit is contained in:
Stijn Segers 2024-03-28 19:05:32 +01:00 committed by Robert Marko
parent ad5e73fe0a
commit 2260ec4fb7
14 changed files with 53 additions and 53 deletions

View file

@ -28,7 +28,7 @@ Signed-off-by: Michael Gray <michael.gray@lantisproject.com>
--- a/arch/arm/Kconfig --- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig +++ b/arch/arm/Kconfig
@@ -1587,6 +1587,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN @@ -1566,6 +1566,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
The command-line arguments provided by the boot loader will be The command-line arguments provided by the boot loader will be
appended to the the device tree bootargs property. appended to the the device tree bootargs property.
@ -48,7 +48,7 @@ Signed-off-by: Michael Gray <michael.gray@lantisproject.com>
config CMDLINE config CMDLINE
--- a/arch/arm/boot/compressed/atags_to_fdt.c --- a/arch/arm/boot/compressed/atags_to_fdt.c
+++ b/arch/arm/boot/compressed/atags_to_fdt.c +++ b/arch/arm/boot/compressed/atags_to_fdt.c
@@ -5,6 +5,8 @@ @@ -6,6 +6,8 @@
#if defined(CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND) #if defined(CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND)
#define do_extend_cmdline 1 #define do_extend_cmdline 1
@ -57,7 +57,7 @@ Signed-off-by: Michael Gray <michael.gray@lantisproject.com>
#else #else
#define do_extend_cmdline 0 #define do_extend_cmdline 0
#endif #endif
@@ -20,6 +22,7 @@ static int node_offset(void *fdt, const @@ -21,6 +23,7 @@ static int node_offset(void *fdt, const
return offset; return offset;
} }
@ -65,7 +65,7 @@ Signed-off-by: Michael Gray <michael.gray@lantisproject.com>
static int setprop(void *fdt, const char *node_path, const char *property, static int setprop(void *fdt, const char *node_path, const char *property,
void *val_array, int size) void *val_array, int size)
{ {
@@ -28,6 +31,7 @@ static int setprop(void *fdt, const char @@ -29,6 +32,7 @@ static int setprop(void *fdt, const char
return offset; return offset;
return fdt_setprop(fdt, offset, property, val_array, size); return fdt_setprop(fdt, offset, property, val_array, size);
} }
@ -73,7 +73,7 @@ Signed-off-by: Michael Gray <michael.gray@lantisproject.com>
static int setprop_string(void *fdt, const char *node_path, static int setprop_string(void *fdt, const char *node_path,
const char *property, const char *string) const char *property, const char *string)
@@ -38,6 +42,7 @@ static int setprop_string(void *fdt, con @@ -39,6 +43,7 @@ static int setprop_string(void *fdt, con
return fdt_setprop_string(fdt, offset, property, string); return fdt_setprop_string(fdt, offset, property, string);
} }
@ -81,7 +81,7 @@ Signed-off-by: Michael Gray <michael.gray@lantisproject.com>
static int setprop_cell(void *fdt, const char *node_path, static int setprop_cell(void *fdt, const char *node_path,
const char *property, uint32_t val) const char *property, uint32_t val)
{ {
@@ -46,6 +51,7 @@ static int setprop_cell(void *fdt, const @@ -47,6 +52,7 @@ static int setprop_cell(void *fdt, const
return offset; return offset;
return fdt_setprop_cell(fdt, offset, property, val); return fdt_setprop_cell(fdt, offset, property, val);
} }
@ -89,7 +89,7 @@ Signed-off-by: Michael Gray <michael.gray@lantisproject.com>
static const void *getprop(const void *fdt, const char *node_path, static const void *getprop(const void *fdt, const char *node_path,
const char *property, int *len) const char *property, int *len)
@@ -58,6 +64,7 @@ static const void *getprop(const void *f @@ -59,6 +65,7 @@ static const void *getprop(const void *f
return fdt_getprop(fdt, offset, property, len); return fdt_getprop(fdt, offset, property, len);
} }
@ -97,7 +97,7 @@ Signed-off-by: Michael Gray <michael.gray@lantisproject.com>
static uint32_t get_cell_size(const void *fdt) static uint32_t get_cell_size(const void *fdt)
{ {
int len; int len;
@@ -69,6 +76,74 @@ static uint32_t get_cell_size(const void @@ -70,6 +77,74 @@ static uint32_t get_cell_size(const void
return cell_size; return cell_size;
} }
@ -172,7 +172,7 @@ Signed-off-by: Michael Gray <michael.gray@lantisproject.com>
static void merge_fdt_bootargs(void *fdt, const char *fdt_cmdline) static void merge_fdt_bootargs(void *fdt, const char *fdt_cmdline)
{ {
char cmdline[COMMAND_LINE_SIZE]; char cmdline[COMMAND_LINE_SIZE];
@@ -88,18 +163,28 @@ static void merge_fdt_bootargs(void *fdt @@ -89,18 +164,28 @@ static void merge_fdt_bootargs(void *fdt
/* and append the ATAG_CMDLINE */ /* and append the ATAG_CMDLINE */
if (fdt_cmdline) { if (fdt_cmdline) {
@ -201,7 +201,7 @@ Signed-off-by: Michael Gray <michael.gray@lantisproject.com>
static void hex_str(char *out, uint32_t value) static void hex_str(char *out, uint32_t value)
{ {
uint32_t digit; uint32_t digit;
@@ -117,6 +202,7 @@ static void hex_str(char *out, uint32_t @@ -118,6 +203,7 @@ static void hex_str(char *out, uint32_t
} }
*out = '\0'; *out = '\0';
} }
@ -209,7 +209,7 @@ Signed-off-by: Michael Gray <michael.gray@lantisproject.com>
/* /*
* Convert and fold provided ATAGs into the provided FDT. * Convert and fold provided ATAGs into the provided FDT.
@@ -131,9 +217,11 @@ int atags_to_fdt(void *atag_list, void * @@ -132,9 +218,11 @@ int atags_to_fdt(void *atag_list, void *
struct tag *atag = atag_list; struct tag *atag = atag_list;
/* In the case of 64 bits memory size, need to reserve 2 cells for /* In the case of 64 bits memory size, need to reserve 2 cells for
* address and size for each bank */ * address and size for each bank */
@ -223,7 +223,7 @@ Signed-off-by: Michael Gray <michael.gray@lantisproject.com>
/* make sure we've got an aligned pointer */ /* make sure we've got an aligned pointer */
if ((u32)atag_list & 0x3) if ((u32)atag_list & 0x3)
@@ -168,7 +256,9 @@ int atags_to_fdt(void *atag_list, void * @@ -169,7 +257,9 @@ int atags_to_fdt(void *atag_list, void *
else else
setprop_string(fdt, "/chosen", "bootargs", setprop_string(fdt, "/chosen", "bootargs",
atag->u.cmdline.cmdline); atag->u.cmdline.cmdline);
@ -234,7 +234,7 @@ Signed-off-by: Michael Gray <michael.gray@lantisproject.com>
if (memcount >= sizeof(mem_reg_property)/4) if (memcount >= sizeof(mem_reg_property)/4)
continue; continue;
if (!atag->u.mem.size) if (!atag->u.mem.size)
@@ -212,6 +302,10 @@ int atags_to_fdt(void *atag_list, void * @@ -213,6 +303,10 @@ int atags_to_fdt(void *atag_list, void *
setprop(fdt, "/memory", "reg", mem_reg_property, setprop(fdt, "/memory", "reg", mem_reg_property,
4 * memcount * memsize); 4 * memcount * memsize);
} }
@ -247,7 +247,7 @@ Signed-off-by: Michael Gray <michael.gray@lantisproject.com>
} }
--- a/init/main.c --- a/init/main.c
+++ b/init/main.c +++ b/init/main.c
@@ -112,6 +112,10 @@ @@ -111,6 +111,10 @@
#include <kunit/test.h> #include <kunit/test.h>
@ -257,9 +257,9 @@ Signed-off-by: Michael Gray <michael.gray@lantisproject.com>
+ +
static int kernel_init(void *); static int kernel_init(void *);
extern void init_IRQ(void); /*
@@ -993,6 +997,18 @@ asmlinkage __visible void __init __no_sa @@ -927,6 +931,18 @@ void start_kernel(void)
page_alloc_init(); boot_cpu_hotplug_init();
pr_notice("Kernel command line: %s\n", saved_command_line); pr_notice("Kernel command line: %s\n", saved_command_line);
+ +

View file

@ -18,7 +18,7 @@
pinctrl-0 = <&gpio_leds_pins>; pinctrl-0 = <&gpio_leds_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
- power { - led-power {
+ led_power: power { + led_power: power {
gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>;
default-state = "on"; default-state = "on";
@ -43,7 +43,7 @@
pinctrl-0 = <&power_led_pin>; pinctrl-0 = <&power_led_pin>;
pinctrl-names = "default"; pinctrl-names = "default";
- power { - led-power {
+ led_power: power { + led_power: power {
label = "mamba:white:power"; label = "mamba:white:power";
gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;

View file

@ -17,7 +17,7 @@
- reg = <5>; - reg = <5>;
+ port@6 { + port@6 {
+ reg = <6>; + reg = <6>;
label = "cpu"; phy-mode = "sgmii";
- ethernet = <&eth2>; - ethernet = <&eth2>;
+ ethernet = <&eth0>; + ethernet = <&eth0>;

View file

@ -9,17 +9,17 @@
memory@0 { memory@0 {
@@ -94,6 +95,8 @@ @@ -94,6 +95,8 @@
status = "okay"; status = "okay";
phy = <&phy1>; phy = <&phy1>;
phy-mode = "sgmii"; phy-mode = "sgmii";
+ nvmem-cells = <&macaddr_vendor_0>; + nvmem-cells = <&macaddr_vendor_0>;
+ nvmem-cell-names = "mac-address"; + nvmem-cell-names = "mac-address";
}; };
sata@a0000 { sata@a0000 {
@@ -175,6 +178,24 @@ @@ -175,6 +178,24 @@
gpio = <&gpio1 30 GPIO_ACTIVE_HIGH>; phy1: ethernet-phy@1 { /* Marvell 88E1512 */
}; reg = <1>;
}; };
+ +
+ virtual_flash { + virtual_flash {
@ -41,8 +41,8 @@
+ }; + };
}; };
&mdio { &pinctrl {
@@ -265,48 +286,52 @@ @@ -259,48 +280,52 @@
reg = <0>; /* Chip select 0 */ reg = <0>; /* Chip select 0 */
spi-max-frequency = <20000000>; spi-max-frequency = <20000000>;

View file

@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- ---
--- a/drivers/net/ethernet/marvell/mvneta.c --- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -5233,6 +5233,16 @@ static int mvneta_setup_tc(struct net_de @@ -5294,6 +5294,16 @@ static int mvneta_setup_tc(struct net_de
} }
} }
@ -31,7 +31,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
static const struct net_device_ops mvneta_netdev_ops = { static const struct net_device_ops mvneta_netdev_ops = {
.ndo_open = mvneta_open, .ndo_open = mvneta_open,
.ndo_stop = mvneta_stop, .ndo_stop = mvneta_stop,
@@ -5243,6 +5253,9 @@ static const struct net_device_ops mvnet @@ -5304,6 +5314,9 @@ static const struct net_device_ops mvnet
.ndo_fix_features = mvneta_fix_features, .ndo_fix_features = mvneta_fix_features,
.ndo_get_stats64 = mvneta_get_stats64, .ndo_get_stats64 = mvneta_get_stats64,
.ndo_eth_ioctl = mvneta_ioctl, .ndo_eth_ioctl = mvneta_ioctl,

View file

@ -12,16 +12,16 @@ Signed-off-by: Tobias Schramm <tobias@t-sys.eu>
--- ---
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -6134,6 +6134,12 @@ static void mvpp2_port_copy_mac_addr(str @@ -6153,6 +6153,12 @@ static int mvpp2_port_copy_mac_addr(stru
} return 0;
} }
+ if (!of_get_mac_address(to_of_node(fwnode), hw_mac_addr)) { + if (!of_get_mac_address(to_of_node(fwnode), hw_mac_addr)) {
+ *mac_from = "nvmem cell"; + *mac_from = "nvmem cell";
+ eth_hw_addr_set(dev, hw_mac_addr); + eth_hw_addr_set(dev, hw_mac_addr);
+ return; + return 0;
+ } + }
+ +
*mac_from = "random"; *mac_from = "random";
eth_hw_addr_random(dev); eth_hw_addr_random(dev);
}

View file

@ -24,8 +24,8 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
--- a/drivers/cpuidle/cpuidle-mvebu-v7.c --- a/drivers/cpuidle/cpuidle-mvebu-v7.c
+++ b/drivers/cpuidle/cpuidle-mvebu-v7.c +++ b/drivers/cpuidle/cpuidle-mvebu-v7.c
@@ -39,8 +39,12 @@ static int mvebu_v7_enter_idle(struct cp @@ -42,8 +42,12 @@ static __cpuidle int mvebu_v7_enter_idle
ret = mvebu_v7_cpu_suspend(deepidle);
cpu_pm_exit(); cpu_pm_exit();
+ /* + /*

View file

@ -13,7 +13,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
--- a/drivers/pci/controller/pci-mvebu.c --- a/drivers/pci/controller/pci-mvebu.c
+++ b/drivers/pci/controller/pci-mvebu.c +++ b/drivers/pci/controller/pci-mvebu.c
@@ -1414,6 +1414,7 @@ static int mvebu_pcie_powerup(struct mve @@ -1397,6 +1397,7 @@ static int mvebu_pcie_powerup(struct mve
if (port->reset_gpio) { if (port->reset_gpio) {
u32 reset_udelay = PCI_PM_D3COLD_WAIT * 1000; u32 reset_udelay = PCI_PM_D3COLD_WAIT * 1000;
@ -21,7 +21,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
of_property_read_u32(port->dn, "reset-delay-us", of_property_read_u32(port->dn, "reset-delay-us",
&reset_udelay); &reset_udelay);
@@ -1421,7 +1422,13 @@ static int mvebu_pcie_powerup(struct mve @@ -1404,7 +1405,13 @@ static int mvebu_pcie_powerup(struct mve
udelay(100); udelay(100);
gpiod_set_value_cansleep(port->reset_gpio, 0); gpiod_set_value_cansleep(port->reset_gpio, 0);
@ -36,7 +36,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
} }
return 0; return 0;
@@ -1538,15 +1545,16 @@ static int mvebu_pcie_probe(struct platf @@ -1521,15 +1528,16 @@ static int mvebu_pcie_probe(struct platf
if (!child) if (!child)
continue; continue;

View file

@ -207,7 +207,7 @@ Cc: Robert Marko <robert.marko@sartura.hr>
+ }; + };
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@ -579,6 +579,8 @@ patternProperties: @@ -609,6 +609,8 @@ patternProperties:
description: IC Plus Corp. description: IC Plus Corp.
"^idt,.*": "^idt,.*":
description: Integrated Device Technologies, Inc. description: Integrated Device Technologies, Inc.

View file

@ -26,7 +26,7 @@ Cc: Robert Marko <robert.marko@sartura.hr>
--- a/drivers/mfd/Kconfig --- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig
@@ -2222,6 +2222,15 @@ config SGI_MFD_IOC3 @@ -2274,6 +2274,15 @@ config SGI_MFD_IOC3
If you have an SGI Origin, Octane, or a PCI IOC3 card, If you have an SGI Origin, Octane, or a PCI IOC3 card,
then say Y. Otherwise say N. then say Y. Otherwise say N.
@ -39,9 +39,9 @@ Cc: Robert Marko <robert.marko@sartura.hr>
+ used for fan control, temperature sensor reading, LED control + used for fan control, temperature sensor reading, LED control
+ and system identification. + and system identification.
+ +
config MFD_INTEL_M10_BMC config MFD_INTEL_M10_BMC_CORE
tristate "Intel MAX 10 Board Management Controller" tristate
depends on SPI_MASTER select MFD_CORE
--- a/drivers/mfd/Makefile --- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile
@@ -244,6 +244,7 @@ obj-$(CONFIG_MFD_RT4831) += rt4831.o @@ -244,6 +244,7 @@ obj-$(CONFIG_MFD_RT4831) += rt4831.o

View file

@ -26,7 +26,7 @@ Cc: Robert Marko <robert.marko@sartura.hr>
--- a/drivers/hwmon/Kconfig --- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig
@@ -755,6 +755,14 @@ config SENSORS_IBMPOWERNV @@ -783,6 +783,14 @@ config SENSORS_IBMPOWERNV
This driver can also be built as a module. If so, the module This driver can also be built as a module. If so, the module
will be called ibmpowernv. will be called ibmpowernv.
@ -43,7 +43,7 @@ Cc: Robert Marko <robert.marko@sartura.hr>
depends on IIO depends on IIO
--- a/drivers/hwmon/Makefile --- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile +++ b/drivers/hwmon/Makefile
@@ -87,6 +87,7 @@ obj-$(CONFIG_SENSORS_HIH6130) += hih6130 @@ -90,6 +90,7 @@ obj-$(CONFIG_SENSORS_HS3001) += hs3001.o
obj-$(CONFIG_SENSORS_ULTRA45) += ultra45_env.o obj-$(CONFIG_SENSORS_ULTRA45) += ultra45_env.o
obj-$(CONFIG_SENSORS_I5500) += i5500_temp.o obj-$(CONFIG_SENSORS_I5500) += i5500_temp.o
obj-$(CONFIG_SENSORS_I5K_AMB) += i5k_amb.o obj-$(CONFIG_SENSORS_I5K_AMB) += i5k_amb.o

View file

@ -30,7 +30,7 @@ Cc: Robert Marko <robert.marko@sartura.hr>
--- a/drivers/leds/Kconfig --- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig
@@ -300,6 +300,14 @@ config LEDS_IPAQ_MICRO @@ -316,6 +316,14 @@ config LEDS_IPAQ_MICRO
Choose this option if you want to use the notification LED on Choose this option if you want to use the notification LED on
Compaq/HP iPAQ h3100 and h3600. Compaq/HP iPAQ h3100 and h3600.
@ -47,7 +47,7 @@ Cc: Robert Marko <robert.marko@sartura.hr>
depends on LEDS_CLASS depends on LEDS_CLASS
--- a/drivers/leds/Makefile --- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile +++ b/drivers/leds/Makefile
@@ -32,6 +32,7 @@ obj-$(CONFIG_LEDS_HP6XX) += leds-hp6xx. @@ -34,6 +34,7 @@ obj-$(CONFIG_LEDS_HP6XX) += leds-hp6xx.
obj-$(CONFIG_LEDS_INTEL_SS4200) += leds-ss4200.o obj-$(CONFIG_LEDS_INTEL_SS4200) += leds-ss4200.o
obj-$(CONFIG_LEDS_IP30) += leds-ip30.o obj-$(CONFIG_LEDS_IP30) += leds-ip30.o
obj-$(CONFIG_LEDS_IPAQ_MICRO) += leds-ipaq-micro.o obj-$(CONFIG_LEDS_IPAQ_MICRO) += leds-ipaq-micro.o

View file

@ -64,7 +64,7 @@ Cc: Robert Marko <robert.marko@sartura.hr>
+================= == ===================================================== +================= == =====================================================
--- a/Documentation/hwmon/index.rst --- a/Documentation/hwmon/index.rst
+++ b/Documentation/hwmon/index.rst +++ b/Documentation/hwmon/index.rst
@@ -77,6 +77,7 @@ Hardware Monitoring Kernel Drivers @@ -82,6 +82,7 @@ Hardware Monitoring Kernel Drivers
ibmaem ibmaem
ibm-cffps ibm-cffps
ibmpowernv ibmpowernv

View file

@ -16,9 +16,9 @@ Cc: Robert Marko <robert.marko@sartura.hr>
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -9900,6 +9900,22 @@ F: include/net/nl802154.h @@ -10138,6 +10138,22 @@ IFCVF VIRTIO DATA PATH ACCELERATOR
F: net/ieee802154/ R: Zhu Lingshan <lingshan.zhu@intel.com>
F: net/mac802154/ F: drivers/vdpa/ifcvf/
+IEI WT61P803 M801 MFD DRIVER +IEI WT61P803 M801 MFD DRIVER
+M: Luka Kovacic <luka.kovacic@sartura.hr> +M: Luka Kovacic <luka.kovacic@sartura.hr>