From: Joshua Covington Date: Mon, 22 Jun 2026 21:35:23 +0000 (+0000) Subject: bcm27xx: refresh patches X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=41ab1ae6107b5ed06de81027bc85bbb5ea91c947;p=thirdparty%2Fopenwrt.git bcm27xx: refresh patches Refresh patches Signed-off-by: Joshua Covington Link: https://github.com/openwrt/openwrt/pull/23703 Signed-off-by: Jonas Jelonek --- diff --git a/target/linux/bcm27xx/patches-6.18/0004-Revert-spi-spidev-Fix-CS-polarity-if-GPIO-descriptor.patch b/target/linux/bcm27xx/patches-6.18/0004-Revert-spi-spidev-Fix-CS-polarity-if-GPIO-descriptor.patch index 870a876cb23..6f841ca72ff 100644 --- a/target/linux/bcm27xx/patches-6.18/0004-Revert-spi-spidev-Fix-CS-polarity-if-GPIO-descriptor.patch +++ b/target/linux/bcm27xx/patches-6.18/0004-Revert-spi-spidev-Fix-CS-polarity-if-GPIO-descriptor.patch @@ -9,11 +9,9 @@ This reverts commit 83b2a8fe43bda0c11981ad6afa5dd0104d78be28. drivers/spi/spidev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c -index 4d53c394101a..461d3a0009a8 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c -@@ -415,7 +415,7 @@ spidev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) +@@ -415,7 +415,7 @@ spidev_ioctl(struct file *filp, unsigned } if (ctlr->use_gpio_descriptors && spi_get_csgpiod(spi, 0)) @@ -22,6 +20,3 @@ index 4d53c394101a..461d3a0009a8 100644 tmp |= spi->mode & ~SPI_MODE_MASK; spi->mode = tmp & SPI_MODE_USER_MASK; --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0005-Revert-ARM-dts-bcm2711-Add-BCM2711-xHCI-support.patch b/target/linux/bcm27xx/patches-6.18/0005-Revert-ARM-dts-bcm2711-Add-BCM2711-xHCI-support.patch index 51344e4fc4f..ed3f5e53dfc 100644 --- a/target/linux/bcm27xx/patches-6.18/0005-Revert-ARM-dts-bcm2711-Add-BCM2711-xHCI-support.patch +++ b/target/linux/bcm27xx/patches-6.18/0005-Revert-ARM-dts-bcm2711-Add-BCM2711-xHCI-support.patch @@ -8,11 +8,9 @@ This reverts commit 522c35e08b53f157ad3e51848caa861b258001e4. arch/arm/boot/dts/broadcom/bcm2711.dtsi | 15 --------------- 1 file changed, 15 deletions(-) -diff --git a/arch/arm/boot/dts/broadcom/bcm2711.dtsi b/arch/arm/boot/dts/broadcom/bcm2711.dtsi -index c06d9f5e53c8..561851182672 100644 --- a/arch/arm/boot/dts/broadcom/bcm2711.dtsi +++ b/arch/arm/boot/dts/broadcom/bcm2711.dtsi -@@ -602,21 +602,6 @@ genet_mdio: mdio@e14 { +@@ -602,21 +602,6 @@ }; }; @@ -34,6 +32,3 @@ index c06d9f5e53c8..561851182672 100644 v3d: gpu@7ec00000 { compatible = "brcm,2711-v3d"; reg = <0x0 0x7ec00000 0x4000>, --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0006-Revert-usb-phy-generic-Get-the-vbus-supply.patch b/target/linux/bcm27xx/patches-6.18/0006-Revert-usb-phy-generic-Get-the-vbus-supply.patch index 38d3e08dac5..154bce56c7e 100644 --- a/target/linux/bcm27xx/patches-6.18/0006-Revert-usb-phy-generic-Get-the-vbus-supply.patch +++ b/target/linux/bcm27xx/patches-6.18/0006-Revert-usb-phy-generic-Get-the-vbus-supply.patch @@ -8,11 +8,9 @@ This reverts commit 03e607cbb2931374db1825f371e9c7f28526d3f4. drivers/usb/phy/phy-generic.c | 7 ------- 1 file changed, 7 deletions(-) -diff --git a/drivers/usb/phy/phy-generic.c b/drivers/usb/phy/phy-generic.c -index 8423be59ec0f..c31ac36dcfa9 100644 --- a/drivers/usb/phy/phy-generic.c +++ b/drivers/usb/phy/phy-generic.c -@@ -256,13 +256,6 @@ int usb_phy_gen_create_phy(struct device *dev, struct usb_phy_generic *nop) +@@ -256,13 +256,6 @@ int usb_phy_gen_create_phy(struct device return dev_err_probe(dev, PTR_ERR(nop->vcc), "could not get vcc regulator\n"); @@ -26,6 +24,3 @@ index 8423be59ec0f..c31ac36dcfa9 100644 nop->dev = dev; nop->phy.dev = nop->dev; nop->phy.label = "nop-xceiv"; --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0007-Revert-PCI-Warn-if-no-host-bridge-NUMA-node-info.patch b/target/linux/bcm27xx/patches-6.18/0007-Revert-PCI-Warn-if-no-host-bridge-NUMA-node-info.patch index afe8a3e91a0..305657bfef4 100644 --- a/target/linux/bcm27xx/patches-6.18/0007-Revert-PCI-Warn-if-no-host-bridge-NUMA-node-info.patch +++ b/target/linux/bcm27xx/patches-6.18/0007-Revert-PCI-Warn-if-no-host-bridge-NUMA-node-info.patch @@ -10,11 +10,9 @@ Signed-off-by: Phil Elwell drivers/pci/probe.c | 3 --- 1 file changed, 3 deletions(-) -diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c -index 23833fd7265e..c12dadaba357 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c -@@ -1057,9 +1057,6 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge) +@@ -1057,9 +1057,6 @@ static int pci_register_host_bridge(stru else pr_info("PCI host bridge to bus %s\n", name); @@ -24,6 +22,3 @@ index 23833fd7265e..c12dadaba357 100644 /* Check if the boot configuration by FW needs to be preserved */ bridge->preserve_config = pci_preserve_config(bridge); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0008-of-overlay-Correct-symbol-path-fixups.patch b/target/linux/bcm27xx/patches-6.18/0008-of-overlay-Correct-symbol-path-fixups.patch index 368e0d267bb..2a4869bfa49 100644 --- a/target/linux/bcm27xx/patches-6.18/0008-of-overlay-Correct-symbol-path-fixups.patch +++ b/target/linux/bcm27xx/patches-6.18/0008-of-overlay-Correct-symbol-path-fixups.patch @@ -24,11 +24,9 @@ Signed-off-by: Phil Elwell drivers/of/overlay.c | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c -index 255e8362f600..d57bff53551e 100644 --- a/drivers/of/overlay.c +++ b/drivers/of/overlay.c -@@ -247,6 +247,8 @@ static struct property *dup_and_fixup_symbol_prop( +@@ -247,6 +247,8 @@ static struct property *dup_and_fixup_sy if (!target_path) return NULL; target_path_len = strlen(target_path); @@ -37,6 +35,3 @@ index 255e8362f600..d57bff53551e 100644 new_prop = kzalloc(sizeof(*new_prop), GFP_KERNEL); if (!new_prop) --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0009-module-Avoid-ABI-changes-when-debug-info-is-disabled.patch b/target/linux/bcm27xx/patches-6.18/0009-module-Avoid-ABI-changes-when-debug-info-is-disabled.patch index cc58a0f97d0..b5ca660bc91 100644 --- a/target/linux/bcm27xx/patches-6.18/0009-module-Avoid-ABI-changes-when-debug-info-is-disabled.patch +++ b/target/linux/bcm27xx/patches-6.18/0009-module-Avoid-ABI-changes-when-debug-info-is-disabled.patch @@ -12,11 +12,9 @@ Define these members unconditionally, so that there is no ABI change. include/linux/module.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/include/linux/module.h b/include/linux/module.h -index 4decae2b1675..53def2266388 100644 --- a/include/linux/module.h +++ b/include/linux/module.h -@@ -507,7 +507,7 @@ struct module { +@@ -509,7 +509,7 @@ struct module { unsigned int num_bpf_raw_events; struct bpf_raw_event_map *bpf_raw_events; #endif @@ -25,6 +23,3 @@ index 4decae2b1675..53def2266388 100644 unsigned int btf_data_size; unsigned int btf_base_data_size; void *btf_data; --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0010-dma-mapping-Use-any-dma_range_map-for-phys-to-DMA.patch b/target/linux/bcm27xx/patches-6.18/0010-dma-mapping-Use-any-dma_range_map-for-phys-to-DMA.patch index 5114367b7cd..bda568061eb 100644 --- a/target/linux/bcm27xx/patches-6.18/0010-dma-mapping-Use-any-dma_range_map-for-phys-to-DMA.patch +++ b/target/linux/bcm27xx/patches-6.18/0010-dma-mapping-Use-any-dma_range_map-for-phys-to-DMA.patch @@ -17,11 +17,9 @@ Signed-off-by: Phil Elwell kernel/dma/direct.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/kernel/dma/direct.h b/kernel/dma/direct.h -index 62f0d9d0ba02..06594cc8966e 100644 --- a/kernel/dma/direct.h +++ b/kernel/dma/direct.h -@@ -94,7 +94,7 @@ static inline dma_addr_t dma_direct_map_phys(struct device *dev, +@@ -94,7 +94,7 @@ static inline dma_addr_t dma_direct_map_ } if (attrs & DMA_ATTR_MMIO) { @@ -30,6 +28,3 @@ index 62f0d9d0ba02..06594cc8966e 100644 if (unlikely(!dma_capable(dev, dma_addr, size, false))) goto err_overflow; } else { --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0011-raspberrypi-firmware-Update-mailbox-commands.patch b/target/linux/bcm27xx/patches-6.18/0011-raspberrypi-firmware-Update-mailbox-commands.patch index a0968bc2302..4854857eb47 100644 --- a/target/linux/bcm27xx/patches-6.18/0011-raspberrypi-firmware-Update-mailbox-commands.patch +++ b/target/linux/bcm27xx/patches-6.18/0011-raspberrypi-firmware-Update-mailbox-commands.patch @@ -8,11 +8,9 @@ Signed-off-by: Dom Cobley include/soc/bcm2835/raspberrypi-firmware.h | 30 +++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) -diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h -index e1f87fbfe554..3e71d45477a4 100644 --- a/include/soc/bcm2835/raspberrypi-firmware.h +++ b/include/soc/bcm2835/raspberrypi-firmware.h -@@ -36,6 +36,8 @@ struct rpi_firmware_property_tag_header { +@@ -36,6 +36,8 @@ struct rpi_firmware_property_tag_header enum rpi_firmware_property_tag { RPI_FIRMWARE_PROPERTY_END = 0, RPI_FIRMWARE_GET_FIRMWARE_REVISION = 0x00000001, @@ -105,6 +103,3 @@ index e1f87fbfe554..3e71d45477a4 100644 /** * struct rpi_firmware_clk_rate_request - Firmware Request for a rate * @id: ID of the clock being queried --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0012-drm-atomic-Don-t-fixup-modes-that-haven-t-been-reset.patch b/target/linux/bcm27xx/patches-6.18/0012-drm-atomic-Don-t-fixup-modes-that-haven-t-been-reset.patch index b147fd219ca..907d888133b 100644 --- a/target/linux/bcm27xx/patches-6.18/0012-drm-atomic-Don-t-fixup-modes-that-haven-t-been-reset.patch +++ b/target/linux/bcm27xx/patches-6.18/0012-drm-atomic-Don-t-fixup-modes-that-haven-t-been-reset.patch @@ -8,11 +8,9 @@ Signed-off-by: Dave Stevenson drivers/gpu/drm/drm_atomic_helper.c | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c -index bbec1c184f65..241e560357ec 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c -@@ -445,6 +445,11 @@ mode_fixup(struct drm_atomic_state *state) +@@ -445,6 +445,11 @@ mode_fixup(struct drm_atomic_state *stat new_crtc_state = drm_atomic_get_new_crtc_state(state, new_conn_state->crtc); @@ -24,6 +22,3 @@ index bbec1c184f65..241e560357ec 100644 /* * Each encoder has at most one connector (since we always steal * it away), so we won't call ->mode_fixup twice. --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0013-drm-Check-whether-the-gamma-lut-has-changed-before-u.patch b/target/linux/bcm27xx/patches-6.18/0013-drm-Check-whether-the-gamma-lut-has-changed-before-u.patch index 5804de19920..a662cf00379 100644 --- a/target/linux/bcm27xx/patches-6.18/0013-drm-Check-whether-the-gamma-lut-has-changed-before-u.patch +++ b/target/linux/bcm27xx/patches-6.18/0013-drm-Check-whether-the-gamma-lut-has-changed-before-u.patch @@ -14,11 +14,9 @@ Signed-off-by: Dave Stevenson drivers/gpu/drm/drm_color_mgmt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/drivers/gpu/drm/drm_color_mgmt.c b/drivers/gpu/drm/drm_color_mgmt.c -index 131c1c9ae92f..988d4b6781ad 100644 --- a/drivers/gpu/drm/drm_color_mgmt.c +++ b/drivers/gpu/drm/drm_color_mgmt.c -@@ -332,7 +332,9 @@ static int drm_crtc_legacy_gamma_set(struct drm_crtc *crtc, +@@ -332,7 +332,9 @@ static int drm_crtc_legacy_gamma_set(str replaced = drm_property_replace_blob(&crtc_state->degamma_lut, use_gamma_lut ? NULL : blob); replaced |= drm_property_replace_blob(&crtc_state->ctm, NULL); @@ -29,6 +27,3 @@ index 131c1c9ae92f..988d4b6781ad 100644 use_gamma_lut ? blob : NULL); crtc_state->color_mgmt_changed |= replaced; --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0014-drm-dsi-Document-the-meaning-and-spec-references-for.patch b/target/linux/bcm27xx/patches-6.18/0014-drm-dsi-Document-the-meaning-and-spec-references-for.patch index 22233a9d14c..1a1cc814269 100644 --- a/target/linux/bcm27xx/patches-6.18/0014-drm-dsi-Document-the-meaning-and-spec-references-for.patch +++ b/target/linux/bcm27xx/patches-6.18/0014-drm-dsi-Document-the-meaning-and-spec-references-for.patch @@ -16,11 +16,9 @@ Signed-off-by: Dave Stevenson include/drm/drm_mipi_dsi.h | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) -diff --git a/include/drm/drm_mipi_dsi.h b/include/drm/drm_mipi_dsi.h -index 3aba7b380c8d..d7588f189a59 100644 --- a/include/drm/drm_mipi_dsi.h +++ b/include/drm/drm_mipi_dsi.h -@@ -114,27 +114,41 @@ struct mipi_dsi_host *of_find_mipi_dsi_host_by_node(struct device_node *node); +@@ -114,27 +114,41 @@ struct mipi_dsi_host *of_find_mipi_dsi_h /* DSI mode flags */ @@ -73,6 +71,3 @@ index 3aba7b380c8d..d7588f189a59 100644 #define MIPI_DSI_MODE_LPM BIT(11) /* transmit data ending at the same time for all lanes within one hsync */ #define MIPI_DSI_HS_PKT_END_ALIGNED BIT(12) --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0015-drm-bridge-tc358762-Ignore-EPROBE_DEFER-when-logging.patch b/target/linux/bcm27xx/patches-6.18/0015-drm-bridge-tc358762-Ignore-EPROBE_DEFER-when-logging.patch index 34d713316dc..f0c815f3841 100644 --- a/target/linux/bcm27xx/patches-6.18/0015-drm-bridge-tc358762-Ignore-EPROBE_DEFER-when-logging.patch +++ b/target/linux/bcm27xx/patches-6.18/0015-drm-bridge-tc358762-Ignore-EPROBE_DEFER-when-logging.patch @@ -11,11 +11,9 @@ Signed-off-by: Dave Stevenson drivers/gpu/drm/bridge/tc358762.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/gpu/drm/bridge/tc358762.c b/drivers/gpu/drm/bridge/tc358762.c -index 98df3e667d4a..68eec9718595 100644 --- a/drivers/gpu/drm/bridge/tc358762.c +++ b/drivers/gpu/drm/bridge/tc358762.c -@@ -298,7 +298,7 @@ static int tc358762_probe(struct mipi_dsi_device *dsi) +@@ -298,7 +298,7 @@ static int tc358762_probe(struct mipi_ds ret = mipi_dsi_attach(dsi); if (ret < 0) { drm_bridge_remove(&ctx->bridge); @@ -24,6 +22,3 @@ index 98df3e667d4a..68eec9718595 100644 } return ret; --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0016-drm-Add-chroma-siting-properties.patch b/target/linux/bcm27xx/patches-6.18/0016-drm-Add-chroma-siting-properties.patch index d36758fe650..44fee673e8f 100644 --- a/target/linux/bcm27xx/patches-6.18/0016-drm-Add-chroma-siting-properties.patch +++ b/target/linux/bcm27xx/patches-6.18/0016-drm-Add-chroma-siting-properties.patch @@ -12,11 +12,9 @@ Signed-off-by: Dom Cobley include/drm/drm_plane.h | 36 +++++++++++++++++++++++ 5 files changed, 97 insertions(+) -diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c b/drivers/gpu/drm/drm_atomic_state_helper.c -index 7142e163e618..a6414a2c488e 100644 --- a/drivers/gpu/drm/drm_atomic_state_helper.c +++ b/drivers/gpu/drm/drm_atomic_state_helper.c -@@ -268,6 +268,20 @@ void __drm_atomic_helper_plane_state_reset(struct drm_plane_state *plane_state, +@@ -268,6 +268,20 @@ void __drm_atomic_helper_plane_state_res plane_state->color_range = val; } @@ -37,11 +35,9 @@ index 7142e163e618..a6414a2c488e 100644 if (plane->zpos_property) { if (!drm_object_property_get_default_value(&plane->base, plane->zpos_property, -diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c -index 85dbdaa4a2e2..8111efb2974b 100644 --- a/drivers/gpu/drm/drm_atomic_uapi.c +++ b/drivers/gpu/drm/drm_atomic_uapi.c -@@ -540,6 +540,10 @@ static int drm_atomic_plane_set_property(struct drm_plane *plane, +@@ -540,6 +540,10 @@ static int drm_atomic_plane_set_property state->color_encoding = val; } else if (property == plane->color_range_property) { state->color_range = val; @@ -52,7 +48,7 @@ index 85dbdaa4a2e2..8111efb2974b 100644 } else if (property == config->prop_fb_damage_clips) { ret = drm_property_replace_blob_from_id(dev, &state->fb_damage_clips, -@@ -622,6 +626,10 @@ drm_atomic_plane_get_property(struct drm_plane *plane, +@@ -622,6 +626,10 @@ drm_atomic_plane_get_property(struct drm *val = state->color_encoding; } else if (property == plane->color_range_property) { *val = state->color_range; @@ -63,15 +59,12 @@ index 85dbdaa4a2e2..8111efb2974b 100644 } else if (property == config->prop_fb_damage_clips) { *val = (state->fb_damage_clips) ? state->fb_damage_clips->base.id : 0; -diff --git a/drivers/gpu/drm/drm_color_mgmt.c b/drivers/gpu/drm/drm_color_mgmt.c -index 988d4b6781ad..acfce7963bdd 100644 --- a/drivers/gpu/drm/drm_color_mgmt.c +++ b/drivers/gpu/drm/drm_color_mgmt.c -@@ -594,6 +594,42 @@ int drm_plane_create_color_properties(struct drm_plane *plane, - } +@@ -595,6 +595,42 @@ int drm_plane_create_color_properties(st EXPORT_SYMBOL(drm_plane_create_color_properties); -+/** + /** + * drm_plane_create_chroma_siting_properties - chroma siting related plane properties + * @plane: plane object + * @@ -107,14 +100,13 @@ index 988d4b6781ad..acfce7963bdd 100644 +} +EXPORT_SYMBOL(drm_plane_create_chroma_siting_properties); + - /** ++/** * drm_color_lut_check - check validity of lookup table * @lut: property blob containing LUT to check -diff --git a/include/drm/drm_color_mgmt.h b/include/drm/drm_color_mgmt.h -index eccb71ab335a..2d9a96c22801 100644 + * @tests: bitmask of tests to run --- a/include/drm/drm_color_mgmt.h +++ b/include/drm/drm_color_mgmt.h -@@ -91,6 +91,9 @@ int drm_plane_create_color_properties(struct drm_plane *plane, +@@ -91,6 +91,9 @@ int drm_plane_create_color_properties(st enum drm_color_encoding default_encoding, enum drm_color_range default_range); @@ -124,15 +116,12 @@ index eccb71ab335a..2d9a96c22801 100644 /** * enum drm_color_lut_tests - hw-specific LUT tests to perform * -diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h -index 01479dd94e76..744d6b7bfe9b 100644 --- a/include/drm/drm_plane.h +++ b/include/drm/drm_plane.h -@@ -183,6 +183,24 @@ struct drm_plane_state { - */ +@@ -184,6 +184,24 @@ struct drm_plane_state { enum drm_color_range color_range; -+ /** + /** + * @chroma_siting_h: + * + * Location of chroma samples horizontally compared to luma @@ -150,9 +139,10 @@ index 01479dd94e76..744d6b7bfe9b 100644 + */ + int32_t chroma_siting_v; + - /** ++ /** * @fb_damage_clips: * + * Blob representing damage (area in plane framebuffer that changed @@ -803,6 +821,24 @@ struct drm_plane { * @kmsg_panic: Used to register a panic notifier for this plane */ @@ -178,6 +168,3 @@ index 01479dd94e76..744d6b7bfe9b 100644 }; #define obj_to_plane(x) container_of(x, struct drm_plane, base) --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0017-drm-atomic-helpers-remove-legacy_cursor_update-hacks.patch b/target/linux/bcm27xx/patches-6.18/0017-drm-atomic-helpers-remove-legacy_cursor_update-hacks.patch index 69614dab77f..e71db178df1 100644 --- a/target/linux/bcm27xx/patches-6.18/0017-drm-atomic-helpers-remove-legacy_cursor_update-hacks.patch +++ b/target/linux/bcm27xx/patches-6.18/0017-drm-atomic-helpers-remove-legacy_cursor_update-hacks.patch @@ -57,11 +57,9 @@ Signed-off-by: Maxime Ripard drivers/gpu/drm/msm/msm_atomic.c | 2 ++ 3 files changed, 15 insertions(+), 13 deletions(-) -diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c -index 241e560357ec..46a3c24561c2 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c -@@ -1892,13 +1892,6 @@ drm_atomic_helper_wait_for_vblanks(struct drm_device *dev, +@@ -1892,13 +1892,6 @@ drm_atomic_helper_wait_for_vblanks(struc int i, ret; unsigned int crtc_mask = 0; @@ -75,24 +73,22 @@ index 241e560357ec..46a3c24561c2 100644 for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) { if (!new_crtc_state->active) continue; -@@ -2548,12 +2541,6 @@ int drm_atomic_helper_setup_commit(struct drm_atomic_state *state, +@@ -2547,12 +2540,6 @@ int drm_atomic_helper_setup_commit(struc + complete_all(&commit->flip_done); continue; } - +- - /* Legacy cursor updates are fully unsynced. */ - if (state->legacy_cursor_update) { - complete_all(&commit->flip_done); - continue; - } -- + if (!new_crtc_state->event) { commit->event = kzalloc(sizeof(*commit->event), - GFP_KERNEL); -diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c -index 3f40028e79cf..fac9f65a6948 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c -@@ -7653,6 +7653,19 @@ int intel_atomic_commit(struct drm_device *dev, struct drm_atomic_state *_state, +@@ -7653,6 +7653,19 @@ int intel_atomic_commit(struct drm_devic state->base.legacy_cursor_update = false; } @@ -112,11 +108,9 @@ index 3f40028e79cf..fac9f65a6948 100644 ret = intel_atomic_prepare_commit(state); if (ret) { drm_dbg_atomic(display->drm, -diff --git a/drivers/gpu/drm/msm/msm_atomic.c b/drivers/gpu/drm/msm/msm_atomic.c -index 87a91148a731..26841fd080b1 100644 --- a/drivers/gpu/drm/msm/msm_atomic.c +++ b/drivers/gpu/drm/msm/msm_atomic.c -@@ -255,6 +255,8 @@ void msm_atomic_commit_tail(struct drm_atomic_state *state) +@@ -255,6 +255,8 @@ void msm_atomic_commit_tail(struct drm_a /* async updates are limited to single-crtc updates: */ WARN_ON(crtc_mask != drm_crtc_mask(async_crtc)); @@ -125,6 +119,3 @@ index 87a91148a731..26841fd080b1 100644 /* * Start timer if we don't already have an update pending * on this crtc: --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0018-drm-atomic-If-margins-are-updated-update-all-planes.patch b/target/linux/bcm27xx/patches-6.18/0018-drm-atomic-If-margins-are-updated-update-all-planes.patch index 66dbd947c0d..6e421334037 100644 --- a/target/linux/bcm27xx/patches-6.18/0018-drm-atomic-If-margins-are-updated-update-all-planes.patch +++ b/target/linux/bcm27xx/patches-6.18/0018-drm-atomic-If-margins-are-updated-update-all-planes.patch @@ -17,11 +17,9 @@ Signed-off-by: Dave Stevenson drivers/gpu/drm/drm_atomic_uapi.c | 11 +++++++++++ 1 file changed, 11 insertions(+) -diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c -index 8111efb2974b..67b330dbf628 100644 --- a/drivers/gpu/drm/drm_atomic_uapi.c +++ b/drivers/gpu/drm/drm_atomic_uapi.c -@@ -681,6 +681,7 @@ static int drm_atomic_connector_set_property(struct drm_connector *connector, +@@ -681,6 +681,7 @@ static int drm_atomic_connector_set_prop { struct drm_device *dev = connector->dev; struct drm_mode_config *config = &dev->mode_config; @@ -29,7 +27,7 @@ index 8111efb2974b..67b330dbf628 100644 bool replaced = false; int ret; -@@ -709,12 +710,16 @@ static int drm_atomic_connector_set_property(struct drm_connector *connector, +@@ -709,12 +710,16 @@ static int drm_atomic_connector_set_prop state->tv.subconnector = val; } else if (property == config->tv_left_margin_property) { state->tv.margins.left = val; @@ -46,7 +44,7 @@ index 8111efb2974b..67b330dbf628 100644 } else if (property == config->legacy_tv_mode_property) { state->tv.legacy_mode = val; } else if (property == config->tv_mode_property) { -@@ -799,6 +804,12 @@ static int drm_atomic_connector_set_property(struct drm_connector *connector, +@@ -799,6 +804,12 @@ static int drm_atomic_connector_set_prop return -EINVAL; } @@ -59,6 +57,3 @@ index 8111efb2974b..67b330dbf628 100644 return 0; } --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0019-arm64-setup-Fix-build-warning.patch b/target/linux/bcm27xx/patches-6.18/0019-arm64-setup-Fix-build-warning.patch index 2585edfd829..ebd6722df7e 100644 --- a/target/linux/bcm27xx/patches-6.18/0019-arm64-setup-Fix-build-warning.patch +++ b/target/linux/bcm27xx/patches-6.18/0019-arm64-setup-Fix-build-warning.patch @@ -8,11 +8,9 @@ Signed-off-by: Maxime Ripard arch/arm64/kernel/setup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c -index 23c05dc7a8f2..25644f0c0fe5 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c -@@ -215,9 +215,9 @@ static void __init request_standard_resources(void) +@@ -215,9 +215,9 @@ static void __init request_standard_reso size_t res_size; kernel_code.start = __pa_symbol(_text); @@ -24,6 +22,3 @@ index 23c05dc7a8f2..25644f0c0fe5 100644 insert_resource(&iomem_resource, &kernel_code); insert_resource(&iomem_resource, &kernel_data); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0020-BCM2708-Add-core-Device-Tree-support.patch b/target/linux/bcm27xx/patches-6.18/0020-BCM2708-Add-core-Device-Tree-support.patch index f71f6e55384..3785eae2c47 100644 --- a/target/linux/bcm27xx/patches-6.18/0020-BCM2708-Add-core-Device-Tree-support.patch +++ b/target/linux/bcm27xx/patches-6.18/0020-BCM2708-Add-core-Device-Tree-support.patch @@ -1151,8 +1151,6 @@ Signed-off-by: Phil Elwell create mode 100644 include/dt-bindings/clock/rp1.h create mode 100644 include/dt-bindings/gpio/gpio-fsm.h -diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index efe38eb25301..a2a407fb5b28 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -39,3 +39,8 @@ subdir-y += unisoc @@ -1164,8 +1162,6 @@ index efe38eb25301..a2a407fb5b28 100644 +targets += $(dtb-y) + +subdir-y += overlays -diff --git a/arch/arm/boot/dts/broadcom/Makefile b/arch/arm/boot/dts/broadcom/Makefile -index 2552e11b5e31..47f461a9b27a 100644 --- a/arch/arm/boot/dts/broadcom/Makefile +++ b/arch/arm/boot/dts/broadcom/Makefile @@ -37,6 +37,30 @@ dtb-$(CONFIG_ARCH_BCM2835) += \ @@ -1199,9 +1195,6 @@ index 2552e11b5e31..47f461a9b27a 100644 dtb-$(CONFIG_ARCH_BCMBCA) += \ bcm6846-genexis-xg6846b.dtb \ bcm947622.dtb \ -diff --git a/arch/arm/boot/dts/broadcom/bcm2708-rpi-b-plus.dts b/arch/arm/boot/dts/broadcom/bcm2708-rpi-b-plus.dts -new file mode 100644 -index 000000000000..ee72fdac6663 --- /dev/null +++ b/arch/arm/boot/dts/broadcom/bcm2708-rpi-b-plus.dts @@ -0,0 +1,210 @@ @@ -1415,9 +1408,6 @@ index 000000000000..ee72fdac6663 + pwr_led_trigger = <&led_pwr>,"linux,default-trigger"; + }; +}; -diff --git a/arch/arm/boot/dts/broadcom/bcm2708-rpi-b-rev1.dts b/arch/arm/boot/dts/broadcom/bcm2708-rpi-b-rev1.dts -new file mode 100644 -index 000000000000..9301e345aea2 --- /dev/null +++ b/arch/arm/boot/dts/broadcom/bcm2708-rpi-b-rev1.dts @@ -0,0 +1,223 @@ @@ -1644,9 +1634,6 @@ index 000000000000..9301e345aea2 + i2c_vc_baudrate = <&i2c1>,"clock-frequency:0"; + }; +}; -diff --git a/arch/arm/boot/dts/broadcom/bcm2708-rpi-b.dts b/arch/arm/boot/dts/broadcom/bcm2708-rpi-b.dts -new file mode 100644 -index 000000000000..b8459fd0f497 --- /dev/null +++ b/arch/arm/boot/dts/broadcom/bcm2708-rpi-b.dts @@ -0,0 +1,198 @@ @@ -1848,9 +1835,6 @@ index 000000000000..b8459fd0f497 + act_led_trigger = <&led_act>,"linux,default-trigger"; + }; +}; -diff --git a/arch/arm/boot/dts/broadcom/bcm2708-rpi-bt.dtsi b/arch/arm/boot/dts/broadcom/bcm2708-rpi-bt.dtsi -new file mode 100644 -index 000000000000..87a6c00bd056 --- /dev/null +++ b/arch/arm/boot/dts/broadcom/bcm2708-rpi-bt.dtsi @@ -0,0 +1,42 @@ @@ -1896,9 +1880,6 @@ index 000000000000..87a6c00bd056 + krnbt_baudrate = <&bt>,"max-speed:0", <&minibt>,"max-speed:0"; + }; +}; -diff --git a/arch/arm/boot/dts/broadcom/bcm2708-rpi-cm.dts b/arch/arm/boot/dts/broadcom/bcm2708-rpi-cm.dts -new file mode 100644 -index 000000000000..fde85c8c7dca --- /dev/null +++ b/arch/arm/boot/dts/broadcom/bcm2708-rpi-cm.dts @@ -0,0 +1,174 @@ @@ -2076,9 +2057,6 @@ index 000000000000..fde85c8c7dca +&hdmi { + hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>; +}; -diff --git a/arch/arm/boot/dts/broadcom/bcm2708-rpi-cm.dtsi b/arch/arm/boot/dts/broadcom/bcm2708-rpi-cm.dtsi -new file mode 100644 -index 000000000000..8d3e42bfe4f0 --- /dev/null +++ b/arch/arm/boot/dts/broadcom/bcm2708-rpi-cm.dtsi @@ -0,0 +1,23 @@ @@ -2105,9 +2083,6 @@ index 000000000000..8d3e42bfe4f0 + act_led_trigger = <&led_act>,"linux,default-trigger"; + }; +}; -diff --git a/arch/arm/boot/dts/broadcom/bcm2708-rpi-zero-w.dts b/arch/arm/boot/dts/broadcom/bcm2708-rpi-zero-w.dts -new file mode 100644 -index 000000000000..f6d4e2c73df9 --- /dev/null +++ b/arch/arm/boot/dts/broadcom/bcm2708-rpi-zero-w.dts @@ -0,0 +1,250 @@ @@ -2361,9 +2336,6 @@ index 000000000000..f6d4e2c73df9 + act_led_trigger = <&led_act>,"linux,default-trigger"; + }; +}; -diff --git a/arch/arm/boot/dts/broadcom/bcm2708-rpi-zero.dts b/arch/arm/boot/dts/broadcom/bcm2708-rpi-zero.dts -new file mode 100644 -index 000000000000..1721be8dbe20 --- /dev/null +++ b/arch/arm/boot/dts/broadcom/bcm2708-rpi-zero.dts @@ -0,0 +1,189 @@ @@ -2556,9 +2528,6 @@ index 000000000000..1721be8dbe20 + act_led_trigger = <&led_act>,"linux,default-trigger"; + }; +}; -diff --git a/arch/arm/boot/dts/broadcom/bcm2708-rpi.dtsi b/arch/arm/boot/dts/broadcom/bcm2708-rpi.dtsi -new file mode 100644 -index 000000000000..f4aedb5c532b --- /dev/null +++ b/arch/arm/boot/dts/broadcom/bcm2708-rpi.dtsi @@ -0,0 +1,63 @@ @@ -2625,9 +2594,6 @@ index 000000000000..f4aedb5c532b +&i2c2 { + status = "disabled"; +}; -diff --git a/arch/arm/boot/dts/broadcom/bcm2708.dtsi b/arch/arm/boot/dts/broadcom/bcm2708.dtsi -new file mode 100644 -index 000000000000..fdc7f2423bbe --- /dev/null +++ b/arch/arm/boot/dts/broadcom/bcm2708.dtsi @@ -0,0 +1,19 @@ @@ -2650,9 +2616,6 @@ index 000000000000..fdc7f2423bbe +&vc4 { + status = "disabled"; +}; -diff --git a/arch/arm/boot/dts/broadcom/bcm2709-rpi-2-b.dts b/arch/arm/boot/dts/broadcom/bcm2709-rpi-2-b.dts -new file mode 100644 -index 000000000000..7796e545da43 --- /dev/null +++ b/arch/arm/boot/dts/broadcom/bcm2709-rpi-2-b.dts @@ -0,0 +1,204 @@ @@ -2860,9 +2823,6 @@ index 000000000000..7796e545da43 + pwr_led_trigger = <&led_pwr>,"linux,default-trigger"; + }; +}; -diff --git a/arch/arm/boot/dts/broadcom/bcm2709-rpi-cm2.dts b/arch/arm/boot/dts/broadcom/bcm2709-rpi-cm2.dts -new file mode 100644 -index 000000000000..36d00aa889a3 --- /dev/null +++ b/arch/arm/boot/dts/broadcom/bcm2709-rpi-cm2.dts @@ -0,0 +1,215 @@ @@ -3081,9 +3041,6 @@ index 000000000000..36d00aa889a3 + act_led_trigger = <&led_act>,"linux,default-trigger"; + }; +}; -diff --git a/arch/arm/boot/dts/broadcom/bcm2709-rpi.dtsi b/arch/arm/boot/dts/broadcom/bcm2709-rpi.dtsi -new file mode 100644 -index 000000000000..7335e7fbcb71 --- /dev/null +++ b/arch/arm/boot/dts/broadcom/bcm2709-rpi.dtsi @@ -0,0 +1,8 @@ @@ -3095,9 +3052,6 @@ index 000000000000..7335e7fbcb71 + +i2c_arm: &i2c1 {}; +i2c_vc: &i2c0 {}; -diff --git a/arch/arm/boot/dts/broadcom/bcm2709.dtsi b/arch/arm/boot/dts/broadcom/bcm2709.dtsi -new file mode 100644 -index 000000000000..868f65f922ff --- /dev/null +++ b/arch/arm/boot/dts/broadcom/bcm2709.dtsi @@ -0,0 +1,29 @@ @@ -3130,9 +3084,6 @@ index 000000000000..868f65f922ff +&vc4 { + status = "disabled"; +}; -diff --git a/arch/arm/boot/dts/broadcom/bcm270x-rpi.dtsi b/arch/arm/boot/dts/broadcom/bcm270x-rpi.dtsi -new file mode 100644 -index 000000000000..d434c858343d --- /dev/null +++ b/arch/arm/boot/dts/broadcom/bcm270x-rpi.dtsi @@ -0,0 +1,205 @@ @@ -3341,9 +3292,6 @@ index 000000000000..d434c858343d +}; + +#endif -diff --git a/arch/arm/boot/dts/broadcom/bcm270x.dtsi b/arch/arm/boot/dts/broadcom/bcm270x.dtsi -new file mode 100644 -index 000000000000..ccc203e3131f --- /dev/null +++ b/arch/arm/boot/dts/broadcom/bcm270x.dtsi @@ -0,0 +1,265 @@ @@ -3612,9 +3560,6 @@ index 000000000000..ccc203e3131f + dmas = <&dma 6>, <&dma 7>; + dma-names = "tx", "rx"; +}; -diff --git a/arch/arm/boot/dts/broadcom/bcm2710-rpi-2-b.dts b/arch/arm/boot/dts/broadcom/bcm2710-rpi-2-b.dts -new file mode 100644 -index 000000000000..ce48eb6073f0 --- /dev/null +++ b/arch/arm/boot/dts/broadcom/bcm2710-rpi-2-b.dts @@ -0,0 +1,204 @@ @@ -3822,9 +3767,6 @@ index 000000000000..ce48eb6073f0 + pwr_led_trigger = <&led_pwr>,"linux,default-trigger"; + }; +}; -diff --git a/arch/arm/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts b/arch/arm/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts -new file mode 100644 -index 000000000000..8973985e9902 --- /dev/null +++ b/arch/arm/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts @@ -0,0 +1,295 @@ @@ -4123,9 +4065,6 @@ index 000000000000..8973985e9902 + eth_max_speed = <ð_phy>,"max-speed:0"; + }; +}; -diff --git a/arch/arm/boot/dts/broadcom/bcm2710-rpi-3-b.dts b/arch/arm/boot/dts/broadcom/bcm2710-rpi-3-b.dts -new file mode 100644 -index 000000000000..35e6e9900083 --- /dev/null +++ b/arch/arm/boot/dts/broadcom/bcm2710-rpi-3-b.dts @@ -0,0 +1,293 @@ @@ -4422,9 +4361,6 @@ index 000000000000..35e6e9900083 + pwr_led_trigger = <&led_pwr>,"linux,default-trigger"; + }; +}; -diff --git a/arch/arm/boot/dts/broadcom/bcm2710-rpi-cm0.dts b/arch/arm/boot/dts/broadcom/bcm2710-rpi-cm0.dts -new file mode 100644 -index 000000000000..b575de6b6ce5 --- /dev/null +++ b/arch/arm/boot/dts/broadcom/bcm2710-rpi-cm0.dts @@ -0,0 +1,252 @@ @@ -4680,9 +4616,6 @@ index 000000000000..b575de6b6ce5 + act_led_trigger = <&led_act>,"linux,default-trigger"; + }; +}; -diff --git a/arch/arm/boot/dts/broadcom/bcm2710-rpi-cm3.dts b/arch/arm/boot/dts/broadcom/bcm2710-rpi-cm3.dts -new file mode 100644 -index 000000000000..0d6e9e61f877 --- /dev/null +++ b/arch/arm/boot/dts/broadcom/bcm2710-rpi-cm3.dts @@ -0,0 +1,215 @@ @@ -4901,9 +4834,6 @@ index 000000000000..0d6e9e61f877 + act_led_trigger = <&led_act>,"linux,default-trigger"; + }; +}; -diff --git a/arch/arm/boot/dts/broadcom/bcm2710-rpi-zero-2-w.dts b/arch/arm/boot/dts/broadcom/bcm2710-rpi-zero-2-w.dts -new file mode 100644 -index 000000000000..16971e50229f --- /dev/null +++ b/arch/arm/boot/dts/broadcom/bcm2710-rpi-zero-2-w.dts @@ -0,0 +1,257 @@ @@ -5164,16 +5094,10 @@ index 000000000000..16971e50229f + act_led_trigger = <&led_act>,"linux,default-trigger"; + }; +}; -diff --git a/arch/arm/boot/dts/broadcom/bcm2710-rpi-zero-2.dts b/arch/arm/boot/dts/broadcom/bcm2710-rpi-zero-2.dts -new file mode 100644 -index 000000000000..daa12bd30d6b --- /dev/null +++ b/arch/arm/boot/dts/broadcom/bcm2710-rpi-zero-2.dts @@ -0,0 +1 @@ +#include "bcm2710-rpi-zero-2-w.dts" -diff --git a/arch/arm/boot/dts/broadcom/bcm2710.dtsi b/arch/arm/boot/dts/broadcom/bcm2710.dtsi -new file mode 100644 -index 000000000000..bdcdbb51fab8 --- /dev/null +++ b/arch/arm/boot/dts/broadcom/bcm2710.dtsi @@ -0,0 +1,32 @@ @@ -5209,8 +5133,6 @@ index 000000000000..bdcdbb51fab8 +&vc4 { + status = "disabled"; +}; -diff --git a/arch/arm/boot/dts/broadcom/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/broadcom/bcm2711-rpi-4-b.dts -index 353bb50ce542..e376a5bf8913 100644 --- a/arch/arm/boot/dts/broadcom/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/broadcom/bcm2711-rpi-4-b.dts @@ -1,11 +1,19 @@ @@ -5234,7 +5156,7 @@ index 353bb50ce542..e376a5bf8913 100644 / { compatible = "raspberrypi,4-model-b", "brcm,bcm2711"; -@@ -68,7 +76,7 @@ &expgpio { +@@ -68,7 +76,7 @@ "VDD_SD_IO_SEL", "CAM_GPIO", /* 5 */ "SD_PWR_ON", @@ -5243,7 +5165,7 @@ index 353bb50ce542..e376a5bf8913 100644 }; &gpio { -@@ -82,21 +90,21 @@ &gpio { +@@ -82,21 +90,21 @@ */ gpio-line-names = "ID_SDA", /* 0 */ "ID_SCL", @@ -5275,7 +5197,7 @@ index 353bb50ce542..e376a5bf8913 100644 "GPIO16", "GPIO17", "GPIO18", -@@ -214,7 +222,7 @@ leds { +@@ -214,7 +222,7 @@ led@0 { reg = <0>; color = ; @@ -5284,7 +5206,7 @@ index 353bb50ce542..e376a5bf8913 100644 default-state = "keep"; }; -@@ -222,7 +230,7 @@ led@0 { +@@ -222,7 +230,7 @@ led@1 { reg = <1>; color = ; @@ -5293,7 +5215,7 @@ index 353bb50ce542..e376a5bf8913 100644 default-state = "keep"; }; }; -@@ -270,3 +278,234 @@ &vec { +@@ -270,3 +278,234 @@ &wifi_pwrseq { reset-gpios = <&expgpio 1 GPIO_ACTIVE_LOW>; }; @@ -5528,8 +5450,6 @@ index 353bb50ce542..e376a5bf8913 100644 + eth_max_speed = <&phy1>,"max-speed:0"; + }; +}; -diff --git a/arch/arm/boot/dts/broadcom/bcm2711-rpi-400.dts b/arch/arm/boot/dts/broadcom/bcm2711-rpi-400.dts -index ca9be91b4f36..cd0bc647f7fc 100644 --- a/arch/arm/boot/dts/broadcom/bcm2711-rpi-400.dts +++ b/arch/arm/boot/dts/broadcom/bcm2711-rpi-400.dts @@ -1,5 +1,4 @@ @@ -5538,7 +5458,7 @@ index ca9be91b4f36..cd0bc647f7fc 100644 #include "bcm2711-rpi-4-b.dts" / { -@@ -37,8 +36,54 @@ &led_pwr { +@@ -37,8 +36,54 @@ gpios = <&gpio 42 GPIO_ACTIVE_HIGH>; }; @@ -5595,9 +5515,6 @@ index ca9be91b4f36..cd0bc647f7fc 100644 + pwr_led_trigger = <&led_pwr>,"linux,default-trigger"; + }; +}; -diff --git a/arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4.dts b/arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4.dts -new file mode 100644 -index 000000000000..14cdca845300 --- /dev/null +++ b/arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4.dts @@ -0,0 +1,498 @@ @@ -6099,9 +6016,6 @@ index 000000000000..14cdca845300 + pcie_tperst_clk_ms = <&pcie0>,"brcm,tperst-clk-ms:0"; + }; +}; -diff --git a/arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4s.dts b/arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4s.dts -new file mode 100644 -index 000000000000..badf2a2fc3e9 --- /dev/null +++ b/arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4s.dts @@ -0,0 +1,293 @@ @@ -6398,9 +6312,6 @@ index 000000000000..badf2a2fc3e9 + act_led_trigger = <&led_act>,"linux,default-trigger"; + }; +}; -diff --git a/arch/arm/boot/dts/broadcom/bcm2711-rpi-ds.dtsi b/arch/arm/boot/dts/broadcom/bcm2711-rpi-ds.dtsi -new file mode 100644 -index 000000000000..8cc1ef5bf6d0 --- /dev/null +++ b/arch/arm/boot/dts/broadcom/bcm2711-rpi-ds.dtsi @@ -0,0 +1,570 @@ @@ -6974,11 +6885,9 @@ index 000000000000..8cc1ef5bf6d0 + }; + }; +}; -diff --git a/arch/arm/boot/dts/broadcom/bcm2711-rpi.dtsi b/arch/arm/boot/dts/broadcom/bcm2711-rpi.dtsi -index 1eb6406449d1..60b75679a406 100644 --- a/arch/arm/boot/dts/broadcom/bcm2711-rpi.dtsi +++ b/arch/arm/boot/dts/broadcom/bcm2711-rpi.dtsi -@@ -15,6 +15,7 @@ aliases { +@@ -15,6 +15,7 @@ ethernet0 = &genet; pcie0 = &pcie0; blconfig = &blconfig; @@ -6986,7 +6895,7 @@ index 1eb6406449d1..60b75679a406 100644 }; i2c0mux: i2c-mux0 { -@@ -99,6 +100,18 @@ blconfig: nvram@0 { +@@ -99,6 +100,18 @@ no-map; status = "disabled"; }; @@ -7005,7 +6914,7 @@ index 1eb6406449d1..60b75679a406 100644 }; &v3d { -@@ -108,3 +121,7 @@ &v3d { +@@ -108,3 +121,7 @@ &vchiq { interrupts = ; }; @@ -7013,11 +6922,9 @@ index 1eb6406449d1..60b75679a406 100644 +&hevc_dec { + clocks = <&firmware_clocks 11>; +}; -diff --git a/arch/arm/boot/dts/broadcom/bcm2711.dtsi b/arch/arm/boot/dts/broadcom/bcm2711.dtsi -index 561851182672..bb137d8da1a8 100644 --- a/arch/arm/boot/dts/broadcom/bcm2711.dtsi +++ b/arch/arm/boot/dts/broadcom/bcm2711.dtsi -@@ -277,7 +277,7 @@ pwm1: pwm@7e20c800 { +@@ -277,7 +277,7 @@ reg = <0x7e20c800 0x28>; clocks = <&clocks BCM2835_CLOCK_PWM>; assigned-clocks = <&clocks BCM2835_CLOCK_PWM>; @@ -7026,7 +6933,7 @@ index 561851182672..bb137d8da1a8 100644 #pwm-cells = <3>; status = "disabled"; }; -@@ -612,6 +612,15 @@ v3d: gpu@7ec00000 { +@@ -612,6 +612,15 @@ resets = <&pm BCM2835_RESET_V3D>; interrupts = ; }; @@ -7042,9 +6949,6 @@ index 561851182672..bb137d8da1a8 100644 }; }; -diff --git a/arch/arm/boot/dts/broadcom/bcm271x-rpi-bt.dtsi b/arch/arm/boot/dts/broadcom/bcm271x-rpi-bt.dtsi -new file mode 100644 -index 000000000000..c77e280ccd16 --- /dev/null +++ b/arch/arm/boot/dts/broadcom/bcm271x-rpi-bt.dtsi @@ -0,0 +1,42 @@ @@ -7090,9 +6994,6 @@ index 000000000000..c77e280ccd16 + krnbt_baudrate = <&bt>,"max-speed:0", <&minibt>,"max-speed:0"; + }; +}; -diff --git a/arch/arm/boot/dts/broadcom/bcm283x-rpi-csi0-2lane.dtsi b/arch/arm/boot/dts/broadcom/bcm283x-rpi-csi0-2lane.dtsi -new file mode 100644 -index 000000000000..6e4ce8622b47 --- /dev/null +++ b/arch/arm/boot/dts/broadcom/bcm283x-rpi-csi0-2lane.dtsi @@ -0,0 +1,4 @@ @@ -7100,9 +7001,6 @@ index 000000000000..6e4ce8622b47 +&csi0 { + brcm,num-data-lanes = <2>; +}; -diff --git a/arch/arm/boot/dts/broadcom/bcm283x-rpi-csi1-2lane.dtsi b/arch/arm/boot/dts/broadcom/bcm283x-rpi-csi1-2lane.dtsi -new file mode 100644 -index 000000000000..6938f4daacdc --- /dev/null +++ b/arch/arm/boot/dts/broadcom/bcm283x-rpi-csi1-2lane.dtsi @@ -0,0 +1,4 @@ @@ -7110,9 +7008,6 @@ index 000000000000..6938f4daacdc +&csi1 { + brcm,num-data-lanes = <2>; +}; -diff --git a/arch/arm/boot/dts/broadcom/bcm283x-rpi-csi1-4lane.dtsi b/arch/arm/boot/dts/broadcom/bcm283x-rpi-csi1-4lane.dtsi -new file mode 100644 -index 000000000000..b37037437bee --- /dev/null +++ b/arch/arm/boot/dts/broadcom/bcm283x-rpi-csi1-4lane.dtsi @@ -0,0 +1,4 @@ @@ -7120,9 +7015,6 @@ index 000000000000..b37037437bee +&csi1 { + brcm,num-data-lanes = <4>; +}; -diff --git a/arch/arm/boot/dts/broadcom/bcm283x-rpi-i2c0mux_0_28.dtsi b/arch/arm/boot/dts/broadcom/bcm283x-rpi-i2c0mux_0_28.dtsi -new file mode 100644 -index 000000000000..38f0074bce3f --- /dev/null +++ b/arch/arm/boot/dts/broadcom/bcm283x-rpi-i2c0mux_0_28.dtsi @@ -0,0 +1,4 @@ @@ -7130,9 +7022,6 @@ index 000000000000..38f0074bce3f + pinctrl-0 = <&i2c0_gpio0>; + pinctrl-1 = <&i2c0_gpio28>; +}; -diff --git a/arch/arm/boot/dts/broadcom/bcm283x-rpi-i2c0mux_0_44.dtsi b/arch/arm/boot/dts/broadcom/bcm283x-rpi-i2c0mux_0_44.dtsi -new file mode 100644 -index 000000000000..119946d878db --- /dev/null +++ b/arch/arm/boot/dts/broadcom/bcm283x-rpi-i2c0mux_0_44.dtsi @@ -0,0 +1,4 @@ @@ -7140,11 +7029,9 @@ index 000000000000..119946d878db + pinctrl-0 = <&i2c0_gpio0>; + pinctrl-1 = <&i2c0_gpio44>; +}; -diff --git a/arch/arm/boot/dts/broadcom/bcm283x.dtsi b/arch/arm/boot/dts/broadcom/bcm283x.dtsi -index 69b0919f1324..562c4e9d08cc 100644 --- a/arch/arm/boot/dts/broadcom/bcm283x.dtsi +++ b/arch/arm/boot/dts/broadcom/bcm283x.dtsi -@@ -363,7 +363,7 @@ dsi0: dsi@7e209000 { +@@ -363,7 +363,7 @@ #size-cells = <0>; #clock-cells = <1>; @@ -7153,7 +7040,7 @@ index 69b0919f1324..562c4e9d08cc 100644 <&clocks BCM2835_CLOCK_DSI0E>, <&clocks BCM2835_CLOCK_DSI0P>; clock-names = "phy", "escape", "pixel"; -@@ -415,7 +415,7 @@ pwm: pwm@7e20c000 { +@@ -415,7 +415,7 @@ reg = <0x7e20c000 0x28>; clocks = <&clocks BCM2835_CLOCK_PWM>; assigned-clocks = <&clocks BCM2835_CLOCK_PWM>; @@ -7162,7 +7049,7 @@ index 69b0919f1324..562c4e9d08cc 100644 #pwm-cells = <3>; status = "disabled"; }; -@@ -502,6 +502,10 @@ usb: usb@7e980000 { +@@ -502,6 +502,10 @@ }; clocks { @@ -7173,9 +7060,6 @@ index 69b0919f1324..562c4e9d08cc 100644 /* The oscillator is the root of the clock tree. */ clk_osc: clk-osc { compatible = "fixed-clock"; -diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -new file mode 100644 -index 000000000000..f8c13f656bb5 --- /dev/null +++ b/arch/arm/boot/dts/overlays/Makefile @@ -0,0 +1,368 @@ @@ -7547,9 +7431,6 @@ index 000000000000..f8c13f656bb5 + +always-y := $(dtbo-y) +clean-files := *.dtbo -diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -new file mode 100644 -index 000000000000..0e92e99f8399 --- /dev/null +++ b/arch/arm/boot/dts/overlays/README @@ -0,0 +1,6034 @@ @@ -13587,9 +13468,6 @@ index 000000000000..0e92e99f8399 +Raspberry Pi. There is a more complete explanation here: + +https://www.raspberrypi.com/documentation/computers/configuration.html#device-trees-overlays-and-parameters -diff --git a/arch/arm/boot/dts/overlays/act-led-overlay.dts b/arch/arm/boot/dts/overlays/act-led-overlay.dts -new file mode 100644 -index 000000000000..685e354923a0 --- /dev/null +++ b/arch/arm/boot/dts/overlays/act-led-overlay.dts @@ -0,0 +1,28 @@ @@ -13621,9 +13499,6 @@ index 000000000000..685e354923a0 + activelow = <&frag0>,"gpios:8"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/adafruit-st7735r-overlay.dts b/arch/arm/boot/dts/overlays/adafruit-st7735r-overlay.dts -new file mode 100644 -index 000000000000..6e69bd7fa031 --- /dev/null +++ b/arch/arm/boot/dts/overlays/adafruit-st7735r-overlay.dts @@ -0,0 +1,83 @@ @@ -13710,9 +13585,6 @@ index 000000000000..6e69bd7fa031 + <&backlight_pins>,"brcm,pins:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/adafruit18-overlay.dts b/arch/arm/boot/dts/overlays/adafruit18-overlay.dts -new file mode 100644 -index 000000000000..e1ce94a8cd3e --- /dev/null +++ b/arch/arm/boot/dts/overlays/adafruit18-overlay.dts @@ -0,0 +1,55 @@ @@ -13771,9 +13643,6 @@ index 000000000000..e1ce94a8cd3e + led_pin = <&af18>,"led-gpios:4"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/adau1977-adc-overlay.dts b/arch/arm/boot/dts/overlays/adau1977-adc-overlay.dts -new file mode 100644 -index 000000000000..cf6d1ef3bfff --- /dev/null +++ b/arch/arm/boot/dts/overlays/adau1977-adc-overlay.dts @@ -0,0 +1,40 @@ @@ -13817,9 +13686,6 @@ index 000000000000..cf6d1ef3bfff + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/adau7002-simple-overlay.dts b/arch/arm/boot/dts/overlays/adau7002-simple-overlay.dts -new file mode 100644 -index 000000000000..62e92bd8f952 --- /dev/null +++ b/arch/arm/boot/dts/overlays/adau7002-simple-overlay.dts @@ -0,0 +1,52 @@ @@ -13875,9 +13741,6 @@ index 000000000000..62e92bd8f952 + card-name = <&sound_overlay>,"simple-audio-card,name"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/ads1015-overlay.dts b/arch/arm/boot/dts/overlays/ads1015-overlay.dts -new file mode 100644 -index 000000000000..dc1764613a8b --- /dev/null +++ b/arch/arm/boot/dts/overlays/ads1015-overlay.dts @@ -0,0 +1,98 @@ @@ -13979,9 +13842,6 @@ index 000000000000..dc1764613a8b + }; + +}; -diff --git a/arch/arm/boot/dts/overlays/ads1115-overlay.dts b/arch/arm/boot/dts/overlays/ads1115-overlay.dts -new file mode 100644 -index 000000000000..6a1d86929add --- /dev/null +++ b/arch/arm/boot/dts/overlays/ads1115-overlay.dts @@ -0,0 +1,105 @@ @@ -14090,9 +13950,6 @@ index 000000000000..6a1d86929add + chd_datarate = <&channel_d>,"ti,datarate:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/ads7846-overlay.dts b/arch/arm/boot/dts/overlays/ads7846-overlay.dts -new file mode 100644 -index 000000000000..cb3e3bf6c098 --- /dev/null +++ b/arch/arm/boot/dts/overlays/ads7846-overlay.dts @@ -0,0 +1,91 @@ @@ -14187,9 +14044,6 @@ index 000000000000..cb3e3bf6c098 + invy = <&ads7846>,"touchscreen-inverted-y?"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/adv7282m-overlay.dts b/arch/arm/boot/dts/overlays/adv7282m-overlay.dts -new file mode 100644 -index 000000000000..a9eb75a30825 --- /dev/null +++ b/arch/arm/boot/dts/overlays/adv7282m-overlay.dts @@ -0,0 +1,73 @@ @@ -14266,9 +14120,6 @@ index 000000000000..a9eb75a30825 + media-controller = <0>,"!4"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/adv728x-m-overlay.dts b/arch/arm/boot/dts/overlays/adv728x-m-overlay.dts -new file mode 100644 -index 000000000000..ea392e886984 --- /dev/null +++ b/arch/arm/boot/dts/overlays/adv728x-m-overlay.dts @@ -0,0 +1,37 @@ @@ -14309,9 +14160,6 @@ index 000000000000..ea392e886984 + adv7281ma = <0>, "+103"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/akkordion-iqdacplus-overlay.dts b/arch/arm/boot/dts/overlays/akkordion-iqdacplus-overlay.dts -new file mode 100644 -index 000000000000..d867146bcb8f --- /dev/null +++ b/arch/arm/boot/dts/overlays/akkordion-iqdacplus-overlay.dts @@ -0,0 +1,49 @@ @@ -14364,9 +14212,6 @@ index 000000000000..d867146bcb8f + 24db_digital_gain = <&frag2>,"iqaudio,24db_digital_gain?"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/allo-boss-dac-pcm512x-audio-overlay.dts b/arch/arm/boot/dts/overlays/allo-boss-dac-pcm512x-audio-overlay.dts -new file mode 100644 -index 000000000000..16806945890b --- /dev/null +++ b/arch/arm/boot/dts/overlays/allo-boss-dac-pcm512x-audio-overlay.dts @@ -0,0 +1,61 @@ @@ -14431,9 +14276,6 @@ index 000000000000..16806945890b + <&boss_dac>,"i2s-controller:0=",<&i2s_clk_producer>; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/allo-boss2-dac-audio-overlay.dts b/arch/arm/boot/dts/overlays/allo-boss2-dac-audio-overlay.dts -new file mode 100644 -index 000000000000..feac2b091b36 --- /dev/null +++ b/arch/arm/boot/dts/overlays/allo-boss2-dac-audio-overlay.dts @@ -0,0 +1,57 @@ @@ -14494,9 +14336,6 @@ index 000000000000..feac2b091b36 + }; +}; + -diff --git a/arch/arm/boot/dts/overlays/allo-digione-overlay.dts b/arch/arm/boot/dts/overlays/allo-digione-overlay.dts -new file mode 100644 -index 000000000000..61c3c2e9fbd8 --- /dev/null +++ b/arch/arm/boot/dts/overlays/allo-digione-overlay.dts @@ -0,0 +1,44 @@ @@ -14544,9 +14383,6 @@ index 000000000000..61c3c2e9fbd8 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/allo-katana-dac-audio-overlay.dts b/arch/arm/boot/dts/overlays/allo-katana-dac-audio-overlay.dts -new file mode 100644 -index 000000000000..1ebb6bc6b907 --- /dev/null +++ b/arch/arm/boot/dts/overlays/allo-katana-dac-audio-overlay.dts @@ -0,0 +1,58 @@ @@ -14608,9 +14444,6 @@ index 000000000000..1ebb6bc6b907 + }; +}; + -diff --git a/arch/arm/boot/dts/overlays/allo-piano-dac-pcm512x-audio-overlay.dts b/arch/arm/boot/dts/overlays/allo-piano-dac-pcm512x-audio-overlay.dts -new file mode 100644 -index 000000000000..1b79ef1df2a1 --- /dev/null +++ b/arch/arm/boot/dts/overlays/allo-piano-dac-pcm512x-audio-overlay.dts @@ -0,0 +1,54 @@ @@ -14668,9 +14501,6 @@ index 000000000000..1b79ef1df2a1 + <&piano_dac>,"allo,24db_digital_gain?"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/allo-piano-dac-plus-pcm512x-audio-overlay.dts b/arch/arm/boot/dts/overlays/allo-piano-dac-plus-pcm512x-audio-overlay.dts -new file mode 100644 -index 000000000000..d17c9c10df39 --- /dev/null +++ b/arch/arm/boot/dts/overlays/allo-piano-dac-plus-pcm512x-audio-overlay.dts @@ -0,0 +1,57 @@ @@ -14731,9 +14561,6 @@ index 000000000000..d17c9c10df39 + <&piano_dac>,"allo,glb_mclk?"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/anyspi-overlay.dts b/arch/arm/boot/dts/overlays/anyspi-overlay.dts -new file mode 100755 -index 000000000000..87523dcca318 --- /dev/null +++ b/arch/arm/boot/dts/overlays/anyspi-overlay.dts @@ -0,0 +1,205 @@ @@ -14942,9 +14769,6 @@ index 000000000000..87523dcca318 + <&anyspi_22>, "spi-max-frequency:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/apds9960-overlay.dts b/arch/arm/boot/dts/overlays/apds9960-overlay.dts -new file mode 100644 -index 000000000000..bb18cca1ac66 --- /dev/null +++ b/arch/arm/boot/dts/overlays/apds9960-overlay.dts @@ -0,0 +1,55 @@ @@ -15003,9 +14827,6 @@ index 000000000000..bb18cca1ac66 + }; +}; + -diff --git a/arch/arm/boot/dts/overlays/applepi-dac-overlay.dts b/arch/arm/boot/dts/overlays/applepi-dac-overlay.dts -new file mode 100644 -index 000000000000..cb7649d3a613 --- /dev/null +++ b/arch/arm/boot/dts/overlays/applepi-dac-overlay.dts @@ -0,0 +1,57 @@ @@ -15066,9 +14887,6 @@ index 000000000000..cb7649d3a613 + compile with: + dtc -@ -H epapr -O dtb -o ApplePi-DAC.dtbo -W no-unit_address_vs_reg ApplePi-DAC.dts +*/ -diff --git a/arch/arm/boot/dts/overlays/arducam-64mp-overlay.dts b/arch/arm/boot/dts/overlays/arducam-64mp-overlay.dts -new file mode 100644 -index 000000000000..3f3d7858f2fd --- /dev/null +++ b/arch/arm/boot/dts/overlays/arducam-64mp-overlay.dts @@ -0,0 +1,97 @@ @@ -15169,9 +14987,6 @@ index 000000000000..3f3d7858f2fd +&vcm_node { + status = "okay"; +}; -diff --git a/arch/arm/boot/dts/overlays/arducam-64mp.dtsi b/arch/arm/boot/dts/overlays/arducam-64mp.dtsi -new file mode 100644 -index 000000000000..ed9f2e50c287 --- /dev/null +++ b/arch/arm/boot/dts/overlays/arducam-64mp.dtsi @@ -0,0 +1,34 @@ @@ -15209,9 +15024,6 @@ index 000000000000..ed9f2e50c287 + status = "disabled"; + VDD-supply = <&cam1_reg>; +}; -diff --git a/arch/arm/boot/dts/overlays/arducam-pivariety-overlay.dts b/arch/arm/boot/dts/overlays/arducam-pivariety-overlay.dts -new file mode 100644 -index 000000000000..752022786f70 --- /dev/null +++ b/arch/arm/boot/dts/overlays/arducam-pivariety-overlay.dts @@ -0,0 +1,100 @@ @@ -15315,9 +15127,6 @@ index 000000000000..752022786f70 + <&arducam_pivariety>, "VANA-supply:0=",<&cam0_reg>; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/at86rf233-overlay.dts b/arch/arm/boot/dts/overlays/at86rf233-overlay.dts -new file mode 100644 -index 000000000000..2caae2e21328 --- /dev/null +++ b/arch/arm/boot/dts/overlays/at86rf233-overlay.dts @@ -0,0 +1,44 @@ @@ -15365,9 +15174,6 @@ index 000000000000..2caae2e21328 + trim = <&lowpan0>, "xtal-trim.0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/audioinjector-addons-overlay.dts b/arch/arm/boot/dts/overlays/audioinjector-addons-overlay.dts -new file mode 100644 -index 000000000000..af72ea0b706a --- /dev/null +++ b/arch/arm/boot/dts/overlays/audioinjector-addons-overlay.dts @@ -0,0 +1,60 @@ @@ -15431,9 +15237,6 @@ index 000000000000..af72ea0b706a + non-stop-clocks = <&snd>, "non-stop-clocks?"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/audioinjector-bare-i2s-overlay.dts b/arch/arm/boot/dts/overlays/audioinjector-bare-i2s-overlay.dts -new file mode 100644 -index 000000000000..a536fbb1a985 --- /dev/null +++ b/arch/arm/boot/dts/overlays/audioinjector-bare-i2s-overlay.dts @@ -0,0 +1,50 @@ @@ -15487,9 +15290,6 @@ index 000000000000..a536fbb1a985 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/audioinjector-isolated-soundcard-overlay.dts b/arch/arm/boot/dts/overlays/audioinjector-isolated-soundcard-overlay.dts -new file mode 100644 -index 000000000000..89faed778fcb --- /dev/null +++ b/arch/arm/boot/dts/overlays/audioinjector-isolated-soundcard-overlay.dts @@ -0,0 +1,55 @@ @@ -15548,9 +15348,6 @@ index 000000000000..89faed778fcb + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/audioinjector-ultra-overlay.dts b/arch/arm/boot/dts/overlays/audioinjector-ultra-overlay.dts -new file mode 100644 -index 000000000000..ee79441187bd --- /dev/null +++ b/arch/arm/boot/dts/overlays/audioinjector-ultra-overlay.dts @@ -0,0 +1,71 @@ @@ -15625,9 +15422,6 @@ index 000000000000..ee79441187bd + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/audioinjector-wm8731-audio-overlay.dts b/arch/arm/boot/dts/overlays/audioinjector-wm8731-audio-overlay.dts -new file mode 100644 -index 000000000000..417353b2798e --- /dev/null +++ b/arch/arm/boot/dts/overlays/audioinjector-wm8731-audio-overlay.dts @@ -0,0 +1,39 @@ @@ -15670,9 +15464,6 @@ index 000000000000..417353b2798e + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/audiosense-pi-overlay.dts b/arch/arm/boot/dts/overlays/audiosense-pi-overlay.dts -new file mode 100644 -index 000000000000..34b1f883f80d --- /dev/null +++ b/arch/arm/boot/dts/overlays/audiosense-pi-overlay.dts @@ -0,0 +1,72 @@ @@ -15748,9 +15539,6 @@ index 000000000000..34b1f883f80d + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/audremap-overlay.dts b/arch/arm/boot/dts/overlays/audremap-overlay.dts -new file mode 100644 -index 000000000000..95027c5c8f9e --- /dev/null +++ b/arch/arm/boot/dts/overlays/audremap-overlay.dts @@ -0,0 +1,38 @@ @@ -15792,9 +15580,6 @@ index 000000000000..95027c5c8f9e + <&frag0>,"brcm,function:0=4"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/audremap-pi5-overlay.dts b/arch/arm/boot/dts/overlays/audremap-pi5-overlay.dts -new file mode 100644 -index 000000000000..aa74ecd26f15 --- /dev/null +++ b/arch/arm/boot/dts/overlays/audremap-pi5-overlay.dts @@ -0,0 +1,65 @@ @@ -15863,9 +15648,6 @@ index 000000000000..aa74ecd26f15 + pins_40_45 = <0>, "-0-1"; /* sorry not supported */ + }; +}; -diff --git a/arch/arm/boot/dts/overlays/balena-fin-overlay.dts b/arch/arm/boot/dts/overlays/balena-fin-overlay.dts -new file mode 100644 -index 000000000000..8fc22587e69c --- /dev/null +++ b/arch/arm/boot/dts/overlays/balena-fin-overlay.dts @@ -0,0 +1,125 @@ @@ -15994,9 +15776,6 @@ index 000000000000..8fc22587e69c + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/bcm2712d0-overlay.dts b/arch/arm/boot/dts/overlays/bcm2712d0-overlay.dts -new file mode 100644 -index 000000000000..1ee74234e805 --- /dev/null +++ b/arch/arm/boot/dts/overlays/bcm2712d0-overlay.dts @@ -0,0 +1,68 @@ @@ -16068,9 +15847,6 @@ index 000000000000..1ee74234e805 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/camera-mux-2port-overlay.dts b/arch/arm/boot/dts/overlays/camera-mux-2port-overlay.dts -new file mode 100644 -index 000000000000..97d1988dd984 --- /dev/null +++ b/arch/arm/boot/dts/overlays/camera-mux-2port-overlay.dts @@ -0,0 +1,545 @@ @@ -16619,9 +16395,6 @@ index 000000000000..97d1988dd984 + cam1-sync-sink = <&imx477_1>, "trigger-mode:0=2"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/camera-mux-4port-overlay.dts b/arch/arm/boot/dts/overlays/camera-mux-4port-overlay.dts -new file mode 100644 -index 000000000000..dbbb476f51e7 --- /dev/null +++ b/arch/arm/boot/dts/overlays/camera-mux-4port-overlay.dts @@ -0,0 +1,954 @@ @@ -17579,9 +17352,6 @@ index 000000000000..dbbb476f51e7 + cam3-sync-sink = <&imx477_3>, "trigger-mode:0=2"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/cap1106-overlay.dts b/arch/arm/boot/dts/overlays/cap1106-overlay.dts -new file mode 100644 -index 000000000000..0a585e725f84 --- /dev/null +++ b/arch/arm/boot/dts/overlays/cap1106-overlay.dts @@ -0,0 +1,52 @@ @@ -17637,9 +17407,6 @@ index 000000000000..0a585e725f84 + <&cap1106_pins>, "brcm,pins:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/chipcap2-overlay.dts b/arch/arm/boot/dts/overlays/chipcap2-overlay.dts -new file mode 100644 -index 000000000000..221b2541c909 --- /dev/null +++ b/arch/arm/boot/dts/overlays/chipcap2-overlay.dts @@ -0,0 +1,52 @@ @@ -17695,9 +17462,6 @@ index 000000000000..221b2541c909 + reg_pin = <&chipcap2_reg>, "gpio:4"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/chipdip-dac-overlay.dts b/arch/arm/boot/dts/overlays/chipdip-dac-overlay.dts -new file mode 100644 -index 000000000000..3ef7565a9312 --- /dev/null +++ b/arch/arm/boot/dts/overlays/chipdip-dac-overlay.dts @@ -0,0 +1,46 @@ @@ -17747,9 +17511,6 @@ index 000000000000..3ef7565a9312 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/cirrus-wm5102-overlay.dts b/arch/arm/boot/dts/overlays/cirrus-wm5102-overlay.dts -new file mode 100644 -index 000000000000..a82b422ba16e --- /dev/null +++ b/arch/arm/boot/dts/overlays/cirrus-wm5102-overlay.dts @@ -0,0 +1,172 @@ @@ -17925,9 +17686,6 @@ index 000000000000..a82b422ba16e + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/cm-swap-i2c0-overlay.dts b/arch/arm/boot/dts/overlays/cm-swap-i2c0-overlay.dts -new file mode 100644 -index 000000000000..6b7f599f7611 --- /dev/null +++ b/arch/arm/boot/dts/overlays/cm-swap-i2c0-overlay.dts @@ -0,0 +1,27 @@ @@ -17958,9 +17716,6 @@ index 000000000000..6b7f599f7611 + i2c10-gpio44 = <&i2c0mux_frag>, "pinctrl-1:0=",<&i2c0_gpio44>; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/cma-overlay.dts b/arch/arm/boot/dts/overlays/cma-overlay.dts -new file mode 100644 -index 000000000000..1d87c599f909 --- /dev/null +++ b/arch/arm/boot/dts/overlays/cma-overlay.dts @@ -0,0 +1,36 @@ @@ -18000,9 +17755,6 @@ index 000000000000..1d87c599f909 + cma-default = <0>,"-0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/crystalfontz-cfa050_pi_m-overlay.dts b/arch/arm/boot/dts/overlays/crystalfontz-cfa050_pi_m-overlay.dts -new file mode 100644 -index 000000000000..fe8f97a57278 --- /dev/null +++ b/arch/arm/boot/dts/overlays/crystalfontz-cfa050_pi_m-overlay.dts @@ -0,0 +1,133 @@ @@ -18139,9 +17891,6 @@ index 000000000000..fe8f97a57278 + <&frag5>, "target:0=",<&i2c_csi_dsi0>; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/cutiepi-panel-overlay.dts b/arch/arm/boot/dts/overlays/cutiepi-panel-overlay.dts -new file mode 100644 -index 000000000000..d14c3698eb75 --- /dev/null +++ b/arch/arm/boot/dts/overlays/cutiepi-panel-overlay.dts @@ -0,0 +1,117 @@ @@ -18262,9 +18011,6 @@ index 000000000000..d14c3698eb75 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/dacberry400-overlay.dts b/arch/arm/boot/dts/overlays/dacberry400-overlay.dts -new file mode 100644 -index 000000000000..dfc357102c00 --- /dev/null +++ b/arch/arm/boot/dts/overlays/dacberry400-overlay.dts @@ -0,0 +1,61 @@ @@ -18329,9 +18075,6 @@ index 000000000000..dfc357102c00 +}; + + -diff --git a/arch/arm/boot/dts/overlays/dht11-overlay.dts b/arch/arm/boot/dts/overlays/dht11-overlay.dts -new file mode 100644 -index 000000000000..8b0fc6b7a3cb --- /dev/null +++ b/arch/arm/boot/dts/overlays/dht11-overlay.dts @@ -0,0 +1,48 @@ @@ -18383,9 +18126,6 @@ index 000000000000..8b0fc6b7a3cb + <&iio>,"reg:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/dionaudio-kiwi-overlay.dts b/arch/arm/boot/dts/overlays/dionaudio-kiwi-overlay.dts -new file mode 100644 -index 000000000000..ab0144cd17dc --- /dev/null +++ b/arch/arm/boot/dts/overlays/dionaudio-kiwi-overlay.dts @@ -0,0 +1,39 @@ @@ -18428,9 +18168,6 @@ index 000000000000..ab0144cd17dc + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/dionaudio-loco-overlay.dts b/arch/arm/boot/dts/overlays/dionaudio-loco-overlay.dts -new file mode 100644 -index 000000000000..6f4a9c1a8243 --- /dev/null +++ b/arch/arm/boot/dts/overlays/dionaudio-loco-overlay.dts @@ -0,0 +1,39 @@ @@ -18473,9 +18210,6 @@ index 000000000000..6f4a9c1a8243 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/dionaudio-loco-v2-overlay.dts b/arch/arm/boot/dts/overlays/dionaudio-loco-v2-overlay.dts -new file mode 100644 -index 000000000000..975a844eb272 --- /dev/null +++ b/arch/arm/boot/dts/overlays/dionaudio-loco-v2-overlay.dts @@ -0,0 +1,49 @@ @@ -18528,9 +18262,6 @@ index 000000000000..975a844eb272 + 24db_digital_gain = <&frag0>,"dionaudio,24db_digital_gain?"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/disable-bt-overlay.dts b/arch/arm/boot/dts/overlays/disable-bt-overlay.dts -new file mode 100644 -index 000000000000..f3a8af1375f0 --- /dev/null +++ b/arch/arm/boot/dts/overlays/disable-bt-overlay.dts @@ -0,0 +1,59 @@ @@ -18593,9 +18324,6 @@ index 000000000000..f3a8af1375f0 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/disable-bt-pi5-overlay.dts b/arch/arm/boot/dts/overlays/disable-bt-pi5-overlay.dts -new file mode 100644 -index 000000000000..6e23b64d44e7 --- /dev/null +++ b/arch/arm/boot/dts/overlays/disable-bt-pi5-overlay.dts @@ -0,0 +1,17 @@ @@ -18616,9 +18344,6 @@ index 000000000000..6e23b64d44e7 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/disable-emmc2-overlay.dts b/arch/arm/boot/dts/overlays/disable-emmc2-overlay.dts -new file mode 100644 -index 000000000000..8cd1d7fa4a90 --- /dev/null +++ b/arch/arm/boot/dts/overlays/disable-emmc2-overlay.dts @@ -0,0 +1,13 @@ @@ -18635,9 +18360,6 @@ index 000000000000..8cd1d7fa4a90 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/disable-wifi-overlay.dts b/arch/arm/boot/dts/overlays/disable-wifi-overlay.dts -new file mode 100644 -index 000000000000..75e046463900 --- /dev/null +++ b/arch/arm/boot/dts/overlays/disable-wifi-overlay.dts @@ -0,0 +1,20 @@ @@ -18661,9 +18383,6 @@ index 000000000000..75e046463900 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/disable-wifi-pi5-overlay.dts b/arch/arm/boot/dts/overlays/disable-wifi-pi5-overlay.dts -new file mode 100644 -index 000000000000..d5389c5dbb69 --- /dev/null +++ b/arch/arm/boot/dts/overlays/disable-wifi-pi5-overlay.dts @@ -0,0 +1,13 @@ @@ -18680,9 +18399,6 @@ index 000000000000..d5389c5dbb69 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/dpi18-overlay.dts b/arch/arm/boot/dts/overlays/dpi18-overlay.dts -new file mode 100644 -index 000000000000..4abe5be744db --- /dev/null +++ b/arch/arm/boot/dts/overlays/dpi18-overlay.dts @@ -0,0 +1,39 @@ @@ -18725,9 +18441,6 @@ index 000000000000..4abe5be744db + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/dpi18cpadhi-overlay.dts b/arch/arm/boot/dts/overlays/dpi18cpadhi-overlay.dts -new file mode 100644 -index 000000000000..50c88a1ed299 --- /dev/null +++ b/arch/arm/boot/dts/overlays/dpi18cpadhi-overlay.dts @@ -0,0 +1,26 @@ @@ -18757,9 +18470,6 @@ index 000000000000..50c88a1ed299 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/dpi24-overlay.dts b/arch/arm/boot/dts/overlays/dpi24-overlay.dts -new file mode 100644 -index 000000000000..44335cc81277 --- /dev/null +++ b/arch/arm/boot/dts/overlays/dpi24-overlay.dts @@ -0,0 +1,39 @@ @@ -18802,9 +18512,6 @@ index 000000000000..44335cc81277 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/draws-overlay.dts b/arch/arm/boot/dts/overlays/draws-overlay.dts -new file mode 100644 -index 000000000000..d2a8513d4cc9 --- /dev/null +++ b/arch/arm/boot/dts/overlays/draws-overlay.dts @@ -0,0 +1,204 @@ @@ -19012,9 +18719,6 @@ index 000000000000..d2a8513d4cc9 + alsaname = <&snd>, "simple-audio-card,name"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/dwc-otg-deprecated-overlay.dts b/arch/arm/boot/dts/overlays/dwc-otg-deprecated-overlay.dts -new file mode 100644 -index 000000000000..78c5e9f85048 --- /dev/null +++ b/arch/arm/boot/dts/overlays/dwc-otg-deprecated-overlay.dts @@ -0,0 +1,14 @@ @@ -19032,9 +18736,6 @@ index 000000000000..78c5e9f85048 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/dwc2-overlay.dts b/arch/arm/boot/dts/overlays/dwc2-overlay.dts -new file mode 100644 -index 000000000000..0d83e344ad97 --- /dev/null +++ b/arch/arm/boot/dts/overlays/dwc2-overlay.dts @@ -0,0 +1,26 @@ @@ -19064,9 +18765,6 @@ index 000000000000..0d83e344ad97 + g-rx-fifo-size = <&dwc2_usb>,"g-rx-fifo-size:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/edt-ft5406-overlay.dts b/arch/arm/boot/dts/overlays/edt-ft5406-overlay.dts -new file mode 100644 -index 000000000000..7cbc3fa673a3 --- /dev/null +++ b/arch/arm/boot/dts/overlays/edt-ft5406-overlay.dts @@ -0,0 +1,22 @@ @@ -19092,9 +18790,6 @@ index 000000000000..7cbc3fa673a3 + addr = <&ft5406>,"reg:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/edt-ft5406.dtsi b/arch/arm/boot/dts/overlays/edt-ft5406.dtsi -new file mode 100644 -index 000000000000..3be2f18e898f --- /dev/null +++ b/arch/arm/boot/dts/overlays/edt-ft5406.dtsi @@ -0,0 +1,48 @@ @@ -19146,9 +18841,6 @@ index 000000000000..3be2f18e898f + swapxy = <&ft5406>,"touchscreen-swapped-x-y?"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/enc28j60-overlay.dts b/arch/arm/boot/dts/overlays/enc28j60-overlay.dts -new file mode 100644 -index 000000000000..7af5c2e607ea --- /dev/null +++ b/arch/arm/boot/dts/overlays/enc28j60-overlay.dts @@ -0,0 +1,53 @@ @@ -19205,9 +18897,6 @@ index 000000000000..7af5c2e607ea + speed = <ð1>, "spi-max-frequency:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/enc28j60-spi2-overlay.dts b/arch/arm/boot/dts/overlays/enc28j60-spi2-overlay.dts -new file mode 100644 -index 000000000000..17cb5b8fa485 --- /dev/null +++ b/arch/arm/boot/dts/overlays/enc28j60-spi2-overlay.dts @@ -0,0 +1,47 @@ @@ -19258,9 +18947,6 @@ index 000000000000..17cb5b8fa485 + speed = <ð1>, "spi-max-frequency:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/exc3000-overlay.dts b/arch/arm/boot/dts/overlays/exc3000-overlay.dts -new file mode 100644 -index 000000000000..6f087fb20661 --- /dev/null +++ b/arch/arm/boot/dts/overlays/exc3000-overlay.dts @@ -0,0 +1,48 @@ @@ -19312,9 +18998,6 @@ index 000000000000..6f087fb20661 + swapxy = <&exc3000>,"touchscreen-swapped-x-y?"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/ezsound-6x8iso-overlay.dts b/arch/arm/boot/dts/overlays/ezsound-6x8iso-overlay.dts -new file mode 100644 -index 000000000000..764ad9a56edc --- /dev/null +++ b/arch/arm/boot/dts/overlays/ezsound-6x8iso-overlay.dts @@ -0,0 +1,117 @@ @@ -19435,9 +19118,6 @@ index 000000000000..764ad9a56edc + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/fbtft-overlay.dts b/arch/arm/boot/dts/overlays/fbtft-overlay.dts -new file mode 100644 -index 000000000000..db45f8c53bcc --- /dev/null +++ b/arch/arm/boot/dts/overlays/fbtft-overlay.dts @@ -0,0 +1,611 @@ @@ -20052,9 +19732,6 @@ index 000000000000..db45f8c53bcc + <&display>, "led-gpios:8=0"; /* GPIO_ACTIVE_HIGH */ + }; +}; -diff --git a/arch/arm/boot/dts/overlays/fe-pi-audio-overlay.dts b/arch/arm/boot/dts/overlays/fe-pi-audio-overlay.dts -new file mode 100644 -index 000000000000..10624fe4f5ac --- /dev/null +++ b/arch/arm/boot/dts/overlays/fe-pi-audio-overlay.dts @@ -0,0 +1,70 @@ @@ -20128,9 +19805,6 @@ index 000000000000..10624fe4f5ac + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/fsm-demo-overlay.dts b/arch/arm/boot/dts/overlays/fsm-demo-overlay.dts -new file mode 100644 -index 000000000000..e9944f5cd258 --- /dev/null +++ b/arch/arm/boot/dts/overlays/fsm-demo-overlay.dts @@ -0,0 +1,104 @@ @@ -20238,9 +19912,6 @@ index 000000000000..e9944f5cd258 + fsm_debug = <&fsm_demo>,"debug:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/gc9a01-overlay.dts b/arch/arm/boot/dts/overlays/gc9a01-overlay.dts -new file mode 100644 -index 000000000000..3d31030c5564 --- /dev/null +++ b/arch/arm/boot/dts/overlays/gc9a01-overlay.dts @@ -0,0 +1,151 @@ @@ -20395,9 +20066,6 @@ index 000000000000..3d31030c5564 + debug = <&gc9a01>,"debug:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/ghost-amp-overlay.dts b/arch/arm/boot/dts/overlays/ghost-amp-overlay.dts -new file mode 100644 -index 000000000000..d2f1e9a888e0 --- /dev/null +++ b/arch/arm/boot/dts/overlays/ghost-amp-overlay.dts @@ -0,0 +1,145 @@ @@ -20546,9 +20214,6 @@ index 000000000000..d2f1e9a888e0 + fsm_debug = <&>,"debug:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/goodix-overlay.dts b/arch/arm/boot/dts/overlays/goodix-overlay.dts -new file mode 100644 -index 000000000000..8a5035df9daa --- /dev/null +++ b/arch/arm/boot/dts/overlays/goodix-overlay.dts @@ -0,0 +1,49 @@ @@ -20601,9 +20266,6 @@ index 000000000000..8a5035df9daa + <&i2c_frag>, "target-path"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/googlevoicehat-soundcard-overlay.dts b/arch/arm/boot/dts/overlays/googlevoicehat-soundcard-overlay.dts -new file mode 100644 -index 000000000000..1063f1898562 --- /dev/null +++ b/arch/arm/boot/dts/overlays/googlevoicehat-soundcard-overlay.dts @@ -0,0 +1,49 @@ @@ -20656,9 +20318,6 @@ index 000000000000..1063f1898562 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/gpio-charger-overlay.dts b/arch/arm/boot/dts/overlays/gpio-charger-overlay.dts -new file mode 100644 -index 000000000000..2868aa06dd6d --- /dev/null +++ b/arch/arm/boot/dts/overlays/gpio-charger-overlay.dts @@ -0,0 +1,42 @@ @@ -20704,9 +20363,6 @@ index 000000000000..2868aa06dd6d + }; + +}; -diff --git a/arch/arm/boot/dts/overlays/gpio-fan-overlay.dts b/arch/arm/boot/dts/overlays/gpio-fan-overlay.dts -new file mode 100644 -index 000000000000..17b77bb27931 --- /dev/null +++ b/arch/arm/boot/dts/overlays/gpio-fan-overlay.dts @@ -0,0 +1,89 @@ @@ -20799,9 +20455,6 @@ index 000000000000..17b77bb27931 + hyst = <&cpu_hot>,"hysteresis:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/gpio-hog-overlay.dts b/arch/arm/boot/dts/overlays/gpio-hog-overlay.dts -new file mode 100644 -index 000000000000..c9e39046fed9 --- /dev/null +++ b/arch/arm/boot/dts/overlays/gpio-hog-overlay.dts @@ -0,0 +1,27 @@ @@ -20832,9 +20485,6 @@ index 000000000000..c9e39046fed9 + <&hog>,"output-low?"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/gpio-ir-overlay.dts b/arch/arm/boot/dts/overlays/gpio-ir-overlay.dts -new file mode 100644 -index 000000000000..162b6ce07dc9 --- /dev/null +++ b/arch/arm/boot/dts/overlays/gpio-ir-overlay.dts @@ -0,0 +1,49 @@ @@ -20887,9 +20537,6 @@ index 000000000000..162b6ce07dc9 + rc-map-name = <&gpio_ir>,"linux,rc-map-name"; // default rc map + }; +}; -diff --git a/arch/arm/boot/dts/overlays/gpio-ir-tx-overlay.dts b/arch/arm/boot/dts/overlays/gpio-ir-tx-overlay.dts -new file mode 100644 -index 000000000000..3625431b7560 --- /dev/null +++ b/arch/arm/boot/dts/overlays/gpio-ir-tx-overlay.dts @@ -0,0 +1,36 @@ @@ -20929,9 +20576,6 @@ index 000000000000..3625431b7560 + invert = <&gpio_ir_tx>, "gpios:8"; // 1 = active low + }; +}; -diff --git a/arch/arm/boot/dts/overlays/gpio-key-overlay.dts b/arch/arm/boot/dts/overlays/gpio-key-overlay.dts -new file mode 100644 -index 000000000000..eb5968cbc07f --- /dev/null +++ b/arch/arm/boot/dts/overlays/gpio-key-overlay.dts @@ -0,0 +1,49 @@ @@ -20984,9 +20628,6 @@ index 000000000000..eb5968cbc07f + }; + +}; -diff --git a/arch/arm/boot/dts/overlays/gpio-led-overlay.dts b/arch/arm/boot/dts/overlays/gpio-led-overlay.dts -new file mode 100755 -index 000000000000..d8e9d53f1b61 --- /dev/null +++ b/arch/arm/boot/dts/overlays/gpio-led-overlay.dts @@ -0,0 +1,97 @@ @@ -21087,9 +20728,6 @@ index 000000000000..d8e9d53f1b61 + +}; + -diff --git a/arch/arm/boot/dts/overlays/gpio-no-bank0-irq-overlay.dts b/arch/arm/boot/dts/overlays/gpio-no-bank0-irq-overlay.dts -new file mode 100755 -index 000000000000..96cbe80820b7 --- /dev/null +++ b/arch/arm/boot/dts/overlays/gpio-no-bank0-irq-overlay.dts @@ -0,0 +1,14 @@ @@ -21107,9 +20745,6 @@ index 000000000000..96cbe80820b7 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/gpio-no-irq-overlay.dts b/arch/arm/boot/dts/overlays/gpio-no-irq-overlay.dts -new file mode 100644 -index 000000000000..55f9bff3a8f6 --- /dev/null +++ b/arch/arm/boot/dts/overlays/gpio-no-irq-overlay.dts @@ -0,0 +1,14 @@ @@ -21127,9 +20762,6 @@ index 000000000000..55f9bff3a8f6 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts b/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts -new file mode 100644 -index 000000000000..0af2b0d55c63 --- /dev/null +++ b/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts @@ -0,0 +1,28 @@ @@ -21161,9 +20793,6 @@ index 000000000000..0af2b0d55c63 + inactive_delay_ms = <&power_ctrl>,"inactive-delay-ms:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/gpio-shutdown-overlay.dts b/arch/arm/boot/dts/overlays/gpio-shutdown-overlay.dts -new file mode 100644 -index 000000000000..da148064aedd --- /dev/null +++ b/arch/arm/boot/dts/overlays/gpio-shutdown-overlay.dts @@ -0,0 +1,86 @@ @@ -21253,9 +20882,6 @@ index 000000000000..da148064aedd + }; + +}; -diff --git a/arch/arm/boot/dts/overlays/hat_map.dts b/arch/arm/boot/dts/overlays/hat_map.dts -new file mode 100644 -index 000000000000..0b5d902e85b8 --- /dev/null +++ b/arch/arm/boot/dts/overlays/hat_map.dts @@ -0,0 +1,124 @@ @@ -21383,9 +21009,6 @@ index 000000000000..0b5d902e85b8 + overlay = "rpi-sense-v2"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/hd44780-i2c-lcd-overlay.dts b/arch/arm/boot/dts/overlays/hd44780-i2c-lcd-overlay.dts -new file mode 100644 -index 000000000000..d5bfd762fe2e --- /dev/null +++ b/arch/arm/boot/dts/overlays/hd44780-i2c-lcd-overlay.dts @@ -0,0 +1,59 @@ @@ -21448,9 +21071,6 @@ index 000000000000..d5bfd762fe2e + }; + +}; -diff --git a/arch/arm/boot/dts/overlays/hd44780-lcd-overlay.dts b/arch/arm/boot/dts/overlays/hd44780-lcd-overlay.dts -new file mode 100644 -index 000000000000..ee726669ff51 --- /dev/null +++ b/arch/arm/boot/dts/overlays/hd44780-lcd-overlay.dts @@ -0,0 +1,46 @@ @@ -21500,9 +21120,6 @@ index 000000000000..ee726669ff51 + }; + +}; -diff --git a/arch/arm/boot/dts/overlays/hdmi-backlight-hwhack-gpio-overlay.dts b/arch/arm/boot/dts/overlays/hdmi-backlight-hwhack-gpio-overlay.dts -new file mode 100644 -index 000000000000..50b9a2665c80 --- /dev/null +++ b/arch/arm/boot/dts/overlays/hdmi-backlight-hwhack-gpio-overlay.dts @@ -0,0 +1,47 @@ @@ -21553,9 +21170,6 @@ index 000000000000..50b9a2665c80 + active_low = <&hdmi_backlight_hwhack_gpio>,"gpios:8"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/hifiberry-adc-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-adc-overlay.dts -new file mode 100644 -index 000000000000..2658f3242556 --- /dev/null +++ b/arch/arm/boot/dts/overlays/hifiberry-adc-overlay.dts @@ -0,0 +1,45 @@ @@ -21604,9 +21218,6 @@ index 000000000000..2658f3242556 + leds_off = <&hifiberry_adc>,"hifiberry-adc,leds_off?"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/hifiberry-adc8x-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-adc8x-overlay.dts -new file mode 100644 -index 000000000000..e0432115dc39 --- /dev/null +++ b/arch/arm/boot/dts/overlays/hifiberry-adc8x-overlay.dts @@ -0,0 +1,50 @@ @@ -21660,9 +21271,6 @@ index 000000000000..e0432115dc39 + }; + +}; -diff --git a/arch/arm/boot/dts/overlays/hifiberry-amp-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-amp-overlay.dts -new file mode 100644 -index 000000000000..667cd2601806 --- /dev/null +++ b/arch/arm/boot/dts/overlays/hifiberry-amp-overlay.dts @@ -0,0 +1,39 @@ @@ -21705,9 +21313,6 @@ index 000000000000..667cd2601806 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/hifiberry-amp100-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-amp100-overlay.dts -new file mode 100644 -index 000000000000..b38e6631a572 --- /dev/null +++ b/arch/arm/boot/dts/overlays/hifiberry-amp100-overlay.dts @@ -0,0 +1,67 @@ @@ -21778,9 +21383,6 @@ index 000000000000..b38e6631a572 + auto_mute = <&hifiberry_dacplus>,"hifiberry-dacplus,auto_mute?"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/hifiberry-amp3-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-amp3-overlay.dts -new file mode 100644 -index 000000000000..fc8f11b6294e --- /dev/null +++ b/arch/arm/boot/dts/overlays/hifiberry-amp3-overlay.dts @@ -0,0 +1,57 @@ @@ -21841,9 +21443,6 @@ index 000000000000..fc8f11b6294e + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/hifiberry-amp4pro-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-amp4pro-overlay.dts -new file mode 100644 -index 000000000000..6b211c2932dd --- /dev/null +++ b/arch/arm/boot/dts/overlays/hifiberry-amp4pro-overlay.dts @@ -0,0 +1,63 @@ @@ -21910,9 +21509,6 @@ index 000000000000..6b211c2932dd + <&hifiberry_dacplus>,"i2s-controller:0=",<&i2s_clk_producer>; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/hifiberry-dac-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dac-overlay.dts -new file mode 100644 -index 000000000000..efb0e18dbdc4 --- /dev/null +++ b/arch/arm/boot/dts/overlays/hifiberry-dac-overlay.dts @@ -0,0 +1,34 @@ @@ -21950,9 +21546,6 @@ index 000000000000..efb0e18dbdc4 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/hifiberry-dac8x-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dac8x-overlay.dts -new file mode 100644 -index 000000000000..1f4bcfc2328e --- /dev/null +++ b/arch/arm/boot/dts/overlays/hifiberry-dac8x-overlay.dts @@ -0,0 +1,56 @@ @@ -22012,9 +21605,6 @@ index 000000000000..1f4bcfc2328e + }; + +}; -diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts -new file mode 100644 -index 000000000000..0d0ab068112f --- /dev/null +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts @@ -0,0 +1,68 @@ @@ -22086,9 +21676,6 @@ index 000000000000..0d0ab068112f + leds_off = <&hifiberry_dacplus>,"hifiberry-dacplus,leds_off?"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplus-pro-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplus-pro-overlay.dts -new file mode 100644 -index 000000000000..28b1c2f2f1a8 --- /dev/null +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplus-pro-overlay.dts @@ -0,0 +1,64 @@ @@ -22156,9 +21743,6 @@ index 000000000000..28b1c2f2f1a8 + leds_off = <&hifiberry_dacplus>,"hifiberry-dacplus,leds_off?"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplus-std-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplus-std-overlay.dts -new file mode 100644 -index 000000000000..8872e3aa348d --- /dev/null +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplus-std-overlay.dts @@ -0,0 +1,65 @@ @@ -22227,9 +21811,6 @@ index 000000000000..8872e3aa348d + leds_off = <&hifiberry_dacplus>,"hifiberry-dacplus,leds_off?"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts -new file mode 100644 -index 000000000000..ea4c3572826f --- /dev/null +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts @@ -0,0 +1,72 @@ @@ -22305,9 +21886,6 @@ index 000000000000..ea4c3572826f + leds_off = <&hifiberry_dacplusadc>,"hifiberry-dacplusadc,leds_off?"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts -new file mode 100644 -index 000000000000..a4268bd72477 --- /dev/null +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts @@ -0,0 +1,72 @@ @@ -22383,9 +21961,6 @@ index 000000000000..a4268bd72477 + leds_off = <&hifiberry_dacplusadcpro>,"hifiberry-dacplusadcpro,leds_off?"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplusdsp-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplusdsp-overlay.dts -new file mode 100644 -index 000000000000..e916485f737e --- /dev/null +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplusdsp-overlay.dts @@ -0,0 +1,34 @@ @@ -22423,9 +21998,6 @@ index 000000000000..e916485f737e + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplushd-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplushd-overlay.dts -new file mode 100644 -index 000000000000..1856ac19793b --- /dev/null +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplushd-overlay.dts @@ -0,0 +1,94 @@ @@ -22523,9 +22095,6 @@ index 000000000000..1856ac19793b + }; + +}; -diff --git a/arch/arm/boot/dts/overlays/hifiberry-digi-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-digi-overlay.dts -new file mode 100644 -index 000000000000..eb68f117a92a --- /dev/null +++ b/arch/arm/boot/dts/overlays/hifiberry-digi-overlay.dts @@ -0,0 +1,41 @@ @@ -22570,9 +22139,6 @@ index 000000000000..eb68f117a92a + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/hifiberry-digi-pro-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-digi-pro-overlay.dts -new file mode 100644 -index 000000000000..18d16276e120 --- /dev/null +++ b/arch/arm/boot/dts/overlays/hifiberry-digi-pro-overlay.dts @@ -0,0 +1,43 @@ @@ -22619,9 +22185,6 @@ index 000000000000..18d16276e120 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/highperi-overlay.dts b/arch/arm/boot/dts/overlays/highperi-overlay.dts -new file mode 100644 -index 000000000000..46cb76c2d34f --- /dev/null +++ b/arch/arm/boot/dts/overlays/highperi-overlay.dts @@ -0,0 +1,63 @@ @@ -22688,9 +22251,6 @@ index 000000000000..46cb76c2d34f + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/hy28a-overlay.dts b/arch/arm/boot/dts/overlays/hy28a-overlay.dts -new file mode 100644 -index 000000000000..d0d52ebd9bd5 --- /dev/null +++ b/arch/arm/boot/dts/overlays/hy28a-overlay.dts @@ -0,0 +1,93 @@ @@ -22787,9 +22347,6 @@ index 000000000000..d0d52ebd9bd5 + <&hy28a_pins>, "brcm,pins:8"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/hy28b-2017-overlay.dts b/arch/arm/boot/dts/overlays/hy28b-2017-overlay.dts -new file mode 100644 -index 000000000000..9df33c5d95bb --- /dev/null +++ b/arch/arm/boot/dts/overlays/hy28b-2017-overlay.dts @@ -0,0 +1,152 @@ @@ -22945,9 +22502,6 @@ index 000000000000..9df33c5d95bb + <&hy28b_pins>, "brcm,pins:8"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/hy28b-overlay.dts b/arch/arm/boot/dts/overlays/hy28b-overlay.dts -new file mode 100644 -index 000000000000..421bde94a4a0 --- /dev/null +++ b/arch/arm/boot/dts/overlays/hy28b-overlay.dts @@ -0,0 +1,148 @@ @@ -23099,9 +22653,6 @@ index 000000000000..421bde94a4a0 + <&hy28b_pins>, "brcm,pins:8"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/i-sabre-q2m-overlay.dts b/arch/arm/boot/dts/overlays/i-sabre-q2m-overlay.dts -new file mode 100644 -index 000000000000..6db52955a8f8 --- /dev/null +++ b/arch/arm/boot/dts/overlays/i-sabre-q2m-overlay.dts @@ -0,0 +1,39 @@ @@ -23144,9 +22695,6 @@ index 000000000000..6db52955a8f8 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/i2c-bcm2708-overlay.dts b/arch/arm/boot/dts/overlays/i2c-bcm2708-overlay.dts -new file mode 100644 -index 000000000000..8204b6b3aef8 --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c-bcm2708-overlay.dts @@ -0,0 +1,13 @@ @@ -23163,9 +22711,6 @@ index 000000000000..8204b6b3aef8 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/i2c-buses.dtsi b/arch/arm/boot/dts/overlays/i2c-buses.dtsi -new file mode 100644 -index 000000000000..5c7699a8ac66 --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c-buses.dtsi @@ -0,0 +1,67 @@ @@ -23236,9 +22781,6 @@ index 000000000000..5c7699a8ac66 + <0>,"-101-102"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/i2c-fan-overlay.dts b/arch/arm/boot/dts/overlays/i2c-fan-overlay.dts -new file mode 100644 -index 000000000000..70e204cb81e6 --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c-fan-overlay.dts @@ -0,0 +1,77 @@ @@ -23319,9 +22861,6 @@ index 000000000000..70e204cb81e6 + <&map1>,"cooling-device:0=",<&emc2301>; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts b/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts -new file mode 100644 -index 000000000000..63231b5d7c0c --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts @@ -0,0 +1,47 @@ @@ -23372,9 +22911,6 @@ index 000000000000..63231b5d7c0c + bus = <&i2c_gpio>, "reg:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/i2c-mux-overlay.dts b/arch/arm/boot/dts/overlays/i2c-mux-overlay.dts -new file mode 100644 -index 000000000000..be79831ea8d2 --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c-mux-overlay.dts @@ -0,0 +1,149 @@ @@ -23527,9 +23063,6 @@ index 000000000000..be79831ea8d2 + <&pca9548>,"idle-state:0=", ; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/i2c-pwm-pca9685a-overlay.dts b/arch/arm/boot/dts/overlays/i2c-pwm-pca9685a-overlay.dts -new file mode 100644 -index 000000000000..4941e78a3d93 --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c-pwm-pca9685a-overlay.dts @@ -0,0 +1,28 @@ @@ -23561,9 +23094,6 @@ index 000000000000..4941e78a3d93 + addr = <&pca>,"reg:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/i2c-rtc-common.dtsi b/arch/arm/boot/dts/overlays/i2c-rtc-common.dtsi -new file mode 100644 -index 000000000000..70d286211359 --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c-rtc-common.dtsi @@ -0,0 +1,382 @@ @@ -23949,9 +23479,6 @@ index 000000000000..70d286211359 + <&pcf8563>,"wakeup-source?"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts b/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts -new file mode 100644 -index 000000000000..c83480c1c327 --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts @@ -0,0 +1,31 @@ @@ -23986,9 +23513,6 @@ index 000000000000..c83480c1c327 + i2c_gpio_delay_us = <&i2cbus>,"i2c-gpio,delay-us:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts b/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts -new file mode 100644 -index 000000000000..e003244d894c --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts @@ -0,0 +1,6 @@ @@ -23998,9 +23522,6 @@ index 000000000000..e003244d894c + +#include "i2c-rtc-common.dtsi" +#include "i2c-buses.dtsi" -diff --git a/arch/arm/boot/dts/overlays/i2c-sensor-common.dtsi b/arch/arm/boot/dts/overlays/i2c-sensor-common.dtsi -new file mode 100755 -index 000000000000..04802f6dca1e --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c-sensor-common.dtsi @@ -0,0 +1,1006 @@ @@ -25010,9 +24531,6 @@ index 000000000000..04802f6dca1e + gain = <&ina238>,"ti,shunt-gain:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts b/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts -new file mode 100755 -index 000000000000..29522e666908 --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts @@ -0,0 +1,6 @@ @@ -25022,9 +24540,6 @@ index 000000000000..29522e666908 + +#include "i2c-sensor-common.dtsi" +#include "i2c-buses.dtsi" -diff --git a/arch/arm/boot/dts/overlays/i2c0-overlay.dts b/arch/arm/boot/dts/overlays/i2c0-overlay.dts -new file mode 100644 -index 000000000000..46bf1bf2dc5c --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c0-overlay.dts @@ -0,0 +1,83 @@ @@ -25111,9 +24626,6 @@ index 000000000000..46bf1bf2dc5c + combine = <0>, "!5"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/i2c0-pi5-overlay.dts b/arch/arm/boot/dts/overlays/i2c0-pi5-overlay.dts -new file mode 100644 -index 000000000000..152794822552 --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c0-pi5-overlay.dts @@ -0,0 +1,34 @@ @@ -25151,9 +24663,6 @@ index 000000000000..152794822552 + baudrate = <&frag0>, "clock-frequency:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/i2c1-overlay.dts b/arch/arm/boot/dts/overlays/i2c1-overlay.dts -new file mode 100644 -index 000000000000..addaed73e665 --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c1-overlay.dts @@ -0,0 +1,44 @@ @@ -25201,9 +24710,6 @@ index 000000000000..addaed73e665 + combine = <0>, "!3"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/i2c1-pi5-overlay.dts b/arch/arm/boot/dts/overlays/i2c1-pi5-overlay.dts -new file mode 100644 -index 000000000000..719966ceb59a --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c1-pi5-overlay.dts @@ -0,0 +1,34 @@ @@ -25241,9 +24747,6 @@ index 000000000000..719966ceb59a + baudrate = <&frag0>, "clock-frequency:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/i2c2-pi5-overlay.dts b/arch/arm/boot/dts/overlays/i2c2-pi5-overlay.dts -new file mode 100644 -index 000000000000..324d344052b8 --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c2-pi5-overlay.dts @@ -0,0 +1,21 @@ @@ -25268,9 +24771,6 @@ index 000000000000..324d344052b8 + baudrate = <&frag0>, "clock-frequency:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/i2c3-overlay.dts b/arch/arm/boot/dts/overlays/i2c3-overlay.dts -new file mode 100644 -index 000000000000..663d4f060ee8 --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c3-overlay.dts @@ -0,0 +1,34 @@ @@ -25308,9 +24808,6 @@ index 000000000000..663d4f060ee8 + baudrate = <&frag0>, "clock-frequency:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/i2c3-pi5-overlay.dts b/arch/arm/boot/dts/overlays/i2c3-pi5-overlay.dts -new file mode 100644 -index 000000000000..cbd1f9ff650d --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c3-pi5-overlay.dts @@ -0,0 +1,22 @@ @@ -25336,9 +24833,6 @@ index 000000000000..cbd1f9ff650d + baudrate = <&frag0>, "clock-frequency:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/i2c4-overlay.dts b/arch/arm/boot/dts/overlays/i2c4-overlay.dts -new file mode 100644 -index 000000000000..495de00f7aa1 --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c4-overlay.dts @@ -0,0 +1,34 @@ @@ -25376,9 +24870,6 @@ index 000000000000..495de00f7aa1 + baudrate = <&frag0>, "clock-frequency:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/i2c5-overlay.dts b/arch/arm/boot/dts/overlays/i2c5-overlay.dts -new file mode 100644 -index 000000000000..d498ebc72de6 --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c5-overlay.dts @@ -0,0 +1,34 @@ @@ -25416,9 +24907,6 @@ index 000000000000..d498ebc72de6 + baudrate = <&frag0>, "clock-frequency:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/i2c6-overlay.dts b/arch/arm/boot/dts/overlays/i2c6-overlay.dts -new file mode 100644 -index 000000000000..4d26178a73ca --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c6-overlay.dts @@ -0,0 +1,34 @@ @@ -25456,9 +24944,6 @@ index 000000000000..4d26178a73ca + baudrate = <&frag0>, "clock-frequency:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/i2s-dac-overlay.dts b/arch/arm/boot/dts/overlays/i2s-dac-overlay.dts -new file mode 100644 -index 000000000000..1d8874a18860 --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2s-dac-overlay.dts @@ -0,0 +1,34 @@ @@ -25496,9 +24981,6 @@ index 000000000000..1d8874a18860 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/i2s-gpio28-31-overlay.dts b/arch/arm/boot/dts/overlays/i2s-gpio28-31-overlay.dts -new file mode 100644 -index 000000000000..cf43094c6ff4 --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2s-gpio28-31-overlay.dts @@ -0,0 +1,18 @@ @@ -25520,9 +25002,6 @@ index 000000000000..cf43094c6ff4 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/i2s-master-dac-overlay.dts b/arch/arm/boot/dts/overlays/i2s-master-dac-overlay.dts -new file mode 100644 -index 000000000000..8b46067858d7 --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2s-master-dac-overlay.dts @@ -0,0 +1,50 @@ @@ -25576,9 +25055,6 @@ index 000000000000..8b46067858d7 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/ilitek251x-overlay.dts b/arch/arm/boot/dts/overlays/ilitek251x-overlay.dts -new file mode 100644 -index 000000000000..226d490ce092 --- /dev/null +++ b/arch/arm/boot/dts/overlays/ilitek251x-overlay.dts @@ -0,0 +1,47 @@ @@ -25629,9 +25105,6 @@ index 000000000000..226d490ce092 + <&frag1>, "target-path"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/imx219-overlay.dts b/arch/arm/boot/dts/overlays/imx219-overlay.dts -new file mode 100644 -index 000000000000..c855b14ff220 --- /dev/null +++ b/arch/arm/boot/dts/overlays/imx219-overlay.dts @@ -0,0 +1,112 @@ @@ -25747,9 +25220,6 @@ index 000000000000..c855b14ff220 +&cam_endpoint { + remote-endpoint = <&csi_ep>; +}; -diff --git a/arch/arm/boot/dts/overlays/imx219.dtsi b/arch/arm/boot/dts/overlays/imx219.dtsi -new file mode 100644 -index 000000000000..fa870f77ef07 --- /dev/null +++ b/arch/arm/boot/dts/overlays/imx219.dtsi @@ -0,0 +1,27 @@ @@ -25780,9 +25250,6 @@ index 000000000000..fa870f77ef07 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/imx258-overlay.dts b/arch/arm/boot/dts/overlays/imx258-overlay.dts -new file mode 100644 -index 000000000000..bf06d681d5dc --- /dev/null +++ b/arch/arm/boot/dts/overlays/imx258-overlay.dts @@ -0,0 +1,137 @@ @@ -25923,9 +25390,6 @@ index 000000000000..bf06d681d5dc +&cam_endpoint { + remote-endpoint = <&csi_ep>; +}; -diff --git a/arch/arm/boot/dts/overlays/imx258.dtsi b/arch/arm/boot/dts/overlays/imx258.dtsi -new file mode 100644 -index 000000000000..cca81e1aa8b3 --- /dev/null +++ b/arch/arm/boot/dts/overlays/imx258.dtsi @@ -0,0 +1,27 @@ @@ -25956,9 +25420,6 @@ index 000000000000..cca81e1aa8b3 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/imx283-overlay.dts b/arch/arm/boot/dts/overlays/imx283-overlay.dts -new file mode 100644 -index 000000000000..8445cf8f2856 --- /dev/null +++ b/arch/arm/boot/dts/overlays/imx283-overlay.dts @@ -0,0 +1,92 @@ @@ -26054,9 +25515,6 @@ index 000000000000..8445cf8f2856 +&cam_endpoint { + remote-endpoint = <&csi_ep>; +}; -diff --git a/arch/arm/boot/dts/overlays/imx283.dtsi b/arch/arm/boot/dts/overlays/imx283.dtsi -new file mode 100644 -index 000000000000..07ba72379f36 --- /dev/null +++ b/arch/arm/boot/dts/overlays/imx283.dtsi @@ -0,0 +1,26 @@ @@ -26086,9 +25544,6 @@ index 000000000000..07ba72379f36 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/imx290-overlay.dts b/arch/arm/boot/dts/overlays/imx290-overlay.dts -new file mode 100644 -index 000000000000..3de3c3910d90 --- /dev/null +++ b/arch/arm/boot/dts/overlays/imx290-overlay.dts @@ -0,0 +1,32 @@ @@ -26124,9 +25579,6 @@ index 000000000000..3de3c3910d90 + mono = <0>, "-101+102"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi b/arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi -new file mode 100644 -index 000000000000..55f047e315bc --- /dev/null +++ b/arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi @@ -0,0 +1,116 @@ @@ -26246,9 +25698,6 @@ index 000000000000..55f047e315bc +&cam_endpoint { + remote-endpoint = <&csi_ep>; +}; -diff --git a/arch/arm/boot/dts/overlays/imx290_327.dtsi b/arch/arm/boot/dts/overlays/imx290_327.dtsi -new file mode 100644 -index 000000000000..14d1f0b95bb3 --- /dev/null +++ b/arch/arm/boot/dts/overlays/imx290_327.dtsi @@ -0,0 +1,24 @@ @@ -26276,9 +25725,6 @@ index 000000000000..14d1f0b95bb3 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/imx296-overlay.dts b/arch/arm/boot/dts/overlays/imx296-overlay.dts -new file mode 100644 -index 000000000000..b40abb237f6f --- /dev/null +++ b/arch/arm/boot/dts/overlays/imx296-overlay.dts @@ -0,0 +1,121 @@ @@ -26403,9 +25849,6 @@ index 000000000000..b40abb237f6f + sync-sink = <&imx296>,"trigger-mode:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/imx327-overlay.dts b/arch/arm/boot/dts/overlays/imx327-overlay.dts -new file mode 100644 -index 000000000000..0776954bdba2 --- /dev/null +++ b/arch/arm/boot/dts/overlays/imx327-overlay.dts @@ -0,0 +1,33 @@ @@ -26442,9 +25885,6 @@ index 000000000000..0776954bdba2 + mono = <0>, "-101+102"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/imx335-overlay.dts b/arch/arm/boot/dts/overlays/imx335-overlay.dts -new file mode 100644 -index 000000000000..dfe207faecbe --- /dev/null +++ b/arch/arm/boot/dts/overlays/imx335-overlay.dts @@ -0,0 +1,112 @@ @@ -26560,9 +26000,6 @@ index 000000000000..dfe207faecbe +&cam_endpoint { + remote-endpoint = <&csi_ep>; +}; -diff --git a/arch/arm/boot/dts/overlays/imx335.dtsi b/arch/arm/boot/dts/overlays/imx335.dtsi -new file mode 100644 -index 000000000000..1d4b07da3b14 --- /dev/null +++ b/arch/arm/boot/dts/overlays/imx335.dtsi @@ -0,0 +1,26 @@ @@ -26592,9 +26029,6 @@ index 000000000000..1d4b07da3b14 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/imx378-overlay.dts b/arch/arm/boot/dts/overlays/imx378-overlay.dts -new file mode 100644 -index 000000000000..4a5072489a34 --- /dev/null +++ b/arch/arm/boot/dts/overlays/imx378-overlay.dts @@ -0,0 +1,17 @@ @@ -26615,9 +26049,6 @@ index 000000000000..4a5072489a34 + sync-source = <&cam_node>,"trigger-mode:0=1"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/imx415-overlay.dts b/arch/arm/boot/dts/overlays/imx415-overlay.dts -new file mode 100644 -index 000000000000..e44c032dfcec --- /dev/null +++ b/arch/arm/boot/dts/overlays/imx415-overlay.dts @@ -0,0 +1,118 @@ @@ -26739,9 +26170,6 @@ index 000000000000..e44c032dfcec +&cam_endpoint { + remote-endpoint = <&csi_ep>; +}; -diff --git a/arch/arm/boot/dts/overlays/imx415.dtsi b/arch/arm/boot/dts/overlays/imx415.dtsi -new file mode 100644 -index 000000000000..ba18550ddec7 --- /dev/null +++ b/arch/arm/boot/dts/overlays/imx415.dtsi @@ -0,0 +1,27 @@ @@ -26772,9 +26200,6 @@ index 000000000000..ba18550ddec7 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/imx462-overlay.dts b/arch/arm/boot/dts/overlays/imx462-overlay.dts -new file mode 100644 -index 000000000000..6e4c5aaddff5 --- /dev/null +++ b/arch/arm/boot/dts/overlays/imx462-overlay.dts @@ -0,0 +1,35 @@ @@ -26813,9 +26238,6 @@ index 000000000000..6e4c5aaddff5 + mono = <0>, "-101+102"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/imx477-overlay.dts b/arch/arm/boot/dts/overlays/imx477-overlay.dts -new file mode 100644 -index 000000000000..8645162682f4 --- /dev/null +++ b/arch/arm/boot/dts/overlays/imx477-overlay.dts @@ -0,0 +1,17 @@ @@ -26836,9 +26258,6 @@ index 000000000000..8645162682f4 + sync-source = <&cam_node>,"trigger-mode:0=1"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/imx477_378-overlay.dtsi b/arch/arm/boot/dts/overlays/imx477_378-overlay.dtsi -new file mode 100644 -index 000000000000..686289f55029 --- /dev/null +++ b/arch/arm/boot/dts/overlays/imx477_378-overlay.dtsi @@ -0,0 +1,99 @@ @@ -26941,9 +26360,6 @@ index 000000000000..686289f55029 +&cam_endpoint { + remote-endpoint = <&csi_ep>; +}; -diff --git a/arch/arm/boot/dts/overlays/imx477_378.dtsi b/arch/arm/boot/dts/overlays/imx477_378.dtsi -new file mode 100644 -index 000000000000..a0c154c2a11f --- /dev/null +++ b/arch/arm/boot/dts/overlays/imx477_378.dtsi @@ -0,0 +1,24 @@ @@ -26971,9 +26387,6 @@ index 000000000000..a0c154c2a11f + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/imx500-overlay.dts b/arch/arm/boot/dts/overlays/imx500-overlay.dts -new file mode 100644 -index 000000000000..3ed8c8cd660c --- /dev/null +++ b/arch/arm/boot/dts/overlays/imx500-overlay.dts @@ -0,0 +1,122 @@ @@ -27099,9 +26512,6 @@ index 000000000000..3ed8c8cd660c +&cam_endpoint { + remote-endpoint = <&csi_ep>; +}; -diff --git a/arch/arm/boot/dts/overlays/imx500-pi5-overlay.dts b/arch/arm/boot/dts/overlays/imx500-pi5-overlay.dts -new file mode 100644 -index 000000000000..a512d4b76ede --- /dev/null +++ b/arch/arm/boot/dts/overlays/imx500-pi5-overlay.dts @@ -0,0 +1,127 @@ @@ -27232,9 +26642,6 @@ index 000000000000..a512d4b76ede +&cam_endpoint { + remote-endpoint = <&csi_ep>; +}; -diff --git a/arch/arm/boot/dts/overlays/imx500.dtsi b/arch/arm/boot/dts/overlays/imx500.dtsi -new file mode 100644 -index 000000000000..a931aa9941e6 --- /dev/null +++ b/arch/arm/boot/dts/overlays/imx500.dtsi @@ -0,0 +1,28 @@ @@ -27266,9 +26673,6 @@ index 000000000000..a931aa9941e6 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/imx519-overlay.dts b/arch/arm/boot/dts/overlays/imx519-overlay.dts -new file mode 100644 -index 000000000000..f1bcd782b99f --- /dev/null +++ b/arch/arm/boot/dts/overlays/imx519-overlay.dts @@ -0,0 +1,99 @@ @@ -27371,9 +26775,6 @@ index 000000000000..f1bcd782b99f +&vcm_node { + status = "okay"; +}; -diff --git a/arch/arm/boot/dts/overlays/imx519.dtsi b/arch/arm/boot/dts/overlays/imx519.dtsi -new file mode 100644 -index 000000000000..18cba1781ec4 --- /dev/null +++ b/arch/arm/boot/dts/overlays/imx519.dtsi @@ -0,0 +1,34 @@ @@ -27411,9 +26812,6 @@ index 000000000000..18cba1781ec4 + status = "disabled"; + vdd-supply = <&cam1_reg>; +}; -diff --git a/arch/arm/boot/dts/overlays/imx708-overlay.dts b/arch/arm/boot/dts/overlays/imx708-overlay.dts -new file mode 100644 -index 000000000000..3cbec474ce3e --- /dev/null +++ b/arch/arm/boot/dts/overlays/imx708-overlay.dts @@ -0,0 +1,111 @@ @@ -27528,9 +26926,6 @@ index 000000000000..3cbec474ce3e +&vcm_node { + status = "okay"; +}; -diff --git a/arch/arm/boot/dts/overlays/imx708.dtsi b/arch/arm/boot/dts/overlays/imx708.dtsi -new file mode 100644 -index 000000000000..1558458d58ec --- /dev/null +++ b/arch/arm/boot/dts/overlays/imx708.dtsi @@ -0,0 +1,35 @@ @@ -27569,9 +26964,6 @@ index 000000000000..1558458d58ec + status = "disabled"; + VDD-supply = <&cam1_reg>; +}; -diff --git a/arch/arm/boot/dts/overlays/interludeaudio-analog-overlay.dts b/arch/arm/boot/dts/overlays/interludeaudio-analog-overlay.dts -new file mode 100644 -index 000000000000..e2590135f919 --- /dev/null +++ b/arch/arm/boot/dts/overlays/interludeaudio-analog-overlay.dts @@ -0,0 +1,73 @@ @@ -27648,9 +27040,6 @@ index 000000000000..e2590135f919 + gpiopin = <&cs4271>,"reset-gpio:4"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/interludeaudio-digital-overlay.dts b/arch/arm/boot/dts/overlays/interludeaudio-digital-overlay.dts -new file mode 100644 -index 000000000000..24be00860310 --- /dev/null +++ b/arch/arm/boot/dts/overlays/interludeaudio-digital-overlay.dts @@ -0,0 +1,49 @@ @@ -27703,9 +27092,6 @@ index 000000000000..24be00860310 + }; + +}; -diff --git a/arch/arm/boot/dts/overlays/iqaudio-codec-overlay.dts b/arch/arm/boot/dts/overlays/iqaudio-codec-overlay.dts -new file mode 100644 -index 000000000000..bffff5a4d64c --- /dev/null +++ b/arch/arm/boot/dts/overlays/iqaudio-codec-overlay.dts @@ -0,0 +1,42 @@ @@ -27751,9 +27137,6 @@ index 000000000000..bffff5a4d64c + __overrides__ { + }; +}; -diff --git a/arch/arm/boot/dts/overlays/iqaudio-dac-overlay.dts b/arch/arm/boot/dts/overlays/iqaudio-dac-overlay.dts -new file mode 100644 -index 000000000000..05d348f5e58a --- /dev/null +++ b/arch/arm/boot/dts/overlays/iqaudio-dac-overlay.dts @@ -0,0 +1,46 @@ @@ -27803,9 +27186,6 @@ index 000000000000..05d348f5e58a + 24db_digital_gain = <&frag2>,"iqaudio,24db_digital_gain?"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/iqaudio-dacplus-overlay.dts b/arch/arm/boot/dts/overlays/iqaudio-dacplus-overlay.dts -new file mode 100644 -index 000000000000..3993580f7ac1 --- /dev/null +++ b/arch/arm/boot/dts/overlays/iqaudio-dacplus-overlay.dts @@ -0,0 +1,49 @@ @@ -27858,9 +27238,6 @@ index 000000000000..3993580f7ac1 + unmute_amp = <&iqaudio_dac>,"iqaudio-dac,unmute-amp?"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/iqaudio-digi-wm8804-audio-overlay.dts b/arch/arm/boot/dts/overlays/iqaudio-digi-wm8804-audio-overlay.dts -new file mode 100644 -index 000000000000..f24faf11ecfa --- /dev/null +++ b/arch/arm/boot/dts/overlays/iqaudio-digi-wm8804-audio-overlay.dts @@ -0,0 +1,47 @@ @@ -27911,9 +27288,6 @@ index 000000000000..f24faf11ecfa + dai_stream_name = <&wm8804_digi>,"wm8804-digi,dai-stream-name"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/iqs550-overlay.dts b/arch/arm/boot/dts/overlays/iqs550-overlay.dts -new file mode 100644 -index 000000000000..c3956937055f --- /dev/null +++ b/arch/arm/boot/dts/overlays/iqs550-overlay.dts @@ -0,0 +1,59 @@ @@ -27976,9 +27350,6 @@ index 000000000000..c3956937055f + swapxy = <&iqs550>,"touchscreen-swapped-x-y?"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/irs1125-overlay.dts b/arch/arm/boot/dts/overlays/irs1125-overlay.dts -new file mode 100644 -index 000000000000..07996247a7be --- /dev/null +++ b/arch/arm/boot/dts/overlays/irs1125-overlay.dts @@ -0,0 +1,97 @@ @@ -28079,9 +27450,6 @@ index 000000000000..07996247a7be + <&irs1125>, "clocks:0=",<&cam0_clk>; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/jedec-spi-nor-overlay.dts b/arch/arm/boot/dts/overlays/jedec-spi-nor-overlay.dts -new file mode 100644 -index 000000000000..fb6d4bc91bf3 --- /dev/null +++ b/arch/arm/boot/dts/overlays/jedec-spi-nor-overlay.dts @@ -0,0 +1,136 @@ @@ -28221,9 +27589,6 @@ index 000000000000..fb6d4bc91bf3 + }; +}; + -diff --git a/arch/arm/boot/dts/overlays/justboom-both-overlay.dts b/arch/arm/boot/dts/overlays/justboom-both-overlay.dts -new file mode 100644 -index 000000000000..9185d668d1d5 --- /dev/null +++ b/arch/arm/boot/dts/overlays/justboom-both-overlay.dts @@ -0,0 +1,65 @@ @@ -28292,9 +27657,6 @@ index 000000000000..9185d668d1d5 + 24db_digital_gain = <&frag3>,"justboom,24db_digital_gain?"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/justboom-dac-overlay.dts b/arch/arm/boot/dts/overlays/justboom-dac-overlay.dts -new file mode 100644 -index 000000000000..901a6aaba4bc --- /dev/null +++ b/arch/arm/boot/dts/overlays/justboom-dac-overlay.dts @@ -0,0 +1,46 @@ @@ -28344,9 +27706,6 @@ index 000000000000..901a6aaba4bc + 24db_digital_gain = <&frag2>,"justboom,24db_digital_gain?"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/justboom-digi-overlay.dts b/arch/arm/boot/dts/overlays/justboom-digi-overlay.dts -new file mode 100644 -index 000000000000..c4c968200a4c --- /dev/null +++ b/arch/arm/boot/dts/overlays/justboom-digi-overlay.dts @@ -0,0 +1,41 @@ @@ -28391,9 +27750,6 @@ index 000000000000..c4c968200a4c + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/ltc294x-overlay.dts b/arch/arm/boot/dts/overlays/ltc294x-overlay.dts -new file mode 100644 -index 000000000000..6d971f3649ca --- /dev/null +++ b/arch/arm/boot/dts/overlays/ltc294x-overlay.dts @@ -0,0 +1,86 @@ @@ -28483,9 +27839,6 @@ index 000000000000..6d971f3649ca + <<c2944>, "lltc,prescaler-exponent:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/max98357a-overlay.dts b/arch/arm/boot/dts/overlays/max98357a-overlay.dts -new file mode 100644 -index 000000000000..263d071fe977 --- /dev/null +++ b/arch/arm/boot/dts/overlays/max98357a-overlay.dts @@ -0,0 +1,84 @@ @@ -28573,9 +27926,6 @@ index 000000000000..263d071fe977 + sdmode-pin = <&max98357a_dac>,"sdmode-gpios:4"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/maxtherm-overlay.dts b/arch/arm/boot/dts/overlays/maxtherm-overlay.dts -new file mode 100644 -index 000000000000..9964e246c14f --- /dev/null +++ b/arch/arm/boot/dts/overlays/maxtherm-overlay.dts @@ -0,0 +1,186 @@ @@ -28765,9 +28115,6 @@ index 000000000000..9964e246c14f + type_t = <&max>,"thermocouple-type:0=",; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/mbed-dac-overlay.dts b/arch/arm/boot/dts/overlays/mbed-dac-overlay.dts -new file mode 100644 -index 000000000000..e3f56608c643 --- /dev/null +++ b/arch/arm/boot/dts/overlays/mbed-dac-overlay.dts @@ -0,0 +1,64 @@ @@ -28835,9 +28182,6 @@ index 000000000000..e3f56608c643 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/mcp23017-overlay.dts b/arch/arm/boot/dts/overlays/mcp23017-overlay.dts -new file mode 100644 -index 000000000000..e23780b985a3 --- /dev/null +++ b/arch/arm/boot/dts/overlays/mcp23017-overlay.dts @@ -0,0 +1,65 @@ @@ -28906,9 +28250,6 @@ index 000000000000..e23780b985a3 + noints = <0>,"!1!3"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/mcp23s17-overlay.dts b/arch/arm/boot/dts/overlays/mcp23s17-overlay.dts -new file mode 100644 -index 000000000000..d10e3ef5d446 --- /dev/null +++ b/arch/arm/boot/dts/overlays/mcp23s17-overlay.dts @@ -0,0 +1,764 @@ @@ -29676,9 +29017,6 @@ index 000000000000..d10e3ef5d446 + }; +}; + -diff --git a/arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts b/arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts -new file mode 100755 -index 000000000000..46f143d809cc --- /dev/null +++ b/arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts @@ -0,0 +1,73 @@ @@ -29755,9 +29093,6 @@ index 000000000000..46f143d809cc + interrupt = <&can0_pins>,"brcm,pins:0",<&can0>,"interrupts:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/mcp2515-can1-overlay.dts b/arch/arm/boot/dts/overlays/mcp2515-can1-overlay.dts -new file mode 100644 -index 000000000000..0a8dd576818e --- /dev/null +++ b/arch/arm/boot/dts/overlays/mcp2515-can1-overlay.dts @@ -0,0 +1,73 @@ @@ -29834,9 +29169,6 @@ index 000000000000..0a8dd576818e + interrupt = <&can1_pins>,"brcm,pins:0",<&can1>,"interrupts:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/mcp2515-overlay.dts b/arch/arm/boot/dts/overlays/mcp2515-overlay.dts -new file mode 100644 -index 000000000000..cda1fb0b1199 --- /dev/null +++ b/arch/arm/boot/dts/overlays/mcp2515-overlay.dts @@ -0,0 +1,156 @@ @@ -29996,9 +29328,6 @@ index 000000000000..cda1fb0b1199 + <&mcp2515>, "interrupts:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/mcp251xfd-overlay.dts b/arch/arm/boot/dts/overlays/mcp251xfd-overlay.dts -new file mode 100644 -index 000000000000..65c861bbd340 --- /dev/null +++ b/arch/arm/boot/dts/overlays/mcp251xfd-overlay.dts @@ -0,0 +1,226 @@ @@ -30228,9 +29557,6 @@ index 000000000000..65c861bbd340 + xceiver_active_high = <®_mcp251xfd_xceiver>, "enable-active-high?"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/mcp3008-overlay.dts b/arch/arm/boot/dts/overlays/mcp3008-overlay.dts -new file mode 100755 -index 000000000000..957fdb9310af --- /dev/null +++ b/arch/arm/boot/dts/overlays/mcp3008-overlay.dts @@ -0,0 +1,205 @@ @@ -30439,9 +29765,6 @@ index 000000000000..957fdb9310af + spi2-2-speed = <&mcp3008_22>, "spi-max-frequency:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/mcp3202-overlay.dts b/arch/arm/boot/dts/overlays/mcp3202-overlay.dts -new file mode 100755 -index 000000000000..8e4e9f60f285 --- /dev/null +++ b/arch/arm/boot/dts/overlays/mcp3202-overlay.dts @@ -0,0 +1,205 @@ @@ -30650,9 +29973,6 @@ index 000000000000..8e4e9f60f285 + spi2-2-speed = <&mcp3202_22>, "spi-max-frequency:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/mcp342x-overlay.dts b/arch/arm/boot/dts/overlays/mcp342x-overlay.dts -new file mode 100644 -index 000000000000..714eca5a4b5e --- /dev/null +++ b/arch/arm/boot/dts/overlays/mcp342x-overlay.dts @@ -0,0 +1,164 @@ @@ -30820,9 +30140,6 @@ index 000000000000..714eca5a4b5e + }; +}; + -diff --git a/arch/arm/boot/dts/overlays/media-center-overlay.dts b/arch/arm/boot/dts/overlays/media-center-overlay.dts -new file mode 100644 -index 000000000000..4bc2eaa1f215 --- /dev/null +++ b/arch/arm/boot/dts/overlays/media-center-overlay.dts @@ -0,0 +1,86 @@ @@ -30912,9 +30229,6 @@ index 000000000000..4bc2eaa1f215 + <&rpi_display_pins>,"brcm,pins:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/merus-amp-overlay.dts b/arch/arm/boot/dts/overlays/merus-amp-overlay.dts -new file mode 100644 -index 000000000000..96159a48d33f --- /dev/null +++ b/arch/arm/boot/dts/overlays/merus-amp-overlay.dts @@ -0,0 +1,59 @@ @@ -30977,9 +30291,6 @@ index 000000000000..96159a48d33f + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/midi-uart0-overlay.dts b/arch/arm/boot/dts/overlays/midi-uart0-overlay.dts -new file mode 100644 -index 000000000000..f7e44d29e101 --- /dev/null +++ b/arch/arm/boot/dts/overlays/midi-uart0-overlay.dts @@ -0,0 +1,36 @@ @@ -31019,9 +30330,6 @@ index 000000000000..f7e44d29e101 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/midi-uart0-pi5-overlay.dts b/arch/arm/boot/dts/overlays/midi-uart0-pi5-overlay.dts -new file mode 100644 -index 000000000000..4efa46853bbb --- /dev/null +++ b/arch/arm/boot/dts/overlays/midi-uart0-pi5-overlay.dts @@ -0,0 +1,37 @@ @@ -31062,9 +30370,6 @@ index 000000000000..4efa46853bbb + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/midi-uart1-overlay.dts b/arch/arm/boot/dts/overlays/midi-uart1-overlay.dts -new file mode 100644 -index 000000000000..e0bc410acbff --- /dev/null +++ b/arch/arm/boot/dts/overlays/midi-uart1-overlay.dts @@ -0,0 +1,43 @@ @@ -31111,9 +30416,6 @@ index 000000000000..e0bc410acbff + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/midi-uart1-pi5-overlay.dts b/arch/arm/boot/dts/overlays/midi-uart1-pi5-overlay.dts -new file mode 100644 -index 000000000000..40948fdb82d6 --- /dev/null +++ b/arch/arm/boot/dts/overlays/midi-uart1-pi5-overlay.dts @@ -0,0 +1,37 @@ @@ -31154,9 +30456,6 @@ index 000000000000..40948fdb82d6 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/midi-uart2-overlay.dts b/arch/arm/boot/dts/overlays/midi-uart2-overlay.dts -new file mode 100644 -index 000000000000..5c6985f41ea2 --- /dev/null +++ b/arch/arm/boot/dts/overlays/midi-uart2-overlay.dts @@ -0,0 +1,37 @@ @@ -31197,9 +30496,6 @@ index 000000000000..5c6985f41ea2 + }; +}; + -diff --git a/arch/arm/boot/dts/overlays/midi-uart2-pi5-overlay.dts b/arch/arm/boot/dts/overlays/midi-uart2-pi5-overlay.dts -new file mode 100644 -index 000000000000..ef80ce214015 --- /dev/null +++ b/arch/arm/boot/dts/overlays/midi-uart2-pi5-overlay.dts @@ -0,0 +1,37 @@ @@ -31240,9 +30536,6 @@ index 000000000000..ef80ce214015 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/midi-uart3-overlay.dts b/arch/arm/boot/dts/overlays/midi-uart3-overlay.dts -new file mode 100644 -index 000000000000..052027db0564 --- /dev/null +++ b/arch/arm/boot/dts/overlays/midi-uart3-overlay.dts @@ -0,0 +1,38 @@ @@ -31284,9 +30577,6 @@ index 000000000000..052027db0564 +}; + + -diff --git a/arch/arm/boot/dts/overlays/midi-uart3-pi5-overlay.dts b/arch/arm/boot/dts/overlays/midi-uart3-pi5-overlay.dts -new file mode 100644 -index 000000000000..ac59efe68bf9 --- /dev/null +++ b/arch/arm/boot/dts/overlays/midi-uart3-pi5-overlay.dts @@ -0,0 +1,37 @@ @@ -31327,9 +30617,6 @@ index 000000000000..ac59efe68bf9 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/midi-uart4-overlay.dts b/arch/arm/boot/dts/overlays/midi-uart4-overlay.dts -new file mode 100644 -index 000000000000..5f09a7ccd675 --- /dev/null +++ b/arch/arm/boot/dts/overlays/midi-uart4-overlay.dts @@ -0,0 +1,38 @@ @@ -31371,9 +30658,6 @@ index 000000000000..5f09a7ccd675 +}; + + -diff --git a/arch/arm/boot/dts/overlays/midi-uart4-pi5-overlay.dts b/arch/arm/boot/dts/overlays/midi-uart4-pi5-overlay.dts -new file mode 100644 -index 000000000000..959e114d0f43 --- /dev/null +++ b/arch/arm/boot/dts/overlays/midi-uart4-pi5-overlay.dts @@ -0,0 +1,37 @@ @@ -31414,9 +30698,6 @@ index 000000000000..959e114d0f43 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/midi-uart5-overlay.dts b/arch/arm/boot/dts/overlays/midi-uart5-overlay.dts -new file mode 100644 -index 000000000000..74551ec2a672 --- /dev/null +++ b/arch/arm/boot/dts/overlays/midi-uart5-overlay.dts @@ -0,0 +1,38 @@ @@ -31458,9 +30739,6 @@ index 000000000000..74551ec2a672 +}; + + -diff --git a/arch/arm/boot/dts/overlays/minipitft13-overlay.dts b/arch/arm/boot/dts/overlays/minipitft13-overlay.dts -new file mode 100644 -index 000000000000..5e0941e8ba54 --- /dev/null +++ b/arch/arm/boot/dts/overlays/minipitft13-overlay.dts @@ -0,0 +1,70 @@ @@ -31534,9 +30812,6 @@ index 000000000000..5e0941e8ba54 + debug = <&pitft>,"debug:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts b/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts -new file mode 100644 -index 000000000000..757e5cd3c4e8 --- /dev/null +++ b/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts @@ -0,0 +1,83 @@ @@ -31623,9 +30898,6 @@ index 000000000000..757e5cd3c4e8 + krnbt = <&minibt_frag>,"status"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/mipi-dbi-spi-overlay.dts b/arch/arm/boot/dts/overlays/mipi-dbi-spi-overlay.dts -new file mode 100644 -index 000000000000..63fb3a5f2388 --- /dev/null +++ b/arch/arm/boot/dts/overlays/mipi-dbi-spi-overlay.dts @@ -0,0 +1,175 @@ @@ -31804,9 +31076,6 @@ index 000000000000..63fb3a5f2388 + backlight-def-brightness = <&backlight_pwm>, "default-brightness-level:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/mira220-overlay.dts b/arch/arm/boot/dts/overlays/mira220-overlay.dts -new file mode 100644 -index 000000000000..c969e55f4ba9 --- /dev/null +++ b/arch/arm/boot/dts/overlays/mira220-overlay.dts @@ -0,0 +1,87 @@ @@ -31897,9 +31166,6 @@ index 000000000000..c969e55f4ba9 +&cam_endpoint { + remote-endpoint = <&csi_ep>; +}; -diff --git a/arch/arm/boot/dts/overlays/mira220.dtsi b/arch/arm/boot/dts/overlays/mira220.dtsi -new file mode 100644 -index 000000000000..4e171657a3a6 --- /dev/null +++ b/arch/arm/boot/dts/overlays/mira220.dtsi @@ -0,0 +1,27 @@ @@ -31930,9 +31196,6 @@ index 000000000000..4e171657a3a6 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/mlx90640-overlay.dts b/arch/arm/boot/dts/overlays/mlx90640-overlay.dts -new file mode 100644 -index 000000000000..a2655ed82585 --- /dev/null +++ b/arch/arm/boot/dts/overlays/mlx90640-overlay.dts @@ -0,0 +1,22 @@ @@ -31958,9 +31221,6 @@ index 000000000000..a2655ed82585 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/mmc-overlay.dts b/arch/arm/boot/dts/overlays/mmc-overlay.dts -new file mode 100644 -index 000000000000..c1a2f691aa1e --- /dev/null +++ b/arch/arm/boot/dts/overlays/mmc-overlay.dts @@ -0,0 +1,46 @@ @@ -32010,9 +31270,6 @@ index 000000000000..c1a2f691aa1e + overclock_50 = <&frag0>,"brcm,overclock-50:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/mz61581-overlay.dts b/arch/arm/boot/dts/overlays/mz61581-overlay.dts -new file mode 100644 -index 000000000000..101ad21d8093 --- /dev/null +++ b/arch/arm/boot/dts/overlays/mz61581-overlay.dts @@ -0,0 +1,117 @@ @@ -32133,9 +31390,6 @@ index 000000000000..101ad21d8093 + xohms = <&mz61581_ts>,"ti,x-plate-ohms;0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/ov2311-overlay.dts b/arch/arm/boot/dts/overlays/ov2311-overlay.dts -new file mode 100644 -index 000000000000..4dad303c1768 --- /dev/null +++ b/arch/arm/boot/dts/overlays/ov2311-overlay.dts @@ -0,0 +1,83 @@ @@ -32222,9 +31476,6 @@ index 000000000000..4dad303c1768 +&cam_endpoint { + remote-endpoint = <&csi_ep>; +}; -diff --git a/arch/arm/boot/dts/overlays/ov2311.dtsi b/arch/arm/boot/dts/overlays/ov2311.dtsi -new file mode 100644 -index 000000000000..a1714d6941c3 --- /dev/null +++ b/arch/arm/boot/dts/overlays/ov2311.dtsi @@ -0,0 +1,26 @@ @@ -32254,9 +31505,6 @@ index 000000000000..a1714d6941c3 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/ov5647-overlay.dts b/arch/arm/boot/dts/overlays/ov5647-overlay.dts -new file mode 100644 -index 000000000000..e2d40dac80c9 --- /dev/null +++ b/arch/arm/boot/dts/overlays/ov5647-overlay.dts @@ -0,0 +1,100 @@ @@ -32360,9 +31608,6 @@ index 000000000000..e2d40dac80c9 +&cam_endpoint { + remote-endpoint = <&csi_ep>; +}; -diff --git a/arch/arm/boot/dts/overlays/ov5647.dtsi b/arch/arm/boot/dts/overlays/ov5647.dtsi -new file mode 100644 -index 000000000000..6455a191a394 --- /dev/null +++ b/arch/arm/boot/dts/overlays/ov5647.dtsi @@ -0,0 +1,25 @@ @@ -32391,9 +31636,6 @@ index 000000000000..6455a191a394 + }; +}; + -diff --git a/arch/arm/boot/dts/overlays/ov64a40-overlay.dts b/arch/arm/boot/dts/overlays/ov64a40-overlay.dts -new file mode 100644 -index 000000000000..a765483aaaca --- /dev/null +++ b/arch/arm/boot/dts/overlays/ov64a40-overlay.dts @@ -0,0 +1,97 @@ @@ -32494,9 +31736,6 @@ index 000000000000..a765483aaaca +&vcm_node { + status = "okay"; +}; -diff --git a/arch/arm/boot/dts/overlays/ov64a40.dtsi b/arch/arm/boot/dts/overlays/ov64a40.dtsi -new file mode 100644 -index 000000000000..471b383fa151 --- /dev/null +++ b/arch/arm/boot/dts/overlays/ov64a40.dtsi @@ -0,0 +1,34 @@ @@ -32534,9 +31773,6 @@ index 000000000000..471b383fa151 + status = "disabled"; + vdd-supply = <&cam1_reg>; +}; -diff --git a/arch/arm/boot/dts/overlays/ov7251-overlay.dts b/arch/arm/boot/dts/overlays/ov7251-overlay.dts -new file mode 100644 -index 000000000000..e12953809690 --- /dev/null +++ b/arch/arm/boot/dts/overlays/ov7251-overlay.dts @@ -0,0 +1,83 @@ @@ -32623,9 +31859,6 @@ index 000000000000..e12953809690 +&cam_endpoint { + remote-endpoint = <&csi_ep>; +}; -diff --git a/arch/arm/boot/dts/overlays/ov7251.dtsi b/arch/arm/boot/dts/overlays/ov7251.dtsi -new file mode 100644 -index 000000000000..561fed1db837 --- /dev/null +++ b/arch/arm/boot/dts/overlays/ov7251.dtsi @@ -0,0 +1,28 @@ @@ -32657,9 +31890,6 @@ index 000000000000..561fed1db837 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/ov9281-overlay.dts b/arch/arm/boot/dts/overlays/ov9281-overlay.dts -new file mode 100644 -index 000000000000..d132c6b83611 --- /dev/null +++ b/arch/arm/boot/dts/overlays/ov9281-overlay.dts @@ -0,0 +1,109 @@ @@ -32772,9 +32002,6 @@ index 000000000000..d132c6b83611 +&cam_endpoint { + remote-endpoint = <&csi_ep>; +}; -diff --git a/arch/arm/boot/dts/overlays/ov9281.dtsi b/arch/arm/boot/dts/overlays/ov9281.dtsi -new file mode 100644 -index 000000000000..80f9da98ee8a --- /dev/null +++ b/arch/arm/boot/dts/overlays/ov9281.dtsi @@ -0,0 +1,27 @@ @@ -32805,9 +32032,6 @@ index 000000000000..80f9da98ee8a + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/overlay_map.dts b/arch/arm/boot/dts/overlays/overlay_map.dts -new file mode 100644 -index 000000000000..6d0e12773ca9 --- /dev/null +++ b/arch/arm/boot/dts/overlays/overlay_map.dts @@ -0,0 +1,557 @@ @@ -33368,9 +32592,6 @@ index 000000000000..6d0e12773ca9 + bcm2711; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/papirus-overlay.dts b/arch/arm/boot/dts/overlays/papirus-overlay.dts -new file mode 100644 -index 000000000000..67052b53a59c --- /dev/null +++ b/arch/arm/boot/dts/overlays/papirus-overlay.dts @@ -0,0 +1,84 @@ @@ -33458,9 +32679,6 @@ index 000000000000..67052b53a59c + speed = <&repaper>, "spi-max-frequency:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/pca953x-overlay.dts b/arch/arm/boot/dts/overlays/pca953x-overlay.dts -new file mode 100644 -index 000000000000..50ff90d7c072 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pca953x-overlay.dts @@ -0,0 +1,59 @@ @@ -33523,9 +32741,6 @@ index 000000000000..50ff90d7c072 + xra1202 = <&pca>,"compatible=exar,xra1202"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/pcf857x-overlay.dts b/arch/arm/boot/dts/overlays/pcf857x-overlay.dts -new file mode 100644 -index 000000000000..6b81d32c3818 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pcf857x-overlay.dts @@ -0,0 +1,34 @@ @@ -33563,9 +32778,6 @@ index 000000000000..6b81d32c3818 + addr = <&pcf857x>,"reg:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/pcie-32bit-dma-overlay.dts b/arch/arm/boot/dts/overlays/pcie-32bit-dma-overlay.dts -new file mode 100644 -index 000000000000..955703563df7 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pcie-32bit-dma-overlay.dts @@ -0,0 +1,38 @@ @@ -33607,9 +32819,6 @@ index 000000000000..955703563df7 + }; + +}; -diff --git a/arch/arm/boot/dts/overlays/pcie-32bit-dma-pi5-overlay.dts b/arch/arm/boot/dts/overlays/pcie-32bit-dma-pi5-overlay.dts -new file mode 100644 -index 000000000000..b8ce3bc53b80 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pcie-32bit-dma-pi5-overlay.dts @@ -0,0 +1,27 @@ @@ -33640,9 +32849,6 @@ index 000000000000..b8ce3bc53b80 + }; + +}; -diff --git a/arch/arm/boot/dts/overlays/pciex1-compat-pi5-overlay.dts b/arch/arm/boot/dts/overlays/pciex1-compat-pi5-overlay.dts -new file mode 100644 -index 000000000000..1f5adfc4add1 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pciex1-compat-pi5-overlay.dts @@ -0,0 +1,60 @@ @@ -33706,9 +32912,6 @@ index 000000000000..1f5adfc4add1 + mmio-hi = <0>, "+3"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/pibell-overlay.dts b/arch/arm/boot/dts/overlays/pibell-overlay.dts -new file mode 100644 -index 000000000000..99d4b6d97969 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pibell-overlay.dts @@ -0,0 +1,81 @@ @@ -33793,9 +32996,6 @@ index 000000000000..99d4b6d97969 + alsaname = <&snd>, "simple-audio-card,name"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/pifacedigital-overlay.dts b/arch/arm/boot/dts/overlays/pifacedigital-overlay.dts -new file mode 100644 -index 000000000000..532a858683d6 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pifacedigital-overlay.dts @@ -0,0 +1,144 @@ @@ -33943,9 +33143,6 @@ index 000000000000..532a858683d6 + spi-present-mask = <&pfdigital>, "microchip,spi-present-mask:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/pifi-40-overlay.dts b/arch/arm/boot/dts/overlays/pifi-40-overlay.dts -new file mode 100644 -index 000000000000..d9ef4ea4097e --- /dev/null +++ b/arch/arm/boot/dts/overlays/pifi-40-overlay.dts @@ -0,0 +1,50 @@ @@ -33999,9 +33196,6 @@ index 000000000000..d9ef4ea4097e + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/pifi-dac-hd-overlay.dts b/arch/arm/boot/dts/overlays/pifi-dac-hd-overlay.dts -new file mode 100644 -index 000000000000..236098365dc2 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pifi-dac-hd-overlay.dts @@ -0,0 +1,49 @@ @@ -34054,9 +33248,6 @@ index 000000000000..236098365dc2 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/pifi-dac-zero-overlay.dts b/arch/arm/boot/dts/overlays/pifi-dac-zero-overlay.dts -new file mode 100644 -index 000000000000..dd272388779e --- /dev/null +++ b/arch/arm/boot/dts/overlays/pifi-dac-zero-overlay.dts @@ -0,0 +1,49 @@ @@ -34109,9 +33300,6 @@ index 000000000000..dd272388779e + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/pifi-mini-210-overlay.dts b/arch/arm/boot/dts/overlays/pifi-mini-210-overlay.dts -new file mode 100644 -index 000000000000..a7b857144a48 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pifi-mini-210-overlay.dts @@ -0,0 +1,42 @@ @@ -34157,9 +33345,6 @@ index 000000000000..a7b857144a48 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/piglow-overlay.dts b/arch/arm/boot/dts/overlays/piglow-overlay.dts -new file mode 100644 -index 000000000000..075bceef158c --- /dev/null +++ b/arch/arm/boot/dts/overlays/piglow-overlay.dts @@ -0,0 +1,97 @@ @@ -34260,9 +33445,6 @@ index 000000000000..075bceef158c + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/pimidi-overlay.dts b/arch/arm/boot/dts/overlays/pimidi-overlay.dts -new file mode 100644 -index 000000000000..183738474afb --- /dev/null +++ b/arch/arm/boot/dts/overlays/pimidi-overlay.dts @@ -0,0 +1,53 @@ @@ -34319,9 +33501,6 @@ index 000000000000..183738474afb + <&pimidi_ctrl>,"interrupts:0{0=23,1=5,2=6,3=27}"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/pineboards-hat-ai-overlay.dts b/arch/arm/boot/dts/overlays/pineboards-hat-ai-overlay.dts -new file mode 100644 -index 000000000000..8160272f4705 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pineboards-hat-ai-overlay.dts @@ -0,0 +1,18 @@ @@ -34343,9 +33522,6 @@ index 000000000000..8160272f4705 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/pineboards-hatdrive-poe-plus-overlay.dts b/arch/arm/boot/dts/overlays/pineboards-hatdrive-poe-plus-overlay.dts -new file mode 100644 -index 000000000000..77b8e0d3be31 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pineboards-hatdrive-poe-plus-overlay.dts @@ -0,0 +1,19 @@ @@ -34368,9 +33544,6 @@ index 000000000000..77b8e0d3be31 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/piscreen-overlay.dts b/arch/arm/boot/dts/overlays/piscreen-overlay.dts -new file mode 100644 -index 000000000000..24302314323b --- /dev/null +++ b/arch/arm/boot/dts/overlays/piscreen-overlay.dts @@ -0,0 +1,110 @@ @@ -34484,9 +33657,6 @@ index 000000000000..24302314323b + swapxy = <&piscreen_ts>,"touchscreen-swapped-x-y!"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts b/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts -new file mode 100644 -index 000000000000..4468f4a54bf7 --- /dev/null +++ b/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts @@ -0,0 +1,106 @@ @@ -34596,9 +33766,6 @@ index 000000000000..4468f4a54bf7 + }; +}; + -diff --git a/arch/arm/boot/dts/overlays/pisound-micro-overlay.dts b/arch/arm/boot/dts/overlays/pisound-micro-overlay.dts -new file mode 100644 -index 000000000000..84562df6ca2b --- /dev/null +++ b/arch/arm/boot/dts/overlays/pisound-micro-overlay.dts @@ -0,0 +1,133 @@ @@ -34735,9 +33902,6 @@ index 000000000000..84562df6ca2b +}; + +/* vim: set ts=8 sw=8 noexpandtab: */ -diff --git a/arch/arm/boot/dts/overlays/pisound-overlay.dts b/arch/arm/boot/dts/overlays/pisound-overlay.dts -new file mode 100644 -index 000000000000..226bcbdf8a09 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pisound-overlay.dts @@ -0,0 +1,118 @@ @@ -34859,9 +34023,6 @@ index 000000000000..226bcbdf8a09 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/pisound-pi5-overlay.dts b/arch/arm/boot/dts/overlays/pisound-pi5-overlay.dts -new file mode 100644 -index 000000000000..0b07a6d03694 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pisound-pi5-overlay.dts @@ -0,0 +1,28 @@ @@ -34893,9 +34054,6 @@ index 000000000000..0b07a6d03694 +/ { + compatible = "brcm,bcm2712"; +}; -diff --git a/arch/arm/boot/dts/overlays/pitft22-overlay.dts b/arch/arm/boot/dts/overlays/pitft22-overlay.dts -new file mode 100644 -index 000000000000..5759d48aed57 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pitft22-overlay.dts @@ -0,0 +1,71 @@ @@ -34970,9 +34128,6 @@ index 000000000000..5759d48aed57 + drm = <&pitft>,"compatible=adafruit,yx240qv29"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/pitft28-capacitive-overlay.dts b/arch/arm/boot/dts/overlays/pitft28-capacitive-overlay.dts -new file mode 100644 -index 000000000000..de98ee7b4496 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pitft28-capacitive-overlay.dts @@ -0,0 +1,93 @@ @@ -35069,9 +34224,6 @@ index 000000000000..de98ee7b4496 + touch-swapxy = <&ft6236>,"touchscreen-swapped-x-y?"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/pitft28-resistive-overlay.dts b/arch/arm/boot/dts/overlays/pitft28-resistive-overlay.dts -new file mode 100644 -index 000000000000..bc2597179b9c --- /dev/null +++ b/arch/arm/boot/dts/overlays/pitft28-resistive-overlay.dts @@ -0,0 +1,126 @@ @@ -35201,9 +34353,6 @@ index 000000000000..bc2597179b9c + touch-swapxy = <&stmpe_touchscreen>,"touchscreen-swapped-x-y?"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts b/arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts -new file mode 100644 -index 000000000000..c3e81ef6003a --- /dev/null +++ b/arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts @@ -0,0 +1,127 @@ @@ -35334,9 +34483,6 @@ index 000000000000..c3e81ef6003a + touch-swapxy = <&stmpe_touchscreen>,"touchscreen-swapped-x-y?"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/pivision-overlay.dts b/arch/arm/boot/dts/overlays/pivision-overlay.dts -new file mode 100644 -index 000000000000..496c726e0140 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pivision-overlay.dts @@ -0,0 +1,155 @@ @@ -35495,9 +34641,6 @@ index 000000000000..496c726e0140 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/pps-gpio-overlay.dts b/arch/arm/boot/dts/overlays/pps-gpio-overlay.dts -new file mode 100644 -index 000000000000..a4f6b868aad8 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pps-gpio-overlay.dts @@ -0,0 +1,39 @@ @@ -35540,9 +34683,6 @@ index 000000000000..a4f6b868aad8 + pull = <&pps_pins>,"brcm,pull:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/proto-codec-overlay.dts b/arch/arm/boot/dts/overlays/proto-codec-overlay.dts -new file mode 100644 -index 000000000000..92f6ed158923 --- /dev/null +++ b/arch/arm/boot/dts/overlays/proto-codec-overlay.dts @@ -0,0 +1,39 @@ @@ -35585,9 +34725,6 @@ index 000000000000..92f6ed158923 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/pwm-2chan-overlay.dts b/arch/arm/boot/dts/overlays/pwm-2chan-overlay.dts -new file mode 100644 -index 000000000000..823c8b4126d1 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pwm-2chan-overlay.dts @@ -0,0 +1,48 @@ @@ -35639,9 +34776,6 @@ index 000000000000..823c8b4126d1 + clock = <&frag1>,"assigned-clock-rates:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/pwm-gpio-fan-overlay.dts b/arch/arm/boot/dts/overlays/pwm-gpio-fan-overlay.dts -new file mode 100644 -index 000000000000..dc5e586a3251 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pwm-gpio-fan-overlay.dts @@ -0,0 +1,170 @@ @@ -35815,9 +34949,6 @@ index 000000000000..dc5e586a3251 + }; + +}; -diff --git a/arch/arm/boot/dts/overlays/pwm-gpio-overlay.dts b/arch/arm/boot/dts/overlays/pwm-gpio-overlay.dts -new file mode 100644 -index 000000000000..f5a1fb38e257 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pwm-gpio-overlay.dts @@ -0,0 +1,38 @@ @@ -35859,9 +34990,6 @@ index 000000000000..f5a1fb38e257 + <&pwm_gpio_pins>,"reg:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/pwm-ir-tx-overlay.dts b/arch/arm/boot/dts/overlays/pwm-ir-tx-overlay.dts -new file mode 100644 -index 000000000000..33597eb79729 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pwm-ir-tx-overlay.dts @@ -0,0 +1,40 @@ @@ -35905,9 +35033,6 @@ index 000000000000..33597eb79729 + func = <&pwm0_pins>,"brcm,function:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/pwm-overlay.dts b/arch/arm/boot/dts/overlays/pwm-overlay.dts -new file mode 100644 -index 000000000000..32853492aaea --- /dev/null +++ b/arch/arm/boot/dts/overlays/pwm-overlay.dts @@ -0,0 +1,44 @@ @@ -35955,9 +35080,6 @@ index 000000000000..32853492aaea + clock = <&frag1>,"assigned-clock-rates:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/pwm-pio-overlay.dts b/arch/arm/boot/dts/overlays/pwm-pio-overlay.dts -new file mode 100644 -index 000000000000..3f105a8c21ce --- /dev/null +++ b/arch/arm/boot/dts/overlays/pwm-pio-overlay.dts @@ -0,0 +1,39 @@ @@ -36000,9 +35122,6 @@ index 000000000000..3f105a8c21ce + <&pwm_pio_pins>,"reg:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/pwm1-overlay.dts b/arch/arm/boot/dts/overlays/pwm1-overlay.dts -new file mode 100644 -index 000000000000..3324d4160653 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pwm1-overlay.dts @@ -0,0 +1,59 @@ @@ -36065,9 +35184,6 @@ index 000000000000..3324d4160653 + pull_off = <&pins>, "brcm,pull:0=", ; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/qca7000-overlay.dts b/arch/arm/boot/dts/overlays/qca7000-overlay.dts -new file mode 100644 -index 000000000000..0184c53801db --- /dev/null +++ b/arch/arm/boot/dts/overlays/qca7000-overlay.dts @@ -0,0 +1,55 @@ @@ -36126,9 +35242,6 @@ index 000000000000..0184c53801db + speed = <ð1>, "spi-max-frequency:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/qca7000-uart0-overlay.dts b/arch/arm/boot/dts/overlays/qca7000-uart0-overlay.dts -new file mode 100644 -index 000000000000..3e4af02d91e2 --- /dev/null +++ b/arch/arm/boot/dts/overlays/qca7000-uart0-overlay.dts @@ -0,0 +1,46 @@ @@ -36178,9 +35291,6 @@ index 000000000000..3e4af02d91e2 + baudrate = <ð2>, "current-speed:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/ramoops-overlay.dts b/arch/arm/boot/dts/overlays/ramoops-overlay.dts -new file mode 100644 -index 000000000000..e5038658138d --- /dev/null +++ b/arch/arm/boot/dts/overlays/ramoops-overlay.dts @@ -0,0 +1,25 @@ @@ -36209,9 +35319,6 @@ index 000000000000..e5038658138d + console-size = <&ramoops>,"console-size:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/ramoops-pi4-overlay.dts b/arch/arm/boot/dts/overlays/ramoops-pi4-overlay.dts -new file mode 100644 -index 000000000000..1737e37f5724 --- /dev/null +++ b/arch/arm/boot/dts/overlays/ramoops-pi4-overlay.dts @@ -0,0 +1,25 @@ @@ -36240,9 +35347,6 @@ index 000000000000..1737e37f5724 + console-size = <&ramoops>,"console-size:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/rootmaster-overlay.dts b/arch/arm/boot/dts/overlays/rootmaster-overlay.dts -new file mode 100644 -index 000000000000..f5ebaea2abb5 --- /dev/null +++ b/arch/arm/boot/dts/overlays/rootmaster-overlay.dts @@ -0,0 +1,77 @@ @@ -36323,9 +35427,6 @@ index 000000000000..f5ebaea2abb5 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/rotary-encoder-overlay.dts b/arch/arm/boot/dts/overlays/rotary-encoder-overlay.dts -new file mode 100644 -index 000000000000..ea1d952734e9 --- /dev/null +++ b/arch/arm/boot/dts/overlays/rotary-encoder-overlay.dts @@ -0,0 +1,59 @@ @@ -36388,9 +35489,6 @@ index 000000000000..ea1d952734e9 + <&rotary_pins>,"brcm,pins:4"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/rpi-backlight-overlay.dts b/arch/arm/boot/dts/overlays/rpi-backlight-overlay.dts -new file mode 100644 -index 000000000000..cac5e44c6ec5 --- /dev/null +++ b/arch/arm/boot/dts/overlays/rpi-backlight-overlay.dts @@ -0,0 +1,21 @@ @@ -36415,9 +35513,6 @@ index 000000000000..cac5e44c6ec5 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/rpi-codeczero-overlay.dts b/arch/arm/boot/dts/overlays/rpi-codeczero-overlay.dts -new file mode 100644 -index 000000000000..c3b0564b2fb2 --- /dev/null +++ b/arch/arm/boot/dts/overlays/rpi-codeczero-overlay.dts @@ -0,0 +1,9 @@ @@ -36430,9 +35525,6 @@ index 000000000000..c3b0564b2fb2 + dai_name = "Raspberry Pi Codec Zero"; + dai_stream_name = "Raspberry Pi Codec Zero HiFi"; +}; -diff --git a/arch/arm/boot/dts/overlays/rpi-dacplus-overlay.dts b/arch/arm/boot/dts/overlays/rpi-dacplus-overlay.dts -new file mode 100644 -index 000000000000..47557aa17f19 --- /dev/null +++ b/arch/arm/boot/dts/overlays/rpi-dacplus-overlay.dts @@ -0,0 +1,17 @@ @@ -36453,9 +35545,6 @@ index 000000000000..47557aa17f19 + /delete-property/ unmute_amp; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/rpi-dacpro-overlay.dts b/arch/arm/boot/dts/overlays/rpi-dacpro-overlay.dts -new file mode 100644 -index 000000000000..412260c64edf --- /dev/null +++ b/arch/arm/boot/dts/overlays/rpi-dacpro-overlay.dts @@ -0,0 +1,17 @@ @@ -36476,9 +35565,6 @@ index 000000000000..412260c64edf + /delete-property/ unmute_amp; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/rpi-digiampplus-overlay.dts b/arch/arm/boot/dts/overlays/rpi-digiampplus-overlay.dts -new file mode 100644 -index 000000000000..5e73d6c1bf42 --- /dev/null +++ b/arch/arm/boot/dts/overlays/rpi-digiampplus-overlay.dts @@ -0,0 +1,17 @@ @@ -36499,9 +35585,6 @@ index 000000000000..5e73d6c1bf42 + <&iqaudio_dac>,"iqaudio-dac,auto-mute-amp!"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts b/arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts -new file mode 100644 -index 000000000000..8483c4f4b2eb --- /dev/null +++ b/arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts @@ -0,0 +1,25 @@ @@ -36530,9 +35613,6 @@ index 000000000000..8483c4f4b2eb + touchscreen-swapped-x-y = <&ts>,"touchscreen-swapped-x-y?"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/rpi-fw-uart-overlay.dts b/arch/arm/boot/dts/overlays/rpi-fw-uart-overlay.dts -new file mode 100644 -index 000000000000..c17556e91105 --- /dev/null +++ b/arch/arm/boot/dts/overlays/rpi-fw-uart-overlay.dts @@ -0,0 +1,41 @@ @@ -36577,9 +35657,6 @@ index 000000000000..c17556e91105 + <&rpi_fw_uart_pins>, "brcm,pins:4"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/rpi-poe-overlay.dts b/arch/arm/boot/dts/overlays/rpi-poe-overlay.dts -new file mode 100644 -index 000000000000..6b9ac9bcf6b8 --- /dev/null +++ b/arch/arm/boot/dts/overlays/rpi-poe-overlay.dts @@ -0,0 +1,154 @@ @@ -36737,9 +35814,6 @@ index 000000000000..6b9ac9bcf6b8 + <&fan>,"pwms:0=",<&poe_mfd_pwm>; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/rpi-poe-plus-overlay.dts b/arch/arm/boot/dts/overlays/rpi-poe-plus-overlay.dts -new file mode 100644 -index 000000000000..494af0c2a20a --- /dev/null +++ b/arch/arm/boot/dts/overlays/rpi-poe-plus-overlay.dts @@ -0,0 +1,49 @@ @@ -36792,9 +35866,6 @@ index 000000000000..494af0c2a20a + <&poe_mfd>,"status=okay", + <&fan>,"pwms:0=",<&poe_mfd_pwm>; +}; -diff --git a/arch/arm/boot/dts/overlays/rpi-power-hat-b-overlay.dts b/arch/arm/boot/dts/overlays/rpi-power-hat-b-overlay.dts -new file mode 100644 -index 000000000000..2d87f2ab5a2a --- /dev/null +++ b/arch/arm/boot/dts/overlays/rpi-power-hat-b-overlay.dts @@ -0,0 +1,60 @@ @@ -36858,9 +35929,6 @@ index 000000000000..2d87f2ab5a2a + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/rpi-power-hat-t-overlay.dts b/arch/arm/boot/dts/overlays/rpi-power-hat-t-overlay.dts -new file mode 100644 -index 000000000000..f6a2453176b9 --- /dev/null +++ b/arch/arm/boot/dts/overlays/rpi-power-hat-t-overlay.dts @@ -0,0 +1,60 @@ @@ -36924,9 +35992,6 @@ index 000000000000..f6a2453176b9 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/rpi-rp2040-gpio-bridge.dtsi b/arch/arm/boot/dts/overlays/rpi-rp2040-gpio-bridge.dtsi -new file mode 100644 -index 000000000000..2b7f670a1f6d --- /dev/null +++ b/arch/arm/boot/dts/overlays/rpi-rp2040-gpio-bridge.dtsi @@ -0,0 +1,21 @@ @@ -36951,9 +36016,6 @@ index 000000000000..2b7f670a1f6d + spi-max-frequency = <35000000>; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/rpi-sense-overlay.dts b/arch/arm/boot/dts/overlays/rpi-sense-overlay.dts -new file mode 100644 -index 000000000000..7789709b10e9 --- /dev/null +++ b/arch/arm/boot/dts/overlays/rpi-sense-overlay.dts @@ -0,0 +1,69 @@ @@ -37026,9 +36088,6 @@ index 000000000000..7789709b10e9 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/rpi-sense-v2-overlay.dts b/arch/arm/boot/dts/overlays/rpi-sense-v2-overlay.dts -new file mode 100644 -index 000000000000..b24ad86cff02 --- /dev/null +++ b/arch/arm/boot/dts/overlays/rpi-sense-v2-overlay.dts @@ -0,0 +1,69 @@ @@ -37101,9 +36160,6 @@ index 000000000000..b24ad86cff02 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/rpi-tv-overlay.dts b/arch/arm/boot/dts/overlays/rpi-tv-overlay.dts -new file mode 100644 -index 000000000000..3c97a545d820 --- /dev/null +++ b/arch/arm/boot/dts/overlays/rpi-tv-overlay.dts @@ -0,0 +1,34 @@ @@ -37141,9 +36197,6 @@ index 000000000000..3c97a545d820 + }; + +}; -diff --git a/arch/arm/boot/dts/overlays/rra-digidac1-wm8741-audio-overlay.dts b/arch/arm/boot/dts/overlays/rra-digidac1-wm8741-audio-overlay.dts -new file mode 100644 -index 000000000000..97db53a91fda --- /dev/null +++ b/arch/arm/boot/dts/overlays/rra-digidac1-wm8741-audio-overlay.dts @@ -0,0 +1,49 @@ @@ -37196,9 +36249,6 @@ index 000000000000..97db53a91fda + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts b/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts -new file mode 100644 -index 000000000000..c51f1c030a55 --- /dev/null +++ b/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts @@ -0,0 +1,52 @@ @@ -37254,9 +36304,6 @@ index 000000000000..c51f1c030a55 + reset_pin = <&ss18>,"reset-gpios:4"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/sc16is750-i2c-overlay.dts b/arch/arm/boot/dts/overlays/sc16is750-i2c-overlay.dts -new file mode 100644 -index 000000000000..700e8a60f182 --- /dev/null +++ b/arch/arm/boot/dts/overlays/sc16is750-i2c-overlay.dts @@ -0,0 +1,58 @@ @@ -37318,9 +36365,6 @@ index 000000000000..700e8a60f182 + xtal = <&sc16is750_clk>,"clock-frequency:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/sc16is752-i2c-overlay.dts b/arch/arm/boot/dts/overlays/sc16is752-i2c-overlay.dts -new file mode 100644 -index 000000000000..d481d6aa8231 --- /dev/null +++ b/arch/arm/boot/dts/overlays/sc16is752-i2c-overlay.dts @@ -0,0 +1,58 @@ @@ -37382,9 +36426,6 @@ index 000000000000..d481d6aa8231 + xtal = <&sc16is752_clk>,"clock-frequency:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/sc16is75x-spi-overlay.dts b/arch/arm/boot/dts/overlays/sc16is75x-spi-overlay.dts -new file mode 100644 -index 000000000000..ba5c7b5ffaff --- /dev/null +++ b/arch/arm/boot/dts/overlays/sc16is75x-spi-overlay.dts @@ -0,0 +1,174 @@ @@ -37562,9 +36603,6 @@ index 000000000000..ba5c7b5ffaff + <&sc16is75x_pins>, "name=sc16is75x_spi6_1_pins"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/sdhost-overlay.dts b/arch/arm/boot/dts/overlays/sdhost-overlay.dts -new file mode 100644 -index 000000000000..0b72b4eeac88 --- /dev/null +++ b/arch/arm/boot/dts/overlays/sdhost-overlay.dts @@ -0,0 +1,38 @@ @@ -37606,9 +36644,6 @@ index 000000000000..0b72b4eeac88 + debug = <&frag0>,"brcm,debug?"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/sdio-overlay.dts b/arch/arm/boot/dts/overlays/sdio-overlay.dts -new file mode 100644 -index 000000000000..873e49056379 --- /dev/null +++ b/arch/arm/boot/dts/overlays/sdio-overlay.dts @@ -0,0 +1,77 @@ @@ -37689,9 +36724,6 @@ index 000000000000..873e49056379 + gpios_34_39 = <0>,"=5"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/sdio-pi5-overlay.dts b/arch/arm/boot/dts/overlays/sdio-pi5-overlay.dts -new file mode 100644 -index 000000000000..4e42cb5c856e --- /dev/null +++ b/arch/arm/boot/dts/overlays/sdio-pi5-overlay.dts @@ -0,0 +1,24 @@ @@ -37719,9 +36751,6 @@ index 000000000000..4e42cb5c856e + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/seeed-can-fd-hat-v1-overlay.dts b/arch/arm/boot/dts/overlays/seeed-can-fd-hat-v1-overlay.dts -new file mode 100644 -index 000000000000..210d027a073e --- /dev/null +++ b/arch/arm/boot/dts/overlays/seeed-can-fd-hat-v1-overlay.dts @@ -0,0 +1,138 @@ @@ -37863,9 +36892,6 @@ index 000000000000..210d027a073e + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/seeed-can-fd-hat-v2-overlay.dts b/arch/arm/boot/dts/overlays/seeed-can-fd-hat-v2-overlay.dts -new file mode 100644 -index 000000000000..fc3c7794c28a --- /dev/null +++ b/arch/arm/boot/dts/overlays/seeed-can-fd-hat-v2-overlay.dts @@ -0,0 +1,112 @@ @@ -37981,9 +37007,6 @@ index 000000000000..fc3c7794c28a + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/sh1106-spi-overlay.dts b/arch/arm/boot/dts/overlays/sh1106-spi-overlay.dts -new file mode 100644 -index 000000000000..57a0cc9b1741 --- /dev/null +++ b/arch/arm/boot/dts/overlays/sh1106-spi-overlay.dts @@ -0,0 +1,84 @@ @@ -38071,9 +37094,6 @@ index 000000000000..57a0cc9b1741 + height = <&sh1106>,"sinowealth,height:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/si446x-spi0-overlay.dts b/arch/arm/boot/dts/overlays/si446x-spi0-overlay.dts -new file mode 100644 -index 000000000000..90495f0941fb --- /dev/null +++ b/arch/arm/boot/dts/overlays/si446x-spi0-overlay.dts @@ -0,0 +1,53 @@ @@ -38130,9 +37150,6 @@ index 000000000000..90495f0941fb + speed = <&uhf0>, "spi-max-frequency:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/smi-dev-overlay.dts b/arch/arm/boot/dts/overlays/smi-dev-overlay.dts -new file mode 100644 -index 000000000000..bafab6c92506 --- /dev/null +++ b/arch/arm/boot/dts/overlays/smi-dev-overlay.dts @@ -0,0 +1,20 @@ @@ -38156,9 +37173,6 @@ index 000000000000..bafab6c92506 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/smi-nand-overlay.dts b/arch/arm/boot/dts/overlays/smi-nand-overlay.dts -new file mode 100644 -index 000000000000..ae1e50329d66 --- /dev/null +++ b/arch/arm/boot/dts/overlays/smi-nand-overlay.dts @@ -0,0 +1,66 @@ @@ -38228,9 +37242,6 @@ index 000000000000..ae1e50329d66 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/smi-overlay.dts b/arch/arm/boot/dts/overlays/smi-overlay.dts -new file mode 100644 -index 000000000000..bb8c7830df23 --- /dev/null +++ b/arch/arm/boot/dts/overlays/smi-overlay.dts @@ -0,0 +1,37 @@ @@ -38271,9 +37282,6 @@ index 000000000000..bb8c7830df23 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/spi-gpio35-39-overlay.dts b/arch/arm/boot/dts/overlays/spi-gpio35-39-overlay.dts -new file mode 100644 -index 000000000000..a132b8637c31 --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi-gpio35-39-overlay.dts @@ -0,0 +1,31 @@ @@ -38308,9 +37316,6 @@ index 000000000000..a132b8637c31 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/spi-gpio40-45-overlay.dts b/arch/arm/boot/dts/overlays/spi-gpio40-45-overlay.dts -new file mode 100644 -index 000000000000..9ebcaf1b5ea0 --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi-gpio40-45-overlay.dts @@ -0,0 +1,36 @@ @@ -38350,9 +37355,6 @@ index 000000000000..9ebcaf1b5ea0 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/spi-rtc-overlay.dts b/arch/arm/boot/dts/overlays/spi-rtc-overlay.dts -new file mode 100644 -index 000000000000..df3286929c2e --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi-rtc-overlay.dts @@ -0,0 +1,75 @@ @@ -38431,9 +37433,6 @@ index 000000000000..df3286929c2e + pcf2123 = <0>,"+2"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/spi0-0cs-overlay.dts b/arch/arm/boot/dts/overlays/spi0-0cs-overlay.dts -new file mode 100644 -index 000000000000..0d2acabf56a4 --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi0-0cs-overlay.dts @@ -0,0 +1,39 @@ @@ -38476,9 +37475,6 @@ index 000000000000..0d2acabf56a4 + no_miso = <0>,"=3"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/spi0-1cs-inverted-overlay.dts b/arch/arm/boot/dts/overlays/spi0-1cs-inverted-overlay.dts -new file mode 100644 -index 000000000000..dc1db2184df4 --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi0-1cs-inverted-overlay.dts @@ -0,0 +1,59 @@ @@ -38541,9 +37537,6 @@ index 000000000000..dc1db2184df4 + no_miso = <0>,"=3"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/spi0-1cs-overlay.dts b/arch/arm/boot/dts/overlays/spi0-1cs-overlay.dts -new file mode 100644 -index 000000000000..e6eb66e2076a --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi0-1cs-overlay.dts @@ -0,0 +1,42 @@ @@ -38589,9 +37582,6 @@ index 000000000000..e6eb66e2076a + no_miso = <0>,"=3"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/spi0-2cs-overlay.dts b/arch/arm/boot/dts/overlays/spi0-2cs-overlay.dts -new file mode 100644 -index 000000000000..df6519537c3a --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi0-2cs-overlay.dts @@ -0,0 +1,37 @@ @@ -38632,9 +37622,6 @@ index 000000000000..df6519537c3a + no_miso = <0>,"=2"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/spi1-1cs-overlay.dts b/arch/arm/boot/dts/overlays/spi1-1cs-overlay.dts -new file mode 100644 -index 000000000000..ea2794bc5fd5 --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi1-1cs-overlay.dts @@ -0,0 +1,57 @@ @@ -38695,9 +37682,6 @@ index 000000000000..ea2794bc5fd5 + cs0_spidev = <&spidev1_0>,"status"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/spi1-2cs-overlay.dts b/arch/arm/boot/dts/overlays/spi1-2cs-overlay.dts -new file mode 100644 -index 000000000000..dab34ee79ae2 --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi1-2cs-overlay.dts @@ -0,0 +1,69 @@ @@ -38770,9 +37754,6 @@ index 000000000000..dab34ee79ae2 + cs1_spidev = <&spidev1_1>,"status"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/spi1-3cs-overlay.dts b/arch/arm/boot/dts/overlays/spi1-3cs-overlay.dts -new file mode 100644 -index 000000000000..bc7e7d04324b --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi1-3cs-overlay.dts @@ -0,0 +1,81 @@ @@ -38857,9 +37838,6 @@ index 000000000000..bc7e7d04324b + cs2_spidev = <&spidev1_2>,"status"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/spi2-1cs-overlay.dts b/arch/arm/boot/dts/overlays/spi2-1cs-overlay.dts -new file mode 100644 -index 000000000000..2a29750462af --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi2-1cs-overlay.dts @@ -0,0 +1,57 @@ @@ -38920,9 +37898,6 @@ index 000000000000..2a29750462af + cs0_spidev = <&spidev2_0>,"status"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/spi2-1cs-pi5-overlay.dts b/arch/arm/boot/dts/overlays/spi2-1cs-pi5-overlay.dts -new file mode 100644 -index 000000000000..44382cc5a7c0 --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi2-1cs-pi5-overlay.dts @@ -0,0 +1,33 @@ @@ -38959,9 +37934,6 @@ index 000000000000..44382cc5a7c0 + cs0_spidev = <&spidev2_0>,"status"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/spi2-2cs-overlay.dts b/arch/arm/boot/dts/overlays/spi2-2cs-overlay.dts -new file mode 100644 -index 000000000000..642678fc9ddd --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi2-2cs-overlay.dts @@ -0,0 +1,69 @@ @@ -39034,9 +38006,6 @@ index 000000000000..642678fc9ddd + cs1_spidev = <&spidev2_1>,"status"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/spi2-2cs-pi5-overlay.dts b/arch/arm/boot/dts/overlays/spi2-2cs-pi5-overlay.dts -new file mode 100644 -index 000000000000..b37a2c21c7b4 --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi2-2cs-pi5-overlay.dts @@ -0,0 +1,44 @@ @@ -39084,9 +38053,6 @@ index 000000000000..b37a2c21c7b4 + cs1_spidev = <&spidev2_1>,"status"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/spi2-3cs-overlay.dts b/arch/arm/boot/dts/overlays/spi2-3cs-overlay.dts -new file mode 100644 -index 000000000000..28d40c6c3c37 --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi2-3cs-overlay.dts @@ -0,0 +1,81 @@ @@ -39171,9 +38137,6 @@ index 000000000000..28d40c6c3c37 + cs2_spidev = <&spidev2_2>,"status"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/spi3-1cs-overlay.dts b/arch/arm/boot/dts/overlays/spi3-1cs-overlay.dts -new file mode 100644 -index 000000000000..7abea6d86fd0 --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi3-1cs-overlay.dts @@ -0,0 +1,42 @@ @@ -39219,9 +38182,6 @@ index 000000000000..7abea6d86fd0 + cs0_spidev = <&spidev3_0>,"status"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/spi3-1cs-pi5-overlay.dts b/arch/arm/boot/dts/overlays/spi3-1cs-pi5-overlay.dts -new file mode 100644 -index 000000000000..a94e3a9f35ce --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi3-1cs-pi5-overlay.dts @@ -0,0 +1,33 @@ @@ -39258,9 +38218,6 @@ index 000000000000..a94e3a9f35ce + cs0_spidev = <&spidev3_0>,"status"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/spi3-2cs-overlay.dts b/arch/arm/boot/dts/overlays/spi3-2cs-overlay.dts -new file mode 100644 -index 000000000000..2f474ac769f5 --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi3-2cs-overlay.dts @@ -0,0 +1,54 @@ @@ -39318,9 +38275,6 @@ index 000000000000..2f474ac769f5 + cs1_spidev = <&spidev3_1>,"status"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/spi3-2cs-pi5-overlay.dts b/arch/arm/boot/dts/overlays/spi3-2cs-pi5-overlay.dts -new file mode 100644 -index 000000000000..259548b37d5c --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi3-2cs-pi5-overlay.dts @@ -0,0 +1,44 @@ @@ -39368,9 +38322,6 @@ index 000000000000..259548b37d5c + cs1_spidev = <&spidev3_1>,"status"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/spi4-1cs-overlay.dts b/arch/arm/boot/dts/overlays/spi4-1cs-overlay.dts -new file mode 100644 -index 000000000000..66d89521124a --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi4-1cs-overlay.dts @@ -0,0 +1,42 @@ @@ -39416,9 +38367,6 @@ index 000000000000..66d89521124a + cs0_spidev = <&spidev4_0>,"status"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/spi4-2cs-overlay.dts b/arch/arm/boot/dts/overlays/spi4-2cs-overlay.dts -new file mode 100644 -index 000000000000..83d8cb8b918c --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi4-2cs-overlay.dts @@ -0,0 +1,54 @@ @@ -39476,9 +38424,6 @@ index 000000000000..83d8cb8b918c + cs1_spidev = <&spidev4_1>,"status"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/spi5-1cs-overlay.dts b/arch/arm/boot/dts/overlays/spi5-1cs-overlay.dts -new file mode 100644 -index 000000000000..168b4825de34 --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi5-1cs-overlay.dts @@ -0,0 +1,42 @@ @@ -39524,9 +38469,6 @@ index 000000000000..168b4825de34 + cs0_spidev = <&spidev5_0>,"status"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/spi5-1cs-pi5-overlay.dts b/arch/arm/boot/dts/overlays/spi5-1cs-pi5-overlay.dts -new file mode 100644 -index 000000000000..bde1837f26c0 --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi5-1cs-pi5-overlay.dts @@ -0,0 +1,33 @@ @@ -39563,9 +38505,6 @@ index 000000000000..bde1837f26c0 + cs0_spidev = <&spidev5_0>,"status"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/spi5-2cs-overlay.dts b/arch/arm/boot/dts/overlays/spi5-2cs-overlay.dts -new file mode 100644 -index 000000000000..c2a239a34b35 --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi5-2cs-overlay.dts @@ -0,0 +1,54 @@ @@ -39623,9 +38562,6 @@ index 000000000000..c2a239a34b35 + cs1_spidev = <&spidev5_1>,"status"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/spi5-2cs-pi5-overlay.dts b/arch/arm/boot/dts/overlays/spi5-2cs-pi5-overlay.dts -new file mode 100644 -index 000000000000..2c9eee2a9db8 --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi5-2cs-pi5-overlay.dts @@ -0,0 +1,44 @@ @@ -39673,9 +38609,6 @@ index 000000000000..2c9eee2a9db8 + cs1_spidev = <&spidev5_1>,"status"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/spi6-1cs-overlay.dts b/arch/arm/boot/dts/overlays/spi6-1cs-overlay.dts -new file mode 100644 -index 000000000000..a784f8a17d23 --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi6-1cs-overlay.dts @@ -0,0 +1,42 @@ @@ -39721,9 +38654,6 @@ index 000000000000..a784f8a17d23 + cs0_spidev = <&spidev6_0>,"status"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/spi6-2cs-overlay.dts b/arch/arm/boot/dts/overlays/spi6-2cs-overlay.dts -new file mode 100644 -index 000000000000..8ef513814d2b --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi6-2cs-overlay.dts @@ -0,0 +1,54 @@ @@ -39781,9 +38711,6 @@ index 000000000000..8ef513814d2b + cs1_spidev = <&spidev6_1>,"status"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/ssd1306-overlay.dts b/arch/arm/boot/dts/overlays/ssd1306-overlay.dts -new file mode 100644 -index 000000000000..bd0abec11c25 --- /dev/null +++ b/arch/arm/boot/dts/overlays/ssd1306-overlay.dts @@ -0,0 +1,36 @@ @@ -39823,9 +38750,6 @@ index 000000000000..bd0abec11c25 + inverted = <&ssd1306>,"solomon,com-invdir?"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/ssd1306-spi-overlay.dts b/arch/arm/boot/dts/overlays/ssd1306-spi-overlay.dts -new file mode 100644 -index 000000000000..679749fc3065 --- /dev/null +++ b/arch/arm/boot/dts/overlays/ssd1306-spi-overlay.dts @@ -0,0 +1,85 @@ @@ -39914,9 +38838,6 @@ index 000000000000..679749fc3065 + inverted = <&ssd1306>,"solomon,com-invdir?"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/ssd1327-spi-overlay.dts b/arch/arm/boot/dts/overlays/ssd1327-spi-overlay.dts -new file mode 100644 -index 000000000000..c0770738c176 --- /dev/null +++ b/arch/arm/boot/dts/overlays/ssd1327-spi-overlay.dts @@ -0,0 +1,70 @@ @@ -39990,9 +38911,6 @@ index 000000000000..c0770738c176 + <&ssd1327_pins>,"brcm,pins:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/ssd1331-spi-overlay.dts b/arch/arm/boot/dts/overlays/ssd1331-spi-overlay.dts -new file mode 100644 -index 000000000000..9fd5ebf2feda --- /dev/null +++ b/arch/arm/boot/dts/overlays/ssd1331-spi-overlay.dts @@ -0,0 +1,83 @@ @@ -40079,9 +38997,6 @@ index 000000000000..9fd5ebf2feda + <&ssd1331_pins>,"brcm,pins:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/ssd1351-spi-overlay.dts b/arch/arm/boot/dts/overlays/ssd1351-spi-overlay.dts -new file mode 100644 -index 000000000000..ffc872c60648 --- /dev/null +++ b/arch/arm/boot/dts/overlays/ssd1351-spi-overlay.dts @@ -0,0 +1,83 @@ @@ -40168,9 +39083,6 @@ index 000000000000..ffc872c60648 + <&ssd1351_pins>,"brcm,pins:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/sunfounder-pipower3-overlay.dts b/arch/arm/boot/dts/overlays/sunfounder-pipower3-overlay.dts -new file mode 100644 -index 000000000000..071899b86b46 --- /dev/null +++ b/arch/arm/boot/dts/overlays/sunfounder-pipower3-overlay.dts @@ -0,0 +1,34 @@ @@ -40208,9 +39120,6 @@ index 000000000000..071899b86b46 + poweroff_pin = <&power_ctrl>,"gpios:4"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/sunfounder-pironman5-overlay.dts b/arch/arm/boot/dts/overlays/sunfounder-pironman5-overlay.dts -new file mode 100644 -index 000000000000..fad68ef1813f --- /dev/null +++ b/arch/arm/boot/dts/overlays/sunfounder-pironman5-overlay.dts @@ -0,0 +1,55 @@ @@ -40269,9 +39178,6 @@ index 000000000000..fad68ef1813f + <&gpio_ir_pins>,"reg:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/superaudioboard-overlay.dts b/arch/arm/boot/dts/overlays/superaudioboard-overlay.dts -new file mode 100755 -index 000000000000..1006d5fe9e06 --- /dev/null +++ b/arch/arm/boot/dts/overlays/superaudioboard-overlay.dts @@ -0,0 +1,73 @@ @@ -40348,9 +39254,6 @@ index 000000000000..1006d5fe9e06 + gpiopin = <&cs4271>,"reset-gpio:4"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/sx150x-overlay.dts b/arch/arm/boot/dts/overlays/sx150x-overlay.dts -new file mode 100644 -index 000000000000..191ccd5f9eca --- /dev/null +++ b/arch/arm/boot/dts/overlays/sx150x-overlay.dts @@ -0,0 +1,1706 @@ @@ -42060,9 +40963,6 @@ index 000000000000..191ccd5f9eca + }; +}; + -diff --git a/arch/arm/boot/dts/overlays/tc358743-audio-overlay.dts b/arch/arm/boot/dts/overlays/tc358743-audio-overlay.dts -new file mode 100644 -index 000000000000..6bb3dceb0df3 --- /dev/null +++ b/arch/arm/boot/dts/overlays/tc358743-audio-overlay.dts @@ -0,0 +1,52 @@ @@ -42118,9 +41018,6 @@ index 000000000000..6bb3dceb0df3 + card-name = <&sound_overlay>,"simple-audio-card,name"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/tc358743-overlay.dts b/arch/arm/boot/dts/overlays/tc358743-overlay.dts -new file mode 100644 -index 000000000000..8834c7cf0c4f --- /dev/null +++ b/arch/arm/boot/dts/overlays/tc358743-overlay.dts @@ -0,0 +1,28 @@ @@ -42152,9 +41049,6 @@ index 000000000000..8834c7cf0c4f + <&legacy_frag>, "target:0=",<&csi0>; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/tc358743-pi5-overlay.dts b/arch/arm/boot/dts/overlays/tc358743-pi5-overlay.dts -new file mode 100644 -index 000000000000..8c00138385a3 --- /dev/null +++ b/arch/arm/boot/dts/overlays/tc358743-pi5-overlay.dts @@ -0,0 +1,10 @@ @@ -42168,9 +41062,6 @@ index 000000000000..8c00138385a3 +/ { + compatible = "brcm,bcm2712"; +}; -diff --git a/arch/arm/boot/dts/overlays/tc358743.dtsi b/arch/arm/boot/dts/overlays/tc358743.dtsi -new file mode 100644 -index 000000000000..809332e9a072 --- /dev/null +++ b/arch/arm/boot/dts/overlays/tc358743.dtsi @@ -0,0 +1,101 @@ @@ -42275,9 +41166,6 @@ index 000000000000..809332e9a072 + <&tc358743>, "clocks:0=",<&cam0_clk>; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts b/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts -new file mode 100644 -index 000000000000..043b25887f2d --- /dev/null +++ b/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts @@ -0,0 +1,209 @@ @@ -42490,9 +41378,6 @@ index 000000000000..043b25887f2d + keypad = <&keypad>,"status"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/tpm-slb9670-overlay.dts b/arch/arm/boot/dts/overlays/tpm-slb9670-overlay.dts -new file mode 100644 -index 000000000000..e69188503ca3 --- /dev/null +++ b/arch/arm/boot/dts/overlays/tpm-slb9670-overlay.dts @@ -0,0 +1,44 @@ @@ -42540,9 +41425,6 @@ index 000000000000..e69188503ca3 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/tpm-slb9673-overlay.dts b/arch/arm/boot/dts/overlays/tpm-slb9673-overlay.dts -new file mode 100644 -index 000000000000..ed6de957e96c --- /dev/null +++ b/arch/arm/boot/dts/overlays/tpm-slb9673-overlay.dts @@ -0,0 +1,51 @@ @@ -42597,9 +41479,6 @@ index 000000000000..ed6de957e96c + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/uart0-overlay.dts b/arch/arm/boot/dts/overlays/uart0-overlay.dts -new file mode 100755 -index 000000000000..6bf2e0fd5c61 --- /dev/null +++ b/arch/arm/boot/dts/overlays/uart0-overlay.dts @@ -0,0 +1,32 @@ @@ -42635,9 +41514,6 @@ index 000000000000..6bf2e0fd5c61 + pin_func = <&uart0_pins>,"brcm,function:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/uart0-pi5-overlay.dts b/arch/arm/boot/dts/overlays/uart0-pi5-overlay.dts -new file mode 100755 -index 000000000000..3cc9843b812d --- /dev/null +++ b/arch/arm/boot/dts/overlays/uart0-pi5-overlay.dts @@ -0,0 +1,18 @@ @@ -42659,9 +41535,6 @@ index 000000000000..3cc9843b812d + ctsrts = <&frag0>,"pinctrl-0:4=",<&uart0_ctsrts_pins>; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/uart1-overlay.dts b/arch/arm/boot/dts/overlays/uart1-overlay.dts -new file mode 100644 -index 000000000000..64163bf932b7 --- /dev/null +++ b/arch/arm/boot/dts/overlays/uart1-overlay.dts @@ -0,0 +1,38 @@ @@ -42703,9 +41576,6 @@ index 000000000000..64163bf932b7 + rxd1_pin = <&uart1_pins>,"brcm,pins:4"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/uart1-pi5-overlay.dts b/arch/arm/boot/dts/overlays/uart1-pi5-overlay.dts -new file mode 100755 -index 000000000000..739f5a941ffa --- /dev/null +++ b/arch/arm/boot/dts/overlays/uart1-pi5-overlay.dts @@ -0,0 +1,18 @@ @@ -42727,9 +41597,6 @@ index 000000000000..739f5a941ffa + ctsrts = <&frag0>,"pinctrl-0:4=",<&uart1_ctsrts_pins>; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/uart2-overlay.dts b/arch/arm/boot/dts/overlays/uart2-overlay.dts -new file mode 100644 -index 000000000000..4efbbed72619 --- /dev/null +++ b/arch/arm/boot/dts/overlays/uart2-overlay.dts @@ -0,0 +1,37 @@ @@ -42770,9 +41637,6 @@ index 000000000000..4efbbed72619 + rs485_rts_off_delay = <&rs485>, "rs485-rts-delay:4"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/uart2-pi5-overlay.dts b/arch/arm/boot/dts/overlays/uart2-pi5-overlay.dts -new file mode 100755 -index 000000000000..1df956425d3a --- /dev/null +++ b/arch/arm/boot/dts/overlays/uart2-pi5-overlay.dts @@ -0,0 +1,18 @@ @@ -42794,9 +41658,6 @@ index 000000000000..1df956425d3a + ctsrts = <&frag0>,"pinctrl-0:4=",<&uart2_ctsrts_pins>; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/uart3-overlay.dts b/arch/arm/boot/dts/overlays/uart3-overlay.dts -new file mode 100644 -index 000000000000..a1a5c12f46e2 --- /dev/null +++ b/arch/arm/boot/dts/overlays/uart3-overlay.dts @@ -0,0 +1,37 @@ @@ -42837,9 +41698,6 @@ index 000000000000..a1a5c12f46e2 + rs485_rts_off_delay = <&rs485>, "rs485-rts-delay:4"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/uart3-pi5-overlay.dts b/arch/arm/boot/dts/overlays/uart3-pi5-overlay.dts -new file mode 100755 -index 000000000000..d8ef51b403dd --- /dev/null +++ b/arch/arm/boot/dts/overlays/uart3-pi5-overlay.dts @@ -0,0 +1,18 @@ @@ -42861,9 +41719,6 @@ index 000000000000..d8ef51b403dd + ctsrts = <&frag0>,"pinctrl-0:4=",<&uart3_ctsrts_pins>; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/uart4-overlay.dts b/arch/arm/boot/dts/overlays/uart4-overlay.dts -new file mode 100644 -index 000000000000..782e0928393f --- /dev/null +++ b/arch/arm/boot/dts/overlays/uart4-overlay.dts @@ -0,0 +1,37 @@ @@ -42904,9 +41759,6 @@ index 000000000000..782e0928393f + rs485_rts_off_delay = <&rs485>, "rs485-rts-delay:4"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/uart4-pi5-overlay.dts b/arch/arm/boot/dts/overlays/uart4-pi5-overlay.dts -new file mode 100755 -index 000000000000..7ce5be8cc95c --- /dev/null +++ b/arch/arm/boot/dts/overlays/uart4-pi5-overlay.dts @@ -0,0 +1,18 @@ @@ -42928,9 +41780,6 @@ index 000000000000..7ce5be8cc95c + ctsrts = <&frag0>,"pinctrl-0:4=",<&uart4_ctsrts_pins>; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/uart5-overlay.dts b/arch/arm/boot/dts/overlays/uart5-overlay.dts -new file mode 100644 -index 000000000000..228598ebcec3 --- /dev/null +++ b/arch/arm/boot/dts/overlays/uart5-overlay.dts @@ -0,0 +1,37 @@ @@ -42971,9 +41820,6 @@ index 000000000000..228598ebcec3 + rs485_rts_off_delay = <&rs485>, "rs485-rts-delay:4"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/udrc-overlay.dts b/arch/arm/boot/dts/overlays/udrc-overlay.dts -new file mode 100644 -index 000000000000..24a2432ccd29 --- /dev/null +++ b/arch/arm/boot/dts/overlays/udrc-overlay.dts @@ -0,0 +1,124 @@ @@ -43101,9 +41947,6 @@ index 000000000000..24a2432ccd29 + alsaname = <&snd>, "simple-audio-card,name"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/ugreen-dabboard-overlay.dts b/arch/arm/boot/dts/overlays/ugreen-dabboard-overlay.dts -new file mode 100644 -index 000000000000..234f1f38225b --- /dev/null +++ b/arch/arm/boot/dts/overlays/ugreen-dabboard-overlay.dts @@ -0,0 +1,49 @@ @@ -43156,9 +41999,6 @@ index 000000000000..234f1f38225b + card-name = <&sound_overlay>,"simple-audio-card,name"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/upstream-overlay.dts b/arch/arm/boot/dts/overlays/upstream-overlay.dts -new file mode 100644 -index 000000000000..55a99736a33b --- /dev/null +++ b/arch/arm/boot/dts/overlays/upstream-overlay.dts @@ -0,0 +1,101 @@ @@ -43263,9 +42103,6 @@ index 000000000000..55a99736a33b + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts b/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts -new file mode 100644 -index 000000000000..1dc60ae6d967 --- /dev/null +++ b/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts @@ -0,0 +1,137 @@ @@ -43406,9 +42243,6 @@ index 000000000000..1dc60ae6d967 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/vc4-fkms-v3d-overlay.dts b/arch/arm/boot/dts/overlays/vc4-fkms-v3d-overlay.dts -new file mode 100644 -index 000000000000..847a98f2a10c --- /dev/null +++ b/arch/arm/boot/dts/overlays/vc4-fkms-v3d-overlay.dts @@ -0,0 +1,43 @@ @@ -43455,9 +42289,6 @@ index 000000000000..847a98f2a10c + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/vc4-fkms-v3d-pi4-overlay.dts b/arch/arm/boot/dts/overlays/vc4-fkms-v3d-pi4-overlay.dts -new file mode 100644 -index 000000000000..39e78280d475 --- /dev/null +++ b/arch/arm/boot/dts/overlays/vc4-fkms-v3d-pi4-overlay.dts @@ -0,0 +1,47 @@ @@ -43508,9 +42339,6 @@ index 000000000000..39e78280d475 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/vc4-kms-dpi-generic-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-dpi-generic-overlay.dts -new file mode 100644 -index 000000000000..8cf41167d4cc --- /dev/null +++ b/arch/arm/boot/dts/overlays/vc4-kms-dpi-generic-overlay.dts @@ -0,0 +1,83 @@ @@ -43597,9 +42425,6 @@ index 000000000000..8cf41167d4cc + rgb-order = <&dpi_node_generic>, "rgb_order"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/vc4-kms-dpi-hyperpixel.dtsi b/arch/arm/boot/dts/overlays/vc4-kms-dpi-hyperpixel.dtsi -new file mode 100644 -index 000000000000..585402a3b9b4 --- /dev/null +++ b/arch/arm/boot/dts/overlays/vc4-kms-dpi-hyperpixel.dtsi @@ -0,0 +1,94 @@ @@ -43697,9 +42522,6 @@ index 000000000000..585402a3b9b4 + rotate = <&panel>, "rotation:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/vc4-kms-dpi-hyperpixel2r-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-dpi-hyperpixel2r-overlay.dts -new file mode 100644 -index 000000000000..4cd9d6a55c48 --- /dev/null +++ b/arch/arm/boot/dts/overlays/vc4-kms-dpi-hyperpixel2r-overlay.dts @@ -0,0 +1,114 @@ @@ -43817,9 +42639,6 @@ index 000000000000..4cd9d6a55c48 + }; + +}; -diff --git a/arch/arm/boot/dts/overlays/vc4-kms-dpi-hyperpixel4-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-dpi-hyperpixel4-overlay.dts -new file mode 100644 -index 000000000000..eafc25ad79ff --- /dev/null +++ b/arch/arm/boot/dts/overlays/vc4-kms-dpi-hyperpixel4-overlay.dts @@ -0,0 +1,57 @@ @@ -43880,9 +42699,6 @@ index 000000000000..eafc25ad79ff + <&ft6236_5d>,"touchscreen-swapped-x-y!"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/vc4-kms-dpi-hyperpixel4sq-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-dpi-hyperpixel4sq-overlay.dts -new file mode 100644 -index 000000000000..700046348ecf --- /dev/null +++ b/arch/arm/boot/dts/overlays/vc4-kms-dpi-hyperpixel4sq-overlay.dts @@ -0,0 +1,36 @@ @@ -43922,9 +42738,6 @@ index 000000000000..700046348ecf + touchscreen-swapped-x-y = <&polytouch>,"touchscreen-swapped-x-y!"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/vc4-kms-dpi-panel-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-dpi-panel-overlay.dts -new file mode 100644 -index 000000000000..a0fe8f810e01 --- /dev/null +++ b/arch/arm/boot/dts/overlays/vc4-kms-dpi-panel-overlay.dts @@ -0,0 +1,73 @@ @@ -44001,9 +42814,6 @@ index 000000000000..a0fe8f810e01 + mzp280 = <0>, "+2+93"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/vc4-kms-dpi.dtsi b/arch/arm/boot/dts/overlays/vc4-kms-dpi.dtsi -new file mode 100644 -index 000000000000..67c884de2a8d --- /dev/null +++ b/arch/arm/boot/dts/overlays/vc4-kms-dpi.dtsi @@ -0,0 +1,111 @@ @@ -44118,9 +42928,6 @@ index 000000000000..67c884de2a8d + rotate = <&panel>, "rotation:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/vc4-kms-dsi-7inch-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-dsi-7inch-overlay.dts -new file mode 100644 -index 000000000000..8d58d5e6067f --- /dev/null +++ b/arch/arm/boot/dts/overlays/vc4-kms-dsi-7inch-overlay.dts @@ -0,0 +1,121 @@ @@ -44245,9 +43052,6 @@ index 000000000000..8d58d5e6067f + disable_touch = <&ft5406>, "status=disabled"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/vc4-kms-dsi-generic-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-dsi-generic-overlay.dts -new file mode 100644 -index 000000000000..cf4ca5b6c75f --- /dev/null +++ b/arch/arm/boot/dts/overlays/vc4-kms-dsi-generic-overlay.dts @@ -0,0 +1,106 @@ @@ -44357,9 +43161,6 @@ index 000000000000..cf4ca5b6c75f + }; + +}; -diff --git a/arch/arm/boot/dts/overlays/vc4-kms-dsi-ili9881-5inch-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-dsi-ili9881-5inch-overlay.dts -new file mode 100644 -index 000000000000..830e28703e57 --- /dev/null +++ b/arch/arm/boot/dts/overlays/vc4-kms-dsi-ili9881-5inch-overlay.dts @@ -0,0 +1,14 @@ @@ -44377,9 +43178,6 @@ index 000000000000..830e28703e57 +&dsi_panel { + compatible = "raspberrypi,dsi-5inch"; +}; -diff --git a/arch/arm/boot/dts/overlays/vc4-kms-dsi-ili9881-7inch-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-dsi-ili9881-7inch-overlay.dts -new file mode 100644 -index 000000000000..8a1ac11f5f92 --- /dev/null +++ b/arch/arm/boot/dts/overlays/vc4-kms-dsi-ili9881-7inch-overlay.dts @@ -0,0 +1,133 @@ @@ -44516,9 +43314,6 @@ index 000000000000..8a1ac11f5f92 + rotation = <&dsi_panel>, "rotation:0"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/vc4-kms-dsi-lt070me05000-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-dsi-lt070me05000-overlay.dts -new file mode 100644 -index 000000000000..9cc6f1ae628f --- /dev/null +++ b/arch/arm/boot/dts/overlays/vc4-kms-dsi-lt070me05000-overlay.dts @@ -0,0 +1,71 @@ @@ -44593,9 +43388,6 @@ index 000000000000..9cc6f1ae628f + <<070me05000>,"dcdc-en-gpios:4"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/vc4-kms-dsi-lt070me05000-v2-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-dsi-lt070me05000-v2-overlay.dts -new file mode 100644 -index 000000000000..5dcd0f2243e2 --- /dev/null +++ b/arch/arm/boot/dts/overlays/vc4-kms-dsi-lt070me05000-v2-overlay.dts @@ -0,0 +1,64 @@ @@ -44663,9 +43455,6 @@ index 000000000000..5dcd0f2243e2 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/vc4-kms-dsi-waveshare-800x480-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-dsi-waveshare-800x480-overlay.dts -new file mode 100644 -index 000000000000..7a7058d14d6c --- /dev/null +++ b/arch/arm/boot/dts/overlays/vc4-kms-dsi-waveshare-800x480-overlay.dts @@ -0,0 +1,116 @@ @@ -44785,9 +43574,6 @@ index 000000000000..7a7058d14d6c + disable_touch = <&ft5406>, "status=disabled"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/vc4-kms-dsi-waveshare-panel-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-dsi-waveshare-panel-overlay.dts -new file mode 100644 -index 000000000000..c9faf02c907f --- /dev/null +++ b/arch/arm/boot/dts/overlays/vc4-kms-dsi-waveshare-panel-overlay.dts @@ -0,0 +1,146 @@ @@ -44937,9 +43723,6 @@ index 000000000000..c9faf02c907f + <&i2c_frag>, "target:0=",<&i2c_csi_dsi0>; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/vc4-kms-dsi-waveshare-panel-v2-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-dsi-waveshare-panel-v2-overlay.dts -new file mode 100644 -index 000000000000..ddb085d03cfa --- /dev/null +++ b/arch/arm/boot/dts/overlays/vc4-kms-dsi-waveshare-panel-v2-overlay.dts @@ -0,0 +1,111 @@ @@ -45054,9 +43837,6 @@ index 000000000000..ddb085d03cfa + <&i2c_frag>, "target:0=",<&i2c_csi_dsi0>; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/vc4-kms-kippah-7inch-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-kippah-7inch-overlay.dts -new file mode 100644 -index 000000000000..4c1aa1c70158 --- /dev/null +++ b/arch/arm/boot/dts/overlays/vc4-kms-kippah-7inch-overlay.dts @@ -0,0 +1,26 @@ @@ -45086,9 +43866,6 @@ index 000000000000..4c1aa1c70158 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts -new file mode 100644 -index 000000000000..f0b531b18dfc --- /dev/null +++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts @@ -0,0 +1,121 @@ @@ -45213,9 +43990,6 @@ index 000000000000..f0b531b18dfc + nohdmi = <0>, "-1-7"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts -new file mode 100644 -index 000000000000..02bbad743d77 --- /dev/null +++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts @@ -0,0 +1,197 @@ @@ -45416,9 +44190,6 @@ index 000000000000..02bbad743d77 + nohdmi = <0>, "-1-2-3-4-8-10"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi5-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi5-overlay.dts -new file mode 100644 -index 000000000000..d469e717b570 --- /dev/null +++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi5-overlay.dts @@ -0,0 +1,142 @@ @@ -45564,9 +44335,6 @@ index 000000000000..d469e717b570 + nohdmi = <0>, "-3-4-5-6-10-11"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/vc4-kms-vga666-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-vga666-overlay.dts -new file mode 100644 -index 000000000000..c3a682d5b7d9 --- /dev/null +++ b/arch/arm/boot/dts/overlays/vc4-kms-vga666-overlay.dts @@ -0,0 +1,107 @@ @@ -45677,9 +44445,6 @@ index 000000000000..c3a682d5b7d9 + ddc = <0>,"=2", <0>,"=3", <0>,"=4", <0>,"=5"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/vec-gpio-pi5-overlay.dts b/arch/arm/boot/dts/overlays/vec-gpio-pi5-overlay.dts -new file mode 100644 -index 000000000000..6a99f0d0909b --- /dev/null +++ b/arch/arm/boot/dts/overlays/vec-gpio-pi5-overlay.dts @@ -0,0 +1,48 @@ @@ -45731,9 +44496,6 @@ index 000000000000..6a99f0d0909b + clk = <&rp1vec_overlay>, "pinctrl-0:8=", <&rp1vec_clkpin>; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/vga666-overlay.dts b/arch/arm/boot/dts/overlays/vga666-overlay.dts -new file mode 100644 -index 000000000000..a4968d180a5d --- /dev/null +++ b/arch/arm/boot/dts/overlays/vga666-overlay.dts @@ -0,0 +1,30 @@ @@ -45767,9 +44529,6 @@ index 000000000000..a4968d180a5d + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/vl805-overlay.dts b/arch/arm/boot/dts/overlays/vl805-overlay.dts -new file mode 100644 -index 000000000000..81adf34b29f2 --- /dev/null +++ b/arch/arm/boot/dts/overlays/vl805-overlay.dts @@ -0,0 +1,18 @@ @@ -45791,9 +44550,6 @@ index 000000000000..81adf34b29f2 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/w1-gpio-overlay.dts b/arch/arm/boot/dts/overlays/w1-gpio-overlay.dts -new file mode 100644 -index 000000000000..f44e325bc1f2 --- /dev/null +++ b/arch/arm/boot/dts/overlays/w1-gpio-overlay.dts @@ -0,0 +1,40 @@ @@ -45837,9 +44593,6 @@ index 000000000000..f44e325bc1f2 + pullup; // Silently ignore unneeded parameter + }; +}; -diff --git a/arch/arm/boot/dts/overlays/w1-gpio-pi5-overlay.dts b/arch/arm/boot/dts/overlays/w1-gpio-pi5-overlay.dts -new file mode 100644 -index 000000000000..36f60548a7c8 --- /dev/null +++ b/arch/arm/boot/dts/overlays/w1-gpio-pi5-overlay.dts @@ -0,0 +1,12 @@ @@ -45855,9 +44608,6 @@ index 000000000000..36f60548a7c8 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/w1-gpio-pullup-overlay.dts b/arch/arm/boot/dts/overlays/w1-gpio-pullup-overlay.dts -new file mode 100644 -index 000000000000..953c6a1aeab9 --- /dev/null +++ b/arch/arm/boot/dts/overlays/w1-gpio-pullup-overlay.dts @@ -0,0 +1,42 @@ @@ -45903,9 +44653,6 @@ index 000000000000..953c6a1aeab9 + pullup; // Silently ignore unneeded parameter + }; +}; -diff --git a/arch/arm/boot/dts/overlays/w1-gpio-pullup-pi5-overlay.dts b/arch/arm/boot/dts/overlays/w1-gpio-pullup-pi5-overlay.dts -new file mode 100644 -index 000000000000..bca44070cbac --- /dev/null +++ b/arch/arm/boot/dts/overlays/w1-gpio-pullup-pi5-overlay.dts @@ -0,0 +1,12 @@ @@ -45921,9 +44668,6 @@ index 000000000000..bca44070cbac + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/w5500-overlay.dts b/arch/arm/boot/dts/overlays/w5500-overlay.dts -new file mode 100644 -index 000000000000..4d3e66296753 --- /dev/null +++ b/arch/arm/boot/dts/overlays/w5500-overlay.dts @@ -0,0 +1,63 @@ @@ -45990,9 +44734,6 @@ index 000000000000..4d3e66296753 + <0>, "!0=1"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/watterott-display-overlay.dts b/arch/arm/boot/dts/overlays/watterott-display-overlay.dts -new file mode 100644 -index 000000000000..4388706d2c38 --- /dev/null +++ b/arch/arm/boot/dts/overlays/watterott-display-overlay.dts @@ -0,0 +1,150 @@ @@ -46146,9 +44887,6 @@ index 000000000000..4388706d2c38 + <&rpi_display_pins>, "brcm,function:0=2"; /* Alt5 */ + }; +}; -diff --git a/arch/arm/boot/dts/overlays/waveshare-can-fd-hat-mode-a-overlay.dts b/arch/arm/boot/dts/overlays/waveshare-can-fd-hat-mode-a-overlay.dts -new file mode 100644 -index 000000000000..59388cc3b0b9 --- /dev/null +++ b/arch/arm/boot/dts/overlays/waveshare-can-fd-hat-mode-a-overlay.dts @@ -0,0 +1,140 @@ @@ -46292,9 +45030,6 @@ index 000000000000..59388cc3b0b9 + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/waveshare-can-fd-hat-mode-b-overlay.dts b/arch/arm/boot/dts/overlays/waveshare-can-fd-hat-mode-b-overlay.dts -new file mode 100644 -index 000000000000..b2504922c8de --- /dev/null +++ b/arch/arm/boot/dts/overlays/waveshare-can-fd-hat-mode-b-overlay.dts @@ -0,0 +1,103 @@ @@ -46401,9 +45136,6 @@ index 000000000000..b2504922c8de + }; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/wifimac-overlay.dts b/arch/arm/boot/dts/overlays/wifimac-overlay.dts -new file mode 100644 -index 000000000000..505b9e3e4e3f --- /dev/null +++ b/arch/arm/boot/dts/overlays/wifimac-overlay.dts @@ -0,0 +1,21 @@ @@ -46428,9 +45160,6 @@ index 000000000000..505b9e3e4e3f + wifi0; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/wittypi-overlay.dts b/arch/arm/boot/dts/overlays/wittypi-overlay.dts -new file mode 100644 -index 000000000000..71ce806186de --- /dev/null +++ b/arch/arm/boot/dts/overlays/wittypi-overlay.dts @@ -0,0 +1,44 @@ @@ -46478,9 +45207,6 @@ index 000000000000..71ce806186de + }; + +}; -diff --git a/arch/arm/boot/dts/overlays/wm8960-soundcard-overlay.dts b/arch/arm/boot/dts/overlays/wm8960-soundcard-overlay.dts -new file mode 100644 -index 000000000000..d896c59f469b --- /dev/null +++ b/arch/arm/boot/dts/overlays/wm8960-soundcard-overlay.dts @@ -0,0 +1,82 @@ @@ -46566,9 +45292,6 @@ index 000000000000..d896c59f469b + compatible = <&wm8960>,"compatible"; + }; +}; -diff --git a/arch/arm/boot/dts/overlays/ws2812-pio-overlay.dts b/arch/arm/boot/dts/overlays/ws2812-pio-overlay.dts -new file mode 100644 -index 000000000000..4550e16d44e1 --- /dev/null +++ b/arch/arm/boot/dts/overlays/ws2812-pio-overlay.dts @@ -0,0 +1,46 @@ @@ -46618,8 +45341,6 @@ index 000000000000..4550e16d44e1 + rgbw = <&ws2812_pio>, "rpi,rgbw?"; + }; +}; -diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile -index b0844404eda1..ef043d0a6746 100644 --- a/arch/arm64/boot/dts/Makefile +++ b/arch/arm64/boot/dts/Makefile @@ -38,3 +38,5 @@ subdir-y += tesla @@ -46628,11 +45349,9 @@ index b0844404eda1..ef043d0a6746 100644 subdir-y += xilinx + +subdir-y += overlays -diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile -index 83d45afc6588..ec59cc4a4524 100644 --- a/arch/arm64/boot/dts/broadcom/Makefile +++ b/arch/arm64/boot/dts/broadcom/Makefile -@@ -7,16 +7,35 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-400.dtb \ +@@ -7,16 +7,35 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rp bcm2711-rpi-4-b.dtb \ bcm2711-rpi-cm4-io.dtb \ bcm2712-rpi-5-b.dtb \ @@ -46671,76 +45390,47 @@ index 83d45afc6588..ec59cc4a4524 100644 +ifeq ($(CONFIG_ARCH_BCM2835),y) + DTC_FLAGS += -Wno-gpios_property +endif -diff --git a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-2-b.dts b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-2-b.dts -new file mode 100644 -index 000000000000..9b2c0120842a --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-2-b.dts @@ -0,0 +1 @@ +#include "arm/broadcom/bcm2710-rpi-2-b.dts" -diff --git a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts -new file mode 100644 -index 000000000000..bc869aeaee9b --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts @@ -0,0 +1 @@ +#include "arm/broadcom/bcm2710-rpi-3-b-plus.dts" -diff --git a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dts b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dts -new file mode 100644 -index 000000000000..263fc8db863a --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dts @@ -0,0 +1 @@ +#include "arm/broadcom/bcm2710-rpi-3-b.dts" -diff --git a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-cm0.dts b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-cm0.dts -new file mode 100644 -index 000000000000..1cbe2880d792 --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-cm0.dts @@ -0,0 +1 @@ +#include "arm/broadcom/bcm2710-rpi-cm0.dts" -diff --git a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-cm3.dts b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-cm3.dts -new file mode 100644 -index 000000000000..6beee41b0077 --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-cm3.dts @@ -0,0 +1 @@ +#include "arm/broadcom/bcm2710-rpi-cm3.dts" -diff --git a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-zero-2-w.dts b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-zero-2-w.dts -new file mode 100644 -index 000000000000..65fa59a939b7 --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-zero-2-w.dts @@ -0,0 +1 @@ +#include "arm/broadcom/bcm2710-rpi-zero-2-w.dts" -diff --git a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-zero-2.dts b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-zero-2.dts -new file mode 100644 -index 000000000000..65fa59a939b7 --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-zero-2.dts @@ -0,0 +1 @@ +#include "arm/broadcom/bcm2710-rpi-zero-2-w.dts" -diff --git a/arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4.dts b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4.dts -new file mode 100644 -index 000000000000..3e25a0e1797f --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4.dts @@ -0,0 +1 @@ +#include "arm/broadcom/bcm2711-rpi-cm4.dts" -diff --git a/arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4s.dts b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4s.dts -new file mode 100644 -index 000000000000..c72d752e7400 --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4s.dts @@ -0,0 +1 @@ +#include "arm/broadcom/bcm2711-rpi-cm4s.dts" -diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-d-rpi-5-b.dts b/arch/arm64/boot/dts/broadcom/bcm2712-d-rpi-5-b.dts -index 7de24d60bcd1..4c8d28a1a0dc 100644 --- a/arch/arm64/boot/dts/broadcom/bcm2712-d-rpi-5-b.dts +++ b/arch/arm64/boot/dts/broadcom/bcm2712-d-rpi-5-b.dts -@@ -35,3 +35,11 @@ &gio_aon { - "PMIC_SCL", // AON_SGPIO_04 - "PMIC_SDA"; // AON_SGPIO_05 +@@ -49,3 +49,11 @@ + &uart10 { + interrupts = ; }; + +&pinctrl_aon { @@ -46750,9 +45440,6 @@ index 7de24d60bcd1..4c8d28a1a0dc 100644 +&pinctrl { + compatible = "brcm,bcm2712c0-aon-pinctrl"; +}; -diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-ds.dtsi b/arch/arm64/boot/dts/broadcom/bcm2712-ds.dtsi -new file mode 100644 -index 000000000000..d6e4234077de --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2712-ds.dtsi @@ -0,0 +1,501 @@ @@ -47257,9 +45944,6 @@ index 000000000000..d6e4234077de + status = "disabled"; + brcm,vdm-qos-map = /bits/ 8 <8 8 8 9 10 10 11 11>; +}; -diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b-ovl-rp1.dts b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b-ovl-rp1.dts -deleted file mode 100644 -index 04738bf281eb..000000000000 --- a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b-ovl-rp1.dts +++ /dev/null @@ -1,254 +0,0 @@ @@ -47517,8 +46201,6 @@ index 04738bf281eb..000000000000 -&pcie2 { - status = "okay"; -}; -diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts -index 3e0319fdb93f..0a99dbe20e87 100644 --- a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts +++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts @@ -1,68 +1,771 @@ @@ -48331,9 +47013,6 @@ index 3e0319fdb93f..0a99dbe20e87 100644 +&pcie2 { status = "okay"; }; -diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-500.dts b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-500.dts -new file mode 100644 -index 000000000000..f543ff64200d --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-500.dts @@ -0,0 +1,142 @@ @@ -48479,9 +47158,6 @@ index 000000000000..f543ff64200d + "-", // GPIO52 + "-"; // GPIO53 +}; -diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm4io.dtsi b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm4io.dtsi -new file mode 100644 -index 000000000000..1b4c42a61817 --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm4io.dtsi @@ -0,0 +1,28 @@ @@ -48513,9 +47189,6 @@ index 000000000000..1b4c42a61817 +&rp1_usb1 { + status = "disabled"; +}; -diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5-cm4io.dts b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5-cm4io.dts -new file mode 100644 -index 000000000000..96cd7cf735d5 --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5-cm4io.dts @@ -0,0 +1,5 @@ @@ -48524,9 +47197,6 @@ index 000000000000..96cd7cf735d5 + +#include "bcm2712-rpi-cm5.dtsi" +#include "bcm2712-rpi-cm4io.dtsi" -diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5-cm5io.dts b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5-cm5io.dts -new file mode 100644 -index 000000000000..6b5e147d569d --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5-cm5io.dts @@ -0,0 +1,5 @@ @@ -48535,9 +47205,6 @@ index 000000000000..6b5e147d569d + +#include "bcm2712-rpi-cm5.dtsi" +#include "bcm2712-rpi-cm5io.dtsi" -diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi -new file mode 100644 -index 000000000000..f1a8d6776703 --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi @@ -0,0 +1,743 @@ @@ -49284,9 +47951,6 @@ index 000000000000..f1a8d6776703 + sd_cqe = <&sdio1>, "supports-cqe:0"; + }; +}; -diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5io.dtsi b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5io.dtsi -new file mode 100644 -index 000000000000..4c616a21dc76 --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5io.dtsi @@ -0,0 +1,14 @@ @@ -49304,9 +47968,6 @@ index 000000000000..4c616a21dc76 +}; + +i2c_csi_dsi: &i2c_csi_dsi1 { }; // The connector that needs no jumper to enable -diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5l-cm4io.dts b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5l-cm4io.dts -new file mode 100644 -index 000000000000..71259a673d99 --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5l-cm4io.dts @@ -0,0 +1,5 @@ @@ -49315,9 +47976,6 @@ index 000000000000..71259a673d99 + +#include "bcm2712-rpi-cm5l.dtsi" +#include "bcm2712-rpi-cm4io.dtsi" -diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5l-cm5io.dts b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5l-cm5io.dts -new file mode 100644 -index 000000000000..11a56dfb7b48 --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5l-cm5io.dts @@ -0,0 +1,5 @@ @@ -49326,9 +47984,6 @@ index 000000000000..11a56dfb7b48 + +#include "bcm2712-rpi-cm5l.dtsi" +#include "bcm2712-rpi-cm5io.dtsi" -diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5l.dtsi b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5l.dtsi -new file mode 100644 -index 000000000000..6ba1a3efdd87 --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5l.dtsi @@ -0,0 +1,21 @@ @@ -49353,9 +48008,6 @@ index 000000000000..6ba1a3efdd87 + /delete-property/ mmc-hs400-1_8v; + /delete-property/ mmc-hs400-enhanced-strobe; +}; -diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-rpi.dtsi b/arch/arm64/boot/dts/broadcom/bcm2712-rpi.dtsi -new file mode 100644 -index 000000000000..52452d0bec59 --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi.dtsi @@ -0,0 +1,503 @@ @@ -49862,11 +48514,9 @@ index 000000000000..52452d0bec59 + pinctrl-names = "default"; + pinctrl-0 = <&spi5_pins>; +}; -diff --git a/arch/arm64/boot/dts/broadcom/bcm2712.dtsi b/arch/arm64/boot/dts/broadcom/bcm2712.dtsi -index 205b87f557d6..5cf747c71004 100644 --- a/arch/arm64/boot/dts/broadcom/bcm2712.dtsi +++ b/arch/arm64/boot/dts/broadcom/bcm2712.dtsi -@@ -38,13 +38,6 @@ clk_emmc2: clk-emmc2 { +@@ -38,13 +38,6 @@ clock-frequency = <200000000>; clock-output-names = "emmc2-clock"; }; @@ -49880,8 +48530,8 @@ index 205b87f557d6..5cf747c71004 100644 }; cpus: cpus { -@@ -250,39 +243,6 @@ uart10: serial@7d001000 { - status = "disabled"; +@@ -259,39 +252,6 @@ + system-power-controller; }; - pinctrl: pinctrl@7d504100 { @@ -49920,7 +48570,7 @@ index 205b87f557d6..5cf747c71004 100644 interrupt-controller@7d517000 { compatible = "brcm,bcm7271-l2-intc"; reg = <0x7d517000 0x10>; -@@ -303,21 +263,6 @@ gio_aon: gpio@7d517c00 { +@@ -312,21 +272,6 @@ */ }; @@ -49942,7 +48592,7 @@ index 205b87f557d6..5cf747c71004 100644 gicv2: interrupt-controller@7fff9000 { compatible = "arm,gic-400"; reg = <0x7fff9000 0x1000>, -@@ -663,9 +608,14 @@ clk_108MHz: clk-108M { +@@ -672,9 +617,14 @@ hvs: hvs@107c580000 { compatible = "brcm,bcm2712-hvs"; @@ -49957,9 +48607,6 @@ index 205b87f557d6..5cf747c71004 100644 + iommus = <&iommu4>; }; }; -diff --git a/arch/arm64/boot/dts/broadcom/bcm2712d0-rpi-5-b.dts b/arch/arm64/boot/dts/broadcom/bcm2712d0-rpi-5-b.dts -new file mode 100644 -index 000000000000..d06536bc7592 --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2712d0-rpi-5-b.dts @@ -0,0 +1,107 @@ @@ -50070,9 +48717,6 @@ index 000000000000..d06536bc7592 +&hdmi1 { + dmas = <&dma40 (13|(1<<30)|(1<<24)|(10<<16)|(15<<20))>; +}; -diff --git a/arch/arm64/boot/dts/broadcom/rp1.dtsi b/arch/arm64/boot/dts/broadcom/rp1.dtsi -new file mode 100644 -index 000000000000..6a29960db576 --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/rp1.dtsi @@ -0,0 +1,1343 @@ @@ -51419,9 +50063,6 @@ index 000000000000..6a29960db576 + regulator-always-on; + }; +}; -diff --git a/arch/arm64/boot/dts/broadcom/rp1.dtso b/arch/arm64/boot/dts/broadcom/rp1.dtso -deleted file mode 100644 -index ab4f146d22c0..000000000000 --- a/arch/arm64/boot/dts/broadcom/rp1.dtso +++ /dev/null @@ -1,11 +0,0 @@ @@ -51444,9 +50085,6 @@ index 000000000000..ded08646b6f6 @@ -0,0 +1 @@ +../../../arm/boot/dts/overlays \ No newline at end of file -diff --git a/include/dt-bindings/clock/rp1.h b/include/dt-bindings/clock/rp1.h -new file mode 100644 -index 000000000000..1ebb25f16923 --- /dev/null +++ b/include/dt-bindings/clock/rp1.h @@ -0,0 +1,60 @@ @@ -51510,9 +50148,6 @@ index 000000000000..1ebb25f16923 +/* MIPI clocks managed by the DSI driver */ +#define RP1_CLK_MIPI0_DSI_BYTECLOCK 45 +#define RP1_CLK_MIPI1_DSI_BYTECLOCK 46 -diff --git a/include/dt-bindings/gpio/gpio-fsm.h b/include/dt-bindings/gpio/gpio-fsm.h -new file mode 100644 -index 000000000000..eb40cfdc71df --- /dev/null +++ b/include/dt-bindings/gpio/gpio-fsm.h @@ -0,0 +1,21 @@ @@ -51537,8 +50172,6 @@ index 000000000000..eb40cfdc71df +#define GF_SW(x) GF_IO(GF_SOFT, (x)) + +#endif -diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst -index 9d920419a62c..4be9ebd3995c 100644 --- a/scripts/Makefile.dtbinst +++ b/scripts/Makefile.dtbinst @@ -31,9 +31,14 @@ $(dst)/%: $(obj)/$(1)% @@ -51558,11 +50191,9 @@ index 9d920419a62c..4be9ebd3995c 100644 endif # CONFIG_ARCH_WANT_FLAT_DTB_INSTALL -diff --git a/scripts/Makefile.dtbs b/scripts/Makefile.dtbs -index 2d321b813600..3bcf78a9adb4 100644 --- a/scripts/Makefile.dtbs +++ b/scripts/Makefile.dtbs -@@ -13,6 +13,7 @@ base-dtb-y := $(filter %.dtb, $(call real-search, $(multi-dtb-y), .dtb, -dtbs)) +@@ -13,6 +13,7 @@ base-dtb-y := $(filter %.dtb, $(call rea dtb-y := $(addprefix $(obj)/, $(dtb-y)) multi-dtb-y := $(addprefix $(obj)/, $(multi-dtb-y)) real-dtb-y := $(addprefix $(obj)/, $(real-dtb-y)) @@ -51579,7 +50210,7 @@ index 2d321b813600..3bcf78a9adb4 100644 $(call if_changed,gen_order) # Assembly file to wrap dtb(o) -@@ -120,11 +121,32 @@ dtc_cpp_flags = -Wp,-MMD,$(depfile).pre.tmp -nostdinc -I $(DTC_INCLUDE) -undef - +@@ -120,11 +121,32 @@ dtc_cpp_flags = -Wp,-MMD,$(depfile).pre. dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp) @@ -51613,6 +50244,3 @@ index 2d321b813600..3bcf78a9adb4 100644 cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile) \ $(cmd_dtb_check) --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0022-clk-clk-bcm2835-Register-the-clocks-early-during-the.patch b/target/linux/bcm27xx/patches-6.18/0022-clk-clk-bcm2835-Register-the-clocks-early-during-the.patch index 2850028fe9f..abe6954e019 100644 --- a/target/linux/bcm27xx/patches-6.18/0022-clk-clk-bcm2835-Register-the-clocks-early-during-the.patch +++ b/target/linux/bcm27xx/patches-6.18/0022-clk-clk-bcm2835-Register-the-clocks-early-during-the.patch @@ -45,11 +45,9 @@ Signed-off-by: Alberto Solavagione drivers/clk/bcm/clk-bcm2835.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) -diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c -index 02215ea79403..3e1568938681 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c -@@ -2324,8 +2324,15 @@ static int bcm2835_clk_probe(struct platform_device *pdev) +@@ -2324,8 +2324,15 @@ static int bcm2835_clk_probe(struct plat if (ret) return ret; @@ -66,7 +64,7 @@ index 02215ea79403..3e1568938681 100644 } static const struct cprman_plat_data cprman_bcm2835_plat_data = { -@@ -2351,7 +2358,15 @@ static struct platform_driver bcm2835_clk_driver = { +@@ -2351,7 +2358,15 @@ static struct platform_driver bcm2835_cl .probe = bcm2835_clk_probe, }; @@ -83,6 +81,3 @@ index 02215ea79403..3e1568938681 100644 MODULE_AUTHOR("Eric Anholt "); MODULE_DESCRIPTION("BCM2835 clock driver"); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0023-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch b/target/linux/bcm27xx/patches-6.18/0023-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch index ad1d328817e..cf15a5798b6 100644 --- a/target/linux/bcm27xx/patches-6.18/0023-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch +++ b/target/linux/bcm27xx/patches-6.18/0023-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch @@ -12,11 +12,9 @@ Signed-off-by: Phil Elwell drivers/clk/bcm/clk-bcm2835.c | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c -index 3e1568938681..3a28bb531c78 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c -@@ -1412,6 +1412,11 @@ bcm2835_register_pll_divider(struct bcm2835_cprman *cprman, +@@ -1412,6 +1412,11 @@ bcm2835_register_pll_divider(struct bcm2 divider->div.hw.init = &init; divider->div.table = NULL; @@ -28,6 +26,3 @@ index 3e1568938681..3a28bb531c78 100644 divider->cprman = cprman; divider->data = divider_data; --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0024-clk-bcm2835-Add-claim-clocks-property.patch b/target/linux/bcm27xx/patches-6.18/0024-clk-bcm2835-Add-claim-clocks-property.patch index 603b5606c3d..0351c1b4388 100644 --- a/target/linux/bcm27xx/patches-6.18/0024-clk-bcm2835-Add-claim-clocks-property.patch +++ b/target/linux/bcm27xx/patches-6.18/0024-clk-bcm2835-Add-claim-clocks-property.patch @@ -15,11 +15,9 @@ Signed-off-by: Phil Elwell drivers/clk/bcm/clk-bcm2835.c | 43 +++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) -diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c -index 3a28bb531c78..785df427de58 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c -@@ -1340,6 +1340,8 @@ static const struct clk_ops bcm2835_vpu_clock_clk_ops = { +@@ -1340,6 +1340,8 @@ static const struct clk_ops bcm2835_vpu_ .debug_init = bcm2835_clock_debug_init, }; @@ -28,7 +26,7 @@ index 3a28bb531c78..785df427de58 100644 static struct clk_hw *bcm2835_register_pll(struct bcm2835_cprman *cprman, const void *data) { -@@ -1357,6 +1359,9 @@ static struct clk_hw *bcm2835_register_pll(struct bcm2835_cprman *cprman, +@@ -1357,6 +1359,9 @@ static struct clk_hw *bcm2835_register_p init.ops = &bcm2835_pll_clk_ops; init.flags = pll_data->flags | CLK_IGNORE_UNUSED; @@ -38,7 +36,7 @@ index 3a28bb531c78..785df427de58 100644 pll = kzalloc(sizeof(*pll), GFP_KERNEL); if (!pll) return NULL; -@@ -1413,8 +1418,10 @@ bcm2835_register_pll_divider(struct bcm2835_cprman *cprman, +@@ -1413,8 +1418,10 @@ bcm2835_register_pll_divider(struct bcm2 divider->div.table = NULL; if (!(cprman_read(cprman, divider_data->cm_reg) & divider_data->hold_mask)) { @@ -51,11 +49,10 @@ index 3a28bb531c78..785df427de58 100644 } divider->cprman = cprman; -@@ -1470,6 +1477,15 @@ static struct clk_hw *bcm2835_register_clock(struct bcm2835_cprman *cprman, - init.name = clock_data->name; +@@ -1471,6 +1478,15 @@ static struct clk_hw *bcm2835_register_c init.flags = clock_data->flags | CLK_IGNORE_UNUSED; -+ /* + /* + * Some GPIO clocks for ethernet/wifi PLLs are marked as + * critical (since some platforms use them), but if the + * firmware didn't have them turned on then they clearly @@ -64,10 +61,11 @@ index 3a28bb531c78..785df427de58 100644 + if ((cprman_read(cprman, clock_data->ctl_reg) & CM_ENABLE) == 0) + init.flags &= ~CLK_IS_CRITICAL; + - /* ++ /* * Pass the CLK_SET_RATE_PARENT flag if we are allowed to propagate * rate changes on at least of the parents. -@@ -2250,6 +2266,8 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { + */ +@@ -2250,6 +2266,8 @@ static const struct bcm2835_clk_desc clk .ctl_reg = CM_PERIICTL), }; @@ -76,7 +74,7 @@ index 3a28bb531c78..785df427de58 100644 /* * Permanently take a reference on the parent of the SDRAM clock. * -@@ -2269,6 +2287,19 @@ static int bcm2835_mark_sdc_parent_critical(struct clk *sdc) +@@ -2269,6 +2287,19 @@ static int bcm2835_mark_sdc_parent_criti return clk_prepare_enable(parent); } @@ -96,7 +94,7 @@ index 3a28bb531c78..785df427de58 100644 static int bcm2835_clk_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; -@@ -2278,6 +2309,7 @@ static int bcm2835_clk_probe(struct platform_device *pdev) +@@ -2278,6 +2309,7 @@ static int bcm2835_clk_probe(struct plat const size_t asize = ARRAY_SIZE(clk_desc_array); const struct cprman_plat_data *pdata; size_t i; @@ -104,7 +102,7 @@ index 3a28bb531c78..785df427de58 100644 int ret; pdata = of_device_get_match_data(&pdev->dev); -@@ -2296,6 +2328,13 @@ static int bcm2835_clk_probe(struct platform_device *pdev) +@@ -2296,6 +2328,13 @@ static int bcm2835_clk_probe(struct plat if (IS_ERR(cprman->regs)) return PTR_ERR(cprman->regs); @@ -118,6 +116,3 @@ index 3a28bb531c78..785df427de58 100644 memcpy(cprman->real_parent_names, cprman_parent_names, sizeof(cprman_parent_names)); of_clk_parent_fill(dev->of_node, cprman->real_parent_names, --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0025-clk-bcm2835-Read-max-core-clock-from-firmware.patch b/target/linux/bcm27xx/patches-6.18/0025-clk-bcm2835-Read-max-core-clock-from-firmware.patch index 43e1ba4a38a..a78cd0fba1e 100644 --- a/target/linux/bcm27xx/patches-6.18/0025-clk-bcm2835-Read-max-core-clock-from-firmware.patch +++ b/target/linux/bcm27xx/patches-6.18/0025-clk-bcm2835-Read-max-core-clock-from-firmware.patch @@ -30,8 +30,6 @@ Signed-off-by: Phil Elwell drivers/clk/bcm/clk-bcm2835.c | 39 ++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) -diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c -index 785df427de58..504fcae4114c 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c @@ -36,6 +36,7 @@ @@ -51,7 +49,7 @@ index 785df427de58..504fcae4114c 100644 /* * Names of clocks used within the driver that need to be replaced * with an external parent's name. This array is in the order that -@@ -314,6 +317,7 @@ static const char *const cprman_parent_names[] = { +@@ -314,6 +317,7 @@ static const char *const cprman_parent_n struct bcm2835_cprman { struct device *dev; void __iomem *regs; @@ -59,7 +57,7 @@ index 785df427de58..504fcae4114c 100644 spinlock_t regs_lock; /* spinlock for all clocks */ unsigned int soc; -@@ -1044,6 +1048,30 @@ static unsigned long bcm2835_clock_get_rate(struct clk_hw *hw, +@@ -1044,6 +1048,30 @@ static unsigned long bcm2835_clock_get_r return rate; } @@ -90,7 +88,7 @@ index 785df427de58..504fcae4114c 100644 static void bcm2835_clock_wait_busy(struct bcm2835_clock *clock) { struct bcm2835_cprman *cprman = clock->cprman; -@@ -1332,7 +1360,7 @@ static int bcm2835_vpu_clock_is_on(struct clk_hw *hw) +@@ -1332,7 +1360,7 @@ static int bcm2835_vpu_clock_is_on(struc */ static const struct clk_ops bcm2835_vpu_clock_clk_ops = { .is_prepared = bcm2835_vpu_clock_is_on, @@ -99,7 +97,7 @@ index 785df427de58..504fcae4114c 100644 .set_rate = bcm2835_clock_set_rate, .determine_rate = bcm2835_clock_determine_rate, .set_parent = bcm2835_clock_set_parent, -@@ -2308,6 +2336,7 @@ static int bcm2835_clk_probe(struct platform_device *pdev) +@@ -2308,6 +2336,7 @@ static int bcm2835_clk_probe(struct plat const struct bcm2835_clk_desc *desc; const size_t asize = ARRAY_SIZE(clk_desc_array); const struct cprman_plat_data *pdata; @@ -107,7 +105,7 @@ index 785df427de58..504fcae4114c 100644 size_t i; u32 clk_id; int ret; -@@ -2328,6 +2357,14 @@ static int bcm2835_clk_probe(struct platform_device *pdev) +@@ -2328,6 +2357,14 @@ static int bcm2835_clk_probe(struct plat if (IS_ERR(cprman->regs)) return PTR_ERR(cprman->regs); @@ -122,6 +120,3 @@ index 785df427de58..504fcae4114c 100644 memset(bcm2835_clk_claimed, 0, sizeof(bcm2835_clk_claimed)); for (i = 0; !of_property_read_u32_index(pdev->dev.of_node, "claim-clocks", --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0026-clk-bcm2835-Don-t-wait-for-pllh-lock.patch b/target/linux/bcm27xx/patches-6.18/0026-clk-bcm2835-Don-t-wait-for-pllh-lock.patch index 16bc51aa991..4230e3cdbb9 100644 --- a/target/linux/bcm27xx/patches-6.18/0026-clk-bcm2835-Don-t-wait-for-pllh-lock.patch +++ b/target/linux/bcm27xx/patches-6.18/0026-clk-bcm2835-Don-t-wait-for-pllh-lock.patch @@ -8,11 +8,9 @@ Signed-off-by: Phil Elwell drivers/clk/bcm/clk-bcm2835.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) -diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c -index 504fcae4114c..aa729951d22b 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c -@@ -652,15 +652,17 @@ static int bcm2835_pll_on(struct clk_hw *hw) +@@ -652,15 +652,17 @@ static int bcm2835_pll_on(struct clk_hw spin_unlock(&cprman->regs_lock); /* Wait for the PLL to lock. */ @@ -22,6 +20,7 @@ index 504fcae4114c..aa729951d22b 100644 - dev_err(cprman->dev, "%s: couldn't lock PLL\n", - clk_hw_get_name(hw)); - return -ETIMEDOUT; +- } + if (strcmp(data->name, "pllh")) { + timeout = ktime_add_ns(ktime_get(), LOCK_TIMEOUT_NS); + while (!(cprman_read(cprman, CM_LOCK) & data->lock_mask)) { @@ -30,14 +29,10 @@ index 504fcae4114c..aa729951d22b 100644 + clk_hw_get_name(hw)); + return -ETIMEDOUT; + } -+ -+ cpu_relax(); - } -- + - cpu_relax(); ++ cpu_relax(); ++ } } cprman_write(cprman, data->a2w_ctrl_reg, --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0027-clk-bcm2835-Add-support-for-setting-leaf-clock-rates.patch b/target/linux/bcm27xx/patches-6.18/0027-clk-bcm2835-Add-support-for-setting-leaf-clock-rates.patch index e190f3c5bcd..6386909d2da 100644 --- a/target/linux/bcm27xx/patches-6.18/0027-clk-bcm2835-Add-support-for-setting-leaf-clock-rates.patch +++ b/target/linux/bcm27xx/patches-6.18/0027-clk-bcm2835-Add-support-for-setting-leaf-clock-rates.patch @@ -12,11 +12,9 @@ Signed-off-by: Eric Anholt drivers/clk/bcm/clk-bcm2835.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) -diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c -index aa729951d22b..dd76a43dcd05 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c -@@ -1143,15 +1143,19 @@ static int bcm2835_clock_set_rate(struct clk_hw *hw, +@@ -1143,15 +1143,19 @@ static int bcm2835_clock_set_rate(struct spin_lock(&cprman->regs_lock); @@ -44,7 +42,7 @@ index aa729951d22b..dd76a43dcd05 100644 ctl |= (div & CM_DIV_FRAC_MASK) ? CM_FRAC : 0; cprman_write(cprman, data->ctl_reg, ctl); -@@ -1527,7 +1531,7 @@ static struct clk_hw *bcm2835_register_clock(struct bcm2835_cprman *cprman, +@@ -1527,7 +1531,7 @@ static struct clk_hw *bcm2835_register_c init.ops = &bcm2835_vpu_clock_clk_ops; } else { init.ops = &bcm2835_clock_clk_ops; @@ -53,6 +51,3 @@ index aa729951d22b..dd76a43dcd05 100644 /* If the clock wasn't actually enabled at boot, it's not * critical. --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0028-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch b/target/linux/bcm27xx/patches-6.18/0028-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch index 60b79d412d2..5d609e49b44 100644 --- a/target/linux/bcm27xx/patches-6.18/0028-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch +++ b/target/linux/bcm27xx/patches-6.18/0028-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch @@ -13,11 +13,9 @@ Signed-off-by: Eric Anholt drivers/clk/bcm/clk-bcm2835.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) -diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c -index dd76a43dcd05..915edad0f3b3 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c -@@ -1132,8 +1132,10 @@ static int bcm2835_clock_on(struct clk_hw *hw) +@@ -1132,8 +1132,10 @@ static int bcm2835_clock_on(struct clk_h return 0; } @@ -30,7 +28,7 @@ index dd76a43dcd05..915edad0f3b3 100644 { struct bcm2835_clock *clock = bcm2835_clock_from_hw(hw); struct bcm2835_cprman *cprman = clock->cprman; -@@ -1155,6 +1157,11 @@ static int bcm2835_clock_set_rate(struct clk_hw *hw, +@@ -1155,6 +1157,11 @@ static int bcm2835_clock_set_rate(struct bcm2835_clock_wait_busy(clock); } @@ -42,7 +40,7 @@ index dd76a43dcd05..915edad0f3b3 100644 ctl &= ~CM_FRAC; ctl |= (div & CM_DIV_FRAC_MASK) ? CM_FRAC : 0; cprman_write(cprman, data->ctl_reg, ctl); -@@ -1166,6 +1173,12 @@ static int bcm2835_clock_set_rate(struct clk_hw *hw, +@@ -1166,6 +1173,12 @@ static int bcm2835_clock_set_rate(struct return 0; } @@ -55,7 +53,7 @@ index dd76a43dcd05..915edad0f3b3 100644 static bool bcm2835_clk_is_pllc(struct clk_hw *hw) { -@@ -1349,6 +1362,7 @@ static const struct clk_ops bcm2835_clock_clk_ops = { +@@ -1349,6 +1362,7 @@ static const struct clk_ops bcm2835_cloc .unprepare = bcm2835_clock_off, .recalc_rate = bcm2835_clock_get_rate, .set_rate = bcm2835_clock_set_rate, @@ -63,7 +61,7 @@ index dd76a43dcd05..915edad0f3b3 100644 .determine_rate = bcm2835_clock_determine_rate, .set_parent = bcm2835_clock_set_parent, .get_parent = bcm2835_clock_get_parent, -@@ -1531,7 +1545,6 @@ static struct clk_hw *bcm2835_register_clock(struct bcm2835_cprman *cprman, +@@ -1531,7 +1545,6 @@ static struct clk_hw *bcm2835_register_c init.ops = &bcm2835_vpu_clock_clk_ops; } else { init.ops = &bcm2835_clock_clk_ops; @@ -71,6 +69,3 @@ index dd76a43dcd05..915edad0f3b3 100644 /* If the clock wasn't actually enabled at boot, it's not * critical. --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0029-clk-bcm2835-Avoid-null-pointer-exception.patch b/target/linux/bcm27xx/patches-6.18/0029-clk-bcm2835-Avoid-null-pointer-exception.patch index 9c7ee20e87f..a87d0ba19a6 100644 --- a/target/linux/bcm27xx/patches-6.18/0029-clk-bcm2835-Avoid-null-pointer-exception.patch +++ b/target/linux/bcm27xx/patches-6.18/0029-clk-bcm2835-Avoid-null-pointer-exception.patch @@ -10,11 +10,9 @@ Signed-off-by: popcornmix drivers/clk/bcm/clk-bcm2835.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) -diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c -index 915edad0f3b3..4478288bc586 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c -@@ -2339,9 +2339,11 @@ static bool bcm2835_clk_is_claimed(const char *name) +@@ -2339,9 +2339,11 @@ static bool bcm2835_clk_is_claimed(const int i; for (i = 0; i < ARRAY_SIZE(clk_desc_array); i++) { @@ -29,6 +27,3 @@ index 915edad0f3b3..4478288bc586 100644 } return false; --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0030-clk-bcm2835-Disable-v3d-clock.patch b/target/linux/bcm27xx/patches-6.18/0030-clk-bcm2835-Disable-v3d-clock.patch index f0b5b670679..395acebd853 100644 --- a/target/linux/bcm27xx/patches-6.18/0030-clk-bcm2835-Disable-v3d-clock.patch +++ b/target/linux/bcm27xx/patches-6.18/0030-clk-bcm2835-Disable-v3d-clock.patch @@ -14,11 +14,9 @@ Signed-off-by: Dom Cobley drivers/clk/bcm/clk-bcm2835.c | 45 ++++++++++------------------------- 1 file changed, 12 insertions(+), 33 deletions(-) -diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c -index 4478288bc586..56fb1e5db2f9 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c -@@ -1769,16 +1769,12 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { +@@ -1769,16 +1769,12 @@ static const struct bcm2835_clk_desc clk .hold_mask = CM_PLLA_HOLDCORE, .fixed_divider = 1, .flags = CLK_SET_RATE_PARENT), @@ -41,7 +39,7 @@ index 4478288bc586..56fb1e5db2f9 100644 [BCM2835_PLLA_DSI0] = REGISTER_PLL_DIV( SOC_ALL, .name = "plla_dsi0", -@@ -2079,14 +2075,12 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { +@@ -2079,14 +2075,12 @@ static const struct bcm2835_clk_desc clk .int_bits = 6, .frac_bits = 0, .tcnt_mux = 3), @@ -62,7 +60,7 @@ index 4478288bc586..56fb1e5db2f9 100644 /* * VPU clock. This doesn't have an enable bit, since it drives * the bus for everything else, and is special so it doesn't need -@@ -2249,21 +2243,6 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { +@@ -2249,21 +2243,6 @@ static const struct bcm2835_clk_desc clk .tcnt_mux = 28, .round_up = true), @@ -84,6 +82,3 @@ index 4478288bc586..56fb1e5db2f9 100644 /* dsi clocks */ [BCM2835_CLOCK_DSI0E] = REGISTER_PER_CLK( SOC_ALL, --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0031-clk-bcm2835-Use-PLLD-for-DSI0-HS-clock.patch b/target/linux/bcm27xx/patches-6.18/0031-clk-bcm2835-Use-PLLD-for-DSI0-HS-clock.patch index 4e04ba6b106..39fdc9ff22c 100644 --- a/target/linux/bcm27xx/patches-6.18/0031-clk-bcm2835-Use-PLLD-for-DSI0-HS-clock.patch +++ b/target/linux/bcm27xx/patches-6.18/0031-clk-bcm2835-Use-PLLD-for-DSI0-HS-clock.patch @@ -13,8 +13,6 @@ Signed-off-by: Dave Stevenson drivers/clk/bcm/clk-bcm2835.c | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c -index 56fb1e5db2f9..9ba61a9d9890 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c @@ -107,6 +107,7 @@ @@ -25,7 +23,7 @@ index 56fb1e5db2f9..9ba61a9d9890 100644 #define CM_PULSECTL 0x190 #define CM_PULSEDIV 0x194 #define CM_SDCCTL 0x1a8 -@@ -2357,6 +2358,9 @@ static int bcm2835_clk_probe(struct platform_device *pdev) +@@ -2357,6 +2358,9 @@ static int bcm2835_clk_probe(struct plat if (IS_ERR(cprman->regs)) return PTR_ERR(cprman->regs); @@ -35,6 +33,3 @@ index 56fb1e5db2f9..9ba61a9d9890 100644 fw_node = of_parse_phandle(dev->of_node, "firmware", 0); if (fw_node) { struct rpi_firmware *fw = rpi_firmware_get(fw_node); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0032-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch b/target/linux/bcm27xx/patches-6.18/0032-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch index 209c3fa4667..b6bfc2b4499 100644 --- a/target/linux/bcm27xx/patches-6.18/0032-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch +++ b/target/linux/bcm27xx/patches-6.18/0032-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch @@ -9,8 +9,6 @@ See: http://forum.kodi.tv/showthread.php?tid=285288 drivers/net/usb/smsc95xx.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) -diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c -index de733e0488bf..14eb4b6b41e3 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c @@ -82,6 +82,10 @@ static bool turbo_mode = true; @@ -24,7 +22,7 @@ index de733e0488bf..14eb4b6b41e3 100644 static int __must_check smsc95xx_read_reg(struct usbnet *dev, u32 index, u32 *data) { -@@ -993,13 +997,13 @@ static int smsc95xx_reset(struct usbnet *dev) +@@ -993,13 +997,13 @@ static int smsc95xx_reset(struct usbnet if (!turbo_mode) { burst_cap = 0; @@ -43,6 +41,3 @@ index de733e0488bf..14eb4b6b41e3 100644 } netif_dbg(dev, ifup, dev->net, "rx_urb_size=%ld\n", --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0033-Allow-mac-address-to-be-set-in-smsc95xx.patch b/target/linux/bcm27xx/patches-6.18/0033-Allow-mac-address-to-be-set-in-smsc95xx.patch index 67dfe8acdbf..aa9b7c257b2 100644 --- a/target/linux/bcm27xx/patches-6.18/0033-Allow-mac-address-to-be-set-in-smsc95xx.patch +++ b/target/linux/bcm27xx/patches-6.18/0033-Allow-mac-address-to-be-set-in-smsc95xx.patch @@ -20,8 +20,6 @@ Signed-off-by: Phil Elwell drivers/net/usb/smsc95xx.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) -diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c -index 14eb4b6b41e3..b83a9840e3c6 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c @@ -86,6 +86,10 @@ static int packetsize = 2560; @@ -35,7 +33,7 @@ index 14eb4b6b41e3..b83a9840e3c6 100644 static int __must_check smsc95xx_read_reg(struct usbnet *dev, u32 index, u32 *data) { -@@ -866,6 +870,21 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd) +@@ -866,6 +870,21 @@ static int smsc95xx_ioctl(struct net_dev return phy_mii_ioctl(netdev->phydev, rq, cmd); } @@ -57,10 +55,11 @@ index 14eb4b6b41e3..b83a9840e3c6 100644 static void smsc95xx_init_mac_address(struct usbnet *dev) { u8 addr[ETH_ALEN]; -@@ -889,6 +908,14 @@ static void smsc95xx_init_mac_address(struct usbnet *dev) +@@ -888,6 +907,14 @@ static void smsc95xx_init_mac_address(st + return; } } - ++ + /* Check module parameters */ + if (smsc95xx_macaddr_param(dev, dev->net) == 0) { + if (is_valid_ether_addr(dev->net->dev_addr)) { @@ -68,10 +67,6 @@ index 14eb4b6b41e3..b83a9840e3c6 100644 + return; + } + } -+ + /* no useful static MAC address found. generate a random one */ eth_hw_addr_random(dev->net); - netif_dbg(dev, ifup, dev->net, "MAC address set to eth_random_addr\n"); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0034-Protect-__release_resource-against-resources-without.patch b/target/linux/bcm27xx/patches-6.18/0034-Protect-__release_resource-against-resources-without.patch index e430676397a..7dc61e5acb7 100644 --- a/target/linux/bcm27xx/patches-6.18/0034-Protect-__release_resource-against-resources-without.patch +++ b/target/linux/bcm27xx/patches-6.18/0034-Protect-__release_resource-against-resources-without.patch @@ -10,11 +10,9 @@ Signed-off-by: Phil Elwell kernel/resource.c | 6 ++++++ 1 file changed, 6 insertions(+) -diff --git a/kernel/resource.c b/kernel/resource.c -index e4e9bac12e6e..edbe8ef7e8ef 100644 --- a/kernel/resource.c +++ b/kernel/resource.c -@@ -210,6 +210,12 @@ static int __release_resource(struct resource *old, bool release_child) +@@ -210,6 +210,12 @@ static int __release_resource(struct res { struct resource *tmp, **p, *chd; @@ -27,6 +25,3 @@ index e4e9bac12e6e..edbe8ef7e8ef 100644 p = &old->parent->child; for (;;) { tmp = *p; --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0035-irq-bcm2836-Avoid-Invalid-trigger-warning.patch b/target/linux/bcm27xx/patches-6.18/0035-irq-bcm2836-Avoid-Invalid-trigger-warning.patch index 9b92dc1f9bc..f7144cba522 100644 --- a/target/linux/bcm27xx/patches-6.18/0035-irq-bcm2836-Avoid-Invalid-trigger-warning.patch +++ b/target/linux/bcm27xx/patches-6.18/0035-irq-bcm2836-Avoid-Invalid-trigger-warning.patch @@ -11,11 +11,9 @@ Signed-off-by: Phil Elwell drivers/irqchip/irq-bcm2836.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/irqchip/irq-bcm2836.c b/drivers/irqchip/irq-bcm2836.c -index fafd1f71348e..067027467113 100644 --- a/drivers/irqchip/irq-bcm2836.c +++ b/drivers/irqchip/irq-bcm2836.c -@@ -131,7 +131,7 @@ static int bcm2836_map(struct irq_domain *d, unsigned int irq, +@@ -131,7 +131,7 @@ static int bcm2836_map(struct irq_domain irq_set_percpu_devid(irq); irq_domain_set_info(d, irq, hw, chip, d->host_data, handle_percpu_devid_irq, NULL, NULL); @@ -24,6 +22,3 @@ index fafd1f71348e..067027467113 100644 return 0; } --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0036-irqchip-bcm2835-Add-FIQ-support.patch b/target/linux/bcm27xx/patches-6.18/0036-irqchip-bcm2835-Add-FIQ-support.patch index 5c51330984f..623b6f4e796 100644 --- a/target/linux/bcm27xx/patches-6.18/0036-irqchip-bcm2835-Add-FIQ-support.patch +++ b/target/linux/bcm27xx/patches-6.18/0036-irqchip-bcm2835-Add-FIQ-support.patch @@ -18,8 +18,6 @@ Acked-by: Stephen Warren drivers/irqchip/irq-bcm2835.c | 49 ++++++++++++++++++++++++++++++++--- 2 files changed, 46 insertions(+), 4 deletions(-) -diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig -index 24bc6e18d806..882a8dc508f2 100644 --- a/arch/arm/mach-bcm/Kconfig +++ b/arch/arm/mach-bcm/Kconfig @@ -158,6 +158,7 @@ config ARCH_BCM2835 @@ -30,8 +28,6 @@ index 24bc6e18d806..882a8dc508f2 100644 select PINCTRL select PINCTRL_BCM2835 select MFD_CORE -diff --git a/drivers/irqchip/irq-bcm2835.c b/drivers/irqchip/irq-bcm2835.c -index 1e384c870350..34003a61702c 100644 --- a/drivers/irqchip/irq-bcm2835.c +++ b/drivers/irqchip/irq-bcm2835.c @@ -45,7 +45,7 @@ @@ -57,7 +53,7 @@ index 1e384c870350..34003a61702c 100644 static const int reg_pending[] __initconst = { 0x00, 0x04, 0x08 }; static const int reg_enable[] __initconst = { 0x18, 0x10, 0x14 }; -@@ -89,14 +93,38 @@ static void __exception_irq_entry bcm2835_handle_irq( +@@ -89,14 +93,38 @@ static void __exception_irq_entry bcm283 struct pt_regs *regs); static void bcm2836_chained_handle_irq(struct irq_desc *desc); @@ -98,7 +94,7 @@ index 1e384c870350..34003a61702c 100644 } static struct irq_chip armctrl_chip = { -@@ -144,7 +172,8 @@ static int __init armctrl_of_init(struct device_node *node, +@@ -144,7 +172,8 @@ static int __init armctrl_of_init(struct if (!base) panic("%pOF: unable to map IC registers\n", node); @@ -108,7 +104,7 @@ index 1e384c870350..34003a61702c 100644 &armctrl_ops, NULL); if (!intc.domain) panic("%pOF: unable to create IRQ domain\n", node); -@@ -188,6 +217,18 @@ static int __init armctrl_of_init(struct device_node *node, +@@ -188,6 +217,18 @@ static int __init armctrl_of_init(struct set_handle_irq(bcm2835_handle_irq); } @@ -127,6 +123,3 @@ index 1e384c870350..34003a61702c 100644 return 0; } --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0037-irqchip-irq-bcm2835-Add-2836-FIQ-support.patch b/target/linux/bcm27xx/patches-6.18/0037-irqchip-irq-bcm2835-Add-2836-FIQ-support.patch index 03f433cd6d6..fe9f5ca8e9a 100644 --- a/target/linux/bcm27xx/patches-6.18/0037-irqchip-irq-bcm2835-Add-2836-FIQ-support.patch +++ b/target/linux/bcm27xx/patches-6.18/0037-irqchip-irq-bcm2835-Add-2836-FIQ-support.patch @@ -11,8 +11,6 @@ Signed-off-by: Noralf Trønnes drivers/irqchip/irq-bcm2835.c | 43 +++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) -diff --git a/drivers/irqchip/irq-bcm2835.c b/drivers/irqchip/irq-bcm2835.c -index 34003a61702c..3bfb4a5b23c2 100644 --- a/drivers/irqchip/irq-bcm2835.c +++ b/drivers/irqchip/irq-bcm2835.c @@ -41,8 +41,11 @@ @@ -45,7 +43,7 @@ index 34003a61702c..3bfb4a5b23c2 100644 }; static struct armctrl_ic intc __read_mostly; -@@ -119,12 +126,35 @@ static void armctrl_mask_irq(struct irq_data *d) +@@ -119,12 +126,35 @@ static void armctrl_mask_irq(struct irq_ static void armctrl_unmask_irq(struct irq_data *d) { @@ -83,7 +81,7 @@ index 34003a61702c..3bfb4a5b23c2 100644 } static struct irq_chip armctrl_chip = { -@@ -217,6 +247,15 @@ static int __init armctrl_of_init(struct device_node *node, +@@ -217,6 +247,15 @@ static int __init armctrl_of_init(struct set_handle_irq(bcm2835_handle_irq); } @@ -99,6 +97,3 @@ index 34003a61702c..3bfb4a5b23c2 100644 /* Make a duplicate irq range which is used to enable FIQ */ for (b = 0; b < NR_BANKS; b++) { for (i = 0; i < bank_irqs[b]; i++) { --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0038-spi-spidev-Completely-disable-the-spidev-warning.patch b/target/linux/bcm27xx/patches-6.18/0038-spi-spidev-Completely-disable-the-spidev-warning.patch index bcca024b042..15fed1d6ad6 100644 --- a/target/linux/bcm27xx/patches-6.18/0038-spi-spidev-Completely-disable-the-spidev-warning.patch +++ b/target/linux/bcm27xx/patches-6.18/0038-spi-spidev-Completely-disable-the-spidev-warning.patch @@ -11,11 +11,9 @@ Signed-off-by: Phil Elwell drivers/spi/spidev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c -index 461d3a0009a8..3b9045e656ce 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c -@@ -710,7 +710,7 @@ MODULE_DEVICE_TABLE(spi, spidev_spi_ids); +@@ -710,7 +710,7 @@ MODULE_DEVICE_TABLE(spi, spidev_spi_ids) */ static int spidev_of_check(struct device *dev) { @@ -24,6 +22,3 @@ index 461d3a0009a8..3b9045e656ce 100644 return 0; dev_err(dev, "spidev listed directly in DT is not supported\n"); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0039-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch b/target/linux/bcm27xx/patches-6.18/0039-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch index 0b4c9381c6f..fcbe5c0e081 100644 --- a/target/linux/bcm27xx/patches-6.18/0039-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch +++ b/target/linux/bcm27xx/patches-6.18/0039-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch @@ -168,8 +168,6 @@ Signed-off-by: Phil Elwell drivers/dma/bcm2835-dma.c | 668 +++++++++++++++++++++++++++++++------- 2 files changed, 556 insertions(+), 114 deletions(-) -diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig -index b8a74b1798ba..cab445e9b9a0 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -143,7 +143,7 @@ config BCM_SBA_RAID @@ -181,8 +179,6 @@ index b8a74b1798ba..cab445e9b9a0 100644 select DMA_ENGINE select DMA_VIRTUAL_CHANNELS -diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c -index 0117bb2e8591..dcc77ed986bb 100644 --- a/drivers/dma/bcm2835-dma.c +++ b/drivers/dma/bcm2835-dma.c @@ -25,6 +25,7 @@ @@ -406,7 +402,7 @@ index 0117bb2e8591..dcc77ed986bb 100644 static inline size_t bcm2835_dma_max_frame_length(struct bcm2835_chan *c) { /* lite and normal channels have different max frame length */ -@@ -201,6 +359,36 @@ static inline struct bcm2835_desc *to_bcm2835_dma_desc( +@@ -201,6 +359,36 @@ static inline struct bcm2835_desc *to_bc return container_of(t, struct bcm2835_desc, vd.tx); } @@ -443,7 +439,7 @@ index 0117bb2e8591..dcc77ed986bb 100644 static void bcm2835_dma_free_cb_chain(struct bcm2835_desc *desc) { size_t i; -@@ -219,45 +407,53 @@ static void bcm2835_dma_desc_free(struct virt_dma_desc *vd) +@@ -219,45 +407,53 @@ static void bcm2835_dma_desc_free(struct } static void bcm2835_dma_create_cb_set_length( @@ -502,15 +498,16 @@ index 0117bb2e8591..dcc77ed986bb 100644 - /* calculate the length that remains to reach period_length */ - control_block->length = period_len - *total_len; -+ if (c->is_40bit_channel) { -+ struct bcm2711_dma40_scb *scb = -+ (struct bcm2711_dma40_scb *)control_block; - +- - /* reset total_length for next period */ - *total_len = 0; - - /* add extrainfo bits in info */ - control_block->info |= finalextrainfo; ++ if (c->is_40bit_channel) { ++ struct bcm2711_dma40_scb *scb = ++ (struct bcm2711_dma40_scb *)control_block; ++ + scb->len = cb_len; + /* add extrainfo bits to ti */ + scb->ti |= to_bcm2711_ti(finalextrainfo); @@ -522,7 +519,7 @@ index 0117bb2e8591..dcc77ed986bb 100644 } static inline size_t bcm2835_dma_count_frames_for_sg( -@@ -280,7 +476,7 @@ static inline size_t bcm2835_dma_count_frames_for_sg( +@@ -280,7 +476,7 @@ static inline size_t bcm2835_dma_count_f /** * bcm2835_dma_create_cb_chain - create a control block and fills data in * @@ -531,7 +528,7 @@ index 0117bb2e8591..dcc77ed986bb 100644 * @direction: the direction in which we transfer * @cyclic: it is a cyclic transfer * @info: the default info bits to apply per controlblock -@@ -298,12 +494,11 @@ static inline size_t bcm2835_dma_count_frames_for_sg( +@@ -298,12 +494,11 @@ static inline size_t bcm2835_dma_count_f * @gfp: the GFP flag to use for allocation */ static struct bcm2835_desc *bcm2835_dma_create_cb_chain( @@ -545,7 +542,7 @@ index 0117bb2e8591..dcc77ed986bb 100644 size_t len = buf_len, total_len; size_t frame; struct bcm2835_desc *d; -@@ -335,11 +530,23 @@ static struct bcm2835_desc *bcm2835_dma_create_cb_chain( +@@ -335,11 +530,23 @@ static struct bcm2835_desc *bcm2835_dma_ /* fill in the control block */ control_block = cb_entry->cb; @@ -574,7 +571,7 @@ index 0117bb2e8591..dcc77ed986bb 100644 /* set up length in control_block if requested */ if (buf_len) { /* calculate length honoring period_length */ -@@ -349,25 +556,51 @@ static struct bcm2835_desc *bcm2835_dma_create_cb_chain( +@@ -349,25 +556,51 @@ static struct bcm2835_desc *bcm2835_dma_ cyclic ? finalextrainfo : 0); /* calculate new remaining length */ @@ -634,7 +631,7 @@ index 0117bb2e8591..dcc77ed986bb 100644 /* detect a size mismatch */ if (buf_len && (d->size != buf_len)) -@@ -381,13 +614,12 @@ static struct bcm2835_desc *bcm2835_dma_create_cb_chain( +@@ -381,13 +614,12 @@ error_cb: } static void bcm2835_dma_fill_cb_chain_with_sg( @@ -649,7 +646,7 @@ index 0117bb2e8591..dcc77ed986bb 100644 size_t len, max_len; unsigned int i; dma_addr_t addr; -@@ -395,14 +627,35 @@ static void bcm2835_dma_fill_cb_chain_with_sg( +@@ -395,14 +627,35 @@ static void bcm2835_dma_fill_cb_chain_wi max_len = bcm2835_dma_max_frame_length(c); for_each_sg(sgl, sgent, sg_len, i) { @@ -693,7 +690,7 @@ index 0117bb2e8591..dcc77ed986bb 100644 } } } -@@ -410,29 +663,74 @@ static void bcm2835_dma_fill_cb_chain_with_sg( +@@ -410,29 +663,74 @@ static void bcm2835_dma_fill_cb_chain_wi static void bcm2835_dma_abort(struct bcm2835_chan *c) { void __iomem *chan_base = c->chan_base; @@ -713,7 +710,9 @@ index 0117bb2e8591..dcc77ed986bb 100644 + */ + if (!readl(chan_base + BCM2711_DMA40_CB)) + return; -+ + +- /* Write 0 to the active bit - Pause the DMA */ +- writel(0, chan_base + BCM2835_DMA_CS); + /* Pause the current DMA */ + writel(readl(chan_base + BCM2711_DMA40_CS) & ~BCM2711_DMA40_ACTIVE, + chan_base + BCM2711_DMA40_CS); @@ -742,33 +741,32 @@ index 0117bb2e8591..dcc77ed986bb 100644 + */ + if (!readl(chan_base + BCM2835_DMA_ADDR)) + return; -+ -+ /* We need to clear the next DMA block pending */ -+ writel(0, chan_base + BCM2835_DMA_NEXTCB); - -- /* Write 0 to the active bit - Pause the DMA */ -- writel(0, chan_base + BCM2835_DMA_CS); -+ /* Abort the DMA, which needs to be enabled to complete */ -+ writel(readl(chan_base + BCM2835_DMA_CS) | BCM2835_DMA_ABORT | BCM2835_DMA_ACTIVE, -+ chan_base + BCM2835_DMA_CS); - /* Wait for any current AXI transfer to complete */ - while ((readl(chan_base + BCM2835_DMA_CS) & - BCM2835_DMA_WAITING_FOR_WRITES) && --timeout) - cpu_relax(); -+ /* wait for DMA to be aborted */ -+ while ((readl(chan_base + BCM2835_DMA_CS) & BCM2835_DMA_ABORT) && --timeout) -+ cpu_relax(); - +- - /* Peripheral might be stuck and fail to signal AXI write responses */ - if (!timeout) - dev_err(c->vc.chan.device->dev, - "failed to complete outstanding writes\n"); ++ /* We need to clear the next DMA block pending */ ++ writel(0, chan_base + BCM2835_DMA_NEXTCB); + +- writel(BCM2835_DMA_RESET, chan_base + BCM2835_DMA_CS); ++ /* Abort the DMA, which needs to be enabled to complete */ ++ writel(readl(chan_base + BCM2835_DMA_CS) | BCM2835_DMA_ABORT | BCM2835_DMA_ACTIVE, ++ chan_base + BCM2835_DMA_CS); ++ ++ /* wait for DMA to be aborted */ ++ while ((readl(chan_base + BCM2835_DMA_CS) & BCM2835_DMA_ABORT) && --timeout) ++ cpu_relax(); ++ + /* Write 0 to the active bit - Pause the DMA */ + writel(readl(chan_base + BCM2835_DMA_CS) & ~BCM2835_DMA_ACTIVE, + chan_base + BCM2835_DMA_CS); - -- writel(BCM2835_DMA_RESET, chan_base + BCM2835_DMA_CS); ++ + /* + * Peripheral might be stuck and fail to complete + * This is expected when dreqs are enabled but not asserted @@ -786,7 +784,7 @@ index 0117bb2e8591..dcc77ed986bb 100644 } static void bcm2835_dma_start_desc(struct bcm2835_chan *c) -@@ -449,8 +747,16 @@ static void bcm2835_dma_start_desc(struct bcm2835_chan *c) +@@ -449,8 +747,16 @@ static void bcm2835_dma_start_desc(struc c->desc = d = to_bcm2835_dma_desc(&vd->tx); @@ -805,7 +803,7 @@ index 0117bb2e8591..dcc77ed986bb 100644 } static irqreturn_t bcm2835_dma_callback(int irq, void *data) -@@ -477,8 +783,13 @@ static irqreturn_t bcm2835_dma_callback(int irq, void *data) +@@ -477,8 +783,13 @@ static irqreturn_t bcm2835_dma_callback( * if this IRQ handler is threaded.) If the channel is finished, it * will remain idle despite the ACTIVE flag being set. */ @@ -821,7 +819,7 @@ index 0117bb2e8591..dcc77ed986bb 100644 d = c->desc; -@@ -540,20 +851,39 @@ static size_t bcm2835_dma_desc_size_pos(struct bcm2835_desc *d, dma_addr_t addr) +@@ -540,20 +851,39 @@ static size_t bcm2835_dma_desc_size_pos( unsigned int i; size_t size; @@ -844,7 +842,11 @@ index 0117bb2e8591..dcc77ed986bb 100644 + dma = control_block->dst; + else + dma = control_block->src; -+ + +- if (size) +- size += this_size; +- else if (addr >= dma && addr < dma + this_size) +- size += dma + this_size - addr; + if (size) + size += this_size; + else if (addr >= dma && addr < dma + this_size) @@ -855,11 +857,7 @@ index 0117bb2e8591..dcc77ed986bb 100644 + struct bcm2835_dma_cb *control_block = d->cb_list[i].cb; + size_t this_size = control_block->length; + dma_addr_t dma; - -- if (size) -- size += this_size; -- else if (addr >= dma && addr < dma + this_size) -- size += dma + this_size - addr; ++ + if (d->dir == DMA_DEV_TO_MEM) + dma = control_block->dst; + else @@ -873,7 +871,7 @@ index 0117bb2e8591..dcc77ed986bb 100644 } return size; -@@ -580,12 +910,25 @@ static enum dma_status bcm2835_dma_tx_status(struct dma_chan *chan, +@@ -580,12 +910,25 @@ static enum dma_status bcm2835_dma_tx_st struct bcm2835_desc *d = c->desc; dma_addr_t pos; @@ -902,7 +900,7 @@ index 0117bb2e8591..dcc77ed986bb 100644 txstate->residue = bcm2835_dma_desc_size_pos(d, pos); } else { -@@ -615,8 +958,10 @@ static struct dma_async_tx_descriptor *bcm2835_dma_prep_dma_memcpy( +@@ -615,8 +958,10 @@ static struct dma_async_tx_descriptor *b { struct bcm2835_chan *c = to_bcm2835_dma_chan(chan); struct bcm2835_desc *d; @@ -915,7 +913,7 @@ index 0117bb2e8591..dcc77ed986bb 100644 size_t max_len = bcm2835_dma_max_frame_length(c); size_t frames; -@@ -628,7 +973,7 @@ static struct dma_async_tx_descriptor *bcm2835_dma_prep_dma_memcpy( +@@ -628,7 +973,7 @@ static struct dma_async_tx_descriptor *b frames = bcm2835_dma_frames_for_length(len, max_len); /* allocate the CB chain - this also fills in the pointers */ @@ -924,7 +922,7 @@ index 0117bb2e8591..dcc77ed986bb 100644 info, extra, frames, src, dst, len, 0, GFP_KERNEL); if (!d) -@@ -646,7 +991,8 @@ static struct dma_async_tx_descriptor *bcm2835_dma_prep_slave_sg( +@@ -646,7 +991,8 @@ static struct dma_async_tx_descriptor *b struct bcm2835_chan *c = to_bcm2835_dma_chan(chan); struct bcm2835_desc *d; dma_addr_t src = 0, dst = 0; @@ -934,7 +932,7 @@ index 0117bb2e8591..dcc77ed986bb 100644 u32 extra = BCM2835_DMA_INT_EN; size_t frames; -@@ -662,12 +1008,14 @@ static struct dma_async_tx_descriptor *bcm2835_dma_prep_slave_sg( +@@ -662,12 +1008,14 @@ static struct dma_async_tx_descriptor *b if (direction == DMA_DEV_TO_MEM) { if (c->cfg.src_addr_width != DMA_SLAVE_BUSWIDTH_4_BYTES) return NULL; @@ -951,7 +949,7 @@ index 0117bb2e8591..dcc77ed986bb 100644 info |= BCM2835_DMA_D_DREQ | BCM2835_DMA_S_INC; } -@@ -675,7 +1023,7 @@ static struct dma_async_tx_descriptor *bcm2835_dma_prep_slave_sg( +@@ -675,7 +1023,7 @@ static struct dma_async_tx_descriptor *b frames = bcm2835_dma_count_frames_for_sg(c, sgl, sg_len); /* allocate the CB chain */ @@ -960,7 +958,7 @@ index 0117bb2e8591..dcc77ed986bb 100644 info, extra, frames, src, dst, 0, 0, GFP_NOWAIT); -@@ -683,7 +1031,7 @@ static struct dma_async_tx_descriptor *bcm2835_dma_prep_slave_sg( +@@ -683,7 +1031,7 @@ static struct dma_async_tx_descriptor *b return NULL; /* fill in frames with scatterlist pointers */ @@ -969,7 +967,7 @@ index 0117bb2e8591..dcc77ed986bb 100644 sgl, sg_len); return vchan_tx_prep(&c->vc, &d->vd, flags); -@@ -698,7 +1046,8 @@ static struct dma_async_tx_descriptor *bcm2835_dma_prep_dma_cyclic( +@@ -698,7 +1046,8 @@ static struct dma_async_tx_descriptor *b struct bcm2835_chan *c = to_bcm2835_dma_chan(chan); struct bcm2835_desc *d; dma_addr_t src, dst; @@ -979,7 +977,7 @@ index 0117bb2e8591..dcc77ed986bb 100644 u32 extra = 0; size_t max_len = bcm2835_dma_max_frame_length(c); size_t frames; -@@ -736,13 +1085,15 @@ static struct dma_async_tx_descriptor *bcm2835_dma_prep_dma_cyclic( +@@ -736,13 +1085,15 @@ static struct dma_async_tx_descriptor *b if (direction == DMA_DEV_TO_MEM) { if (c->cfg.src_addr_width != DMA_SLAVE_BUSWIDTH_4_BYTES) return NULL; @@ -997,7 +995,7 @@ index 0117bb2e8591..dcc77ed986bb 100644 src = buf_addr; info |= BCM2835_DMA_D_DREQ | BCM2835_DMA_S_INC; -@@ -762,7 +1113,7 @@ static struct dma_async_tx_descriptor *bcm2835_dma_prep_dma_cyclic( +@@ -762,7 +1113,7 @@ static struct dma_async_tx_descriptor *b * note that we need to use GFP_NOWAIT, as the ALSA i2s dmaengine * implementation calls prep_dma_cyclic with interrupts disabled. */ @@ -1006,7 +1004,7 @@ index 0117bb2e8591..dcc77ed986bb 100644 info, extra, frames, src, dst, buf_len, period_len, GFP_NOWAIT); -@@ -770,7 +1121,12 @@ static struct dma_async_tx_descriptor *bcm2835_dma_prep_dma_cyclic( +@@ -770,7 +1121,12 @@ static struct dma_async_tx_descriptor *b return NULL; /* wrap around into a loop */ @@ -1020,7 +1018,7 @@ index 0117bb2e8591..dcc77ed986bb 100644 return vchan_tx_prep(&c->vc, &d->vd, flags); } -@@ -831,9 +1187,11 @@ static int bcm2835_dma_chan_init(struct bcm2835_dmadev *d, int chan_id, +@@ -831,9 +1187,11 @@ static int bcm2835_dma_chan_init(struct c->irq_number = irq; c->irq_flags = irq_flags; @@ -1035,7 +1033,7 @@ index 0117bb2e8591..dcc77ed986bb 100644 c->is_lite_channel = true; return 0; -@@ -854,7 +1212,8 @@ static void bcm2835_dma_free(struct bcm2835_dmadev *od) +@@ -854,7 +1212,8 @@ static void bcm2835_dma_free(struct bcm2 } static const struct of_device_id bcm2835_dma_of_match[] = { @@ -1045,7 +1043,7 @@ index 0117bb2e8591..dcc77ed986bb 100644 {}, }; MODULE_DEVICE_TABLE(of, bcm2835_dma_of_match); -@@ -898,7 +1257,10 @@ static const struct dev_pm_ops bcm2835_dma_pm_ops = { +@@ -898,7 +1257,10 @@ static const struct dev_pm_ops bcm2835_d static int bcm2835_dma_probe(struct platform_device *pdev) { @@ -1056,7 +1054,7 @@ index 0117bb2e8591..dcc77ed986bb 100644 void __iomem *base; int rc; int i, j; -@@ -906,11 +1268,20 @@ static int bcm2835_dma_probe(struct platform_device *pdev) +@@ -906,11 +1268,20 @@ static int bcm2835_dma_probe(struct plat int irq_flags; uint32_t chans_available; char chan_name[BCM2835_DMA_CHAN_NAME_SIZE]; @@ -1078,7 +1076,7 @@ index 0117bb2e8591..dcc77ed986bb 100644 if (rc) { dev_err(&pdev->dev, "Unable to set DMA mask\n"); return rc; -@@ -922,10 +1293,17 @@ static int bcm2835_dma_probe(struct platform_device *pdev) +@@ -922,10 +1293,17 @@ static int bcm2835_dma_probe(struct plat dma_set_max_seg_size(&pdev->dev, 0x3FFFFFFF); @@ -1097,7 +1095,7 @@ index 0117bb2e8591..dcc77ed986bb 100644 od->base = base; dma_cap_set(DMA_SLAVE, od->ddev.cap_mask); -@@ -961,6 +1339,14 @@ static int bcm2835_dma_probe(struct platform_device *pdev) +@@ -961,6 +1339,14 @@ static int bcm2835_dma_probe(struct plat return -ENOMEM; } @@ -1112,7 +1110,7 @@ index 0117bb2e8591..dcc77ed986bb 100644 /* Request DMA channel mask from device tree */ if (of_property_read_u32(pdev->dev.of_node, "brcm,dma-channel-mask", -@@ -970,8 +1356,36 @@ static int bcm2835_dma_probe(struct platform_device *pdev) +@@ -970,8 +1356,36 @@ static int bcm2835_dma_probe(struct plat goto err_no_dma; } @@ -1150,7 +1148,7 @@ index 0117bb2e8591..dcc77ed986bb 100644 /* skip masked out channels */ if (!(chans_available & (1 << i))) { irq[i] = -1; -@@ -994,13 +1408,17 @@ static int bcm2835_dma_probe(struct platform_device *pdev) +@@ -994,13 +1408,17 @@ static int bcm2835_dma_probe(struct plat irq[i] = platform_get_irq(pdev, i < 11 ? i : 11); } @@ -1169,7 +1167,7 @@ index 0117bb2e8591..dcc77ed986bb 100644 irq_flags = 0; for (j = 0; j <= BCM2835_DMA_MAX_DMA_CHAN_SUPPORTED; j++) if ((i != j) && (irq[j] == irq[i])) { -@@ -1012,9 +1430,10 @@ static int bcm2835_dma_probe(struct platform_device *pdev) +@@ -1012,9 +1430,10 @@ static int bcm2835_dma_probe(struct plat rc = bcm2835_dma_chan_init(od, i, irq[i], irq_flags); if (rc) goto err_no_dma; @@ -1181,7 +1179,7 @@ index 0117bb2e8591..dcc77ed986bb 100644 /* Device-tree DMA controller registration */ rc = of_dma_controller_register(pdev->dev.of_node, -@@ -1044,7 +1463,15 @@ static void bcm2835_dma_remove(struct platform_device *pdev) +@@ -1044,7 +1463,15 @@ static void bcm2835_dma_remove(struct pl { struct bcm2835_dmadev *od = platform_get_drvdata(pdev); @@ -1197,7 +1195,7 @@ index 0117bb2e8591..dcc77ed986bb 100644 bcm2835_dma_free(od); } -@@ -1058,7 +1485,22 @@ static struct platform_driver bcm2835_dma_driver = { +@@ -1058,7 +1485,22 @@ static struct platform_driver bcm2835_dm }, }; @@ -1221,6 +1219,3 @@ index 0117bb2e8591..dcc77ed986bb 100644 MODULE_ALIAS("platform:bcm2835-dma"); MODULE_DESCRIPTION("BCM2835 DMA engine driver"); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0040-rtc-Add-SPI-alias-for-pcf2123-driver.patch b/target/linux/bcm27xx/patches-6.18/0040-rtc-Add-SPI-alias-for-pcf2123-driver.patch index c06b5233d7b..3933ae5c5f7 100644 --- a/target/linux/bcm27xx/patches-6.18/0040-rtc-Add-SPI-alias-for-pcf2123-driver.patch +++ b/target/linux/bcm27xx/patches-6.18/0040-rtc-Add-SPI-alias-for-pcf2123-driver.patch @@ -11,8 +11,6 @@ See: https://github.com/raspberrypi/linux/pull/1510 drivers/rtc/rtc-pcf2123.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/drivers/rtc/rtc-pcf2123.c b/drivers/rtc/rtc-pcf2123.c -index e714661e61a9..89cda4dea7f8 100644 --- a/drivers/rtc/rtc-pcf2123.c +++ b/drivers/rtc/rtc-pcf2123.c @@ -479,3 +479,4 @@ module_spi_driver(pcf2123_driver); @@ -20,6 +18,3 @@ index e714661e61a9..89cda4dea7f8 100644 MODULE_DESCRIPTION("NXP PCF2123 RTC driver"); MODULE_LICENSE("GPL"); +MODULE_ALIAS("spi:rtc-pcf2123"); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0041-watchdog-bcm2835-Support-setting-reboot-partition.patch b/target/linux/bcm27xx/patches-6.18/0041-watchdog-bcm2835-Support-setting-reboot-partition.patch index bb64615c799..ae10ed2a16a 100644 --- a/target/linux/bcm27xx/patches-6.18/0041-watchdog-bcm2835-Support-setting-reboot-partition.patch +++ b/target/linux/bcm27xx/patches-6.18/0041-watchdog-bcm2835-Support-setting-reboot-partition.patch @@ -19,8 +19,6 @@ Signed-off-by: Noralf Trønnes drivers/watchdog/bcm2835_wdt.c | 49 +++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 22 deletions(-) -diff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c -index 9fcfee63905b..b2960f67d8a8 100644 --- a/drivers/watchdog/bcm2835_wdt.c +++ b/drivers/watchdog/bcm2835_wdt.c @@ -32,13 +32,7 @@ @@ -38,7 +36,7 @@ index 9fcfee63905b..b2960f67d8a8 100644 #define SECS_TO_WDOG_TICKS(x) ((x) << 16) #define WDOG_TICKS_TO_SECS(x) ((x) >> 16) -@@ -98,9 +92,24 @@ static unsigned int bcm2835_wdt_get_timeleft(struct watchdog_device *wdog) +@@ -98,9 +92,24 @@ static unsigned int bcm2835_wdt_get_time return WDOG_TICKS_TO_SECS(ret & PM_WDOG_TIME_SET); } @@ -65,7 +63,7 @@ index 9fcfee63905b..b2960f67d8a8 100644 /* use a timeout of 10 ticks (~150us) */ writel_relaxed(10 | PM_PASSWORD, wdt->base + PM_WDOG); -@@ -118,7 +127,13 @@ static int bcm2835_restart(struct watchdog_device *wdog, +@@ -118,7 +127,13 @@ static int bcm2835_restart(struct watchd { struct bcm2835_wdt *wdt = watchdog_get_drvdata(wdog); @@ -80,7 +78,7 @@ index 9fcfee63905b..b2960f67d8a8 100644 return 0; } -@@ -153,19 +168,9 @@ static struct watchdog_device bcm2835_wdt_wdd = { +@@ -153,19 +168,9 @@ static struct watchdog_device bcm2835_wd static void bcm2835_power_off(void) { struct bcm2835_wdt *wdt = bcm2835_power_off_wdt; @@ -102,6 +100,3 @@ index 9fcfee63905b..b2960f67d8a8 100644 } static int bcm2835_wdt_probe(struct platform_device *pdev) --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0042-reboot-Use-power-off-rather-than-busy-spinning-when-.patch b/target/linux/bcm27xx/patches-6.18/0042-reboot-Use-power-off-rather-than-busy-spinning-when-.patch index 30fe4a27de4..ae2721c1206 100644 --- a/target/linux/bcm27xx/patches-6.18/0042-reboot-Use-power-off-rather-than-busy-spinning-when-.patch +++ b/target/linux/bcm27xx/patches-6.18/0042-reboot-Use-power-off-rather-than-busy-spinning-when-.patch @@ -21,8 +21,6 @@ Signed-off-by: Dom Cobley arch/arm64/kernel/process.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) -diff --git a/arch/arm/kernel/reboot.c b/arch/arm/kernel/reboot.c -index 3f0d5c3dae11..cfdbcc9826c0 100644 --- a/arch/arm/kernel/reboot.c +++ b/arch/arm/kernel/reboot.c @@ -102,9 +102,7 @@ void machine_shutdown(void) @@ -36,11 +34,9 @@ index 3f0d5c3dae11..cfdbcc9826c0 100644 } /* -diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c -index 489554931231..811f9063ab19 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c -@@ -98,9 +98,7 @@ void machine_shutdown(void) +@@ -99,9 +99,7 @@ void machine_shutdown(void) */ void machine_halt(void) { @@ -51,6 +47,3 @@ index 489554931231..811f9063ab19 100644 } /* --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0043-bcm2835-rng-Avoid-initialising-if-already-enabled.patch b/target/linux/bcm27xx/patches-6.18/0043-bcm2835-rng-Avoid-initialising-if-already-enabled.patch index 01d12dce3e1..948d950d004 100644 --- a/target/linux/bcm27xx/patches-6.18/0043-bcm2835-rng-Avoid-initialising-if-already-enabled.patch +++ b/target/linux/bcm27xx/patches-6.18/0043-bcm2835-rng-Avoid-initialising-if-already-enabled.patch @@ -8,11 +8,9 @@ Avoids the 0x40000 cycles of warmup again if firmware has already used it drivers/char/hw_random/bcm2835-rng.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -diff --git a/drivers/char/hw_random/bcm2835-rng.c b/drivers/char/hw_random/bcm2835-rng.c -index aa2b135e3ee2..d74b2c593033 100644 --- a/drivers/char/hw_random/bcm2835-rng.c +++ b/drivers/char/hw_random/bcm2835-rng.c -@@ -107,8 +107,10 @@ static int bcm2835_rng_init(struct hwrng *rng) +@@ -107,8 +107,10 @@ static int bcm2835_rng_init(struct hwrng } /* set warm-up count & enable */ @@ -25,6 +23,3 @@ index aa2b135e3ee2..d74b2c593033 100644 return ret; } --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0044-Update-vfpmodule.c.patch b/target/linux/bcm27xx/patches-6.18/0044-Update-vfpmodule.c.patch index 17b7a5a52b4..36d993cc1ec 100644 --- a/target/linux/bcm27xx/patches-6.18/0044-Update-vfpmodule.c.patch +++ b/target/linux/bcm27xx/patches-6.18/0044-Update-vfpmodule.c.patch @@ -59,11 +59,9 @@ Signed-off-by: Christopher Alexander Tobias Schulze arch/arm/vfp/vfpmodule.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) -diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c -index e559ad3cd148..4d26e72b009e 100644 --- a/arch/arm/vfp/vfpmodule.c +++ b/arch/arm/vfp/vfpmodule.c -@@ -204,8 +204,11 @@ static int vfp_notifier(struct notifier_block *self, unsigned long cmd, void *v) +@@ -204,8 +204,11 @@ static int vfp_notifier(struct notifier_ * case the thread migrates to a different CPU. The * restoring is done lazily. */ @@ -94,7 +92,7 @@ index e559ad3cd148..4d26e72b009e 100644 vfp_save_state(vfp_current_hw_state[ti->cpu], fpexc); fmxr(FPEXC, fpexc); #endif -@@ -554,7 +560,8 @@ void vfp_sync_hwstate(struct thread_info *thread) +@@ -554,7 +560,8 @@ void vfp_sync_hwstate(struct thread_info /* * Save the last VFP state on this CPU. */ @@ -104,7 +102,7 @@ index e559ad3cd148..4d26e72b009e 100644 vfp_save_state(&thread->vfpstate, fpexc | FPEXC_EN); fmxr(FPEXC, fpexc); } -@@ -620,6 +627,7 @@ int vfp_restore_user_hwstate(struct user_vfp *ufp, struct user_vfp_exc *ufp_exc) +@@ -620,6 +627,7 @@ int vfp_restore_user_hwstate(struct user struct thread_info *thread = current_thread_info(); struct vfp_hard_struct *hwstate = &thread->vfpstate.hard; unsigned long fpexc; @@ -112,7 +110,7 @@ index e559ad3cd148..4d26e72b009e 100644 /* Disable VFP to avoid corrupting the new thread state. */ vfp_flush_hwstate(thread); -@@ -642,8 +650,12 @@ int vfp_restore_user_hwstate(struct user_vfp *ufp, struct user_vfp_exc *ufp_exc) +@@ -642,8 +650,12 @@ int vfp_restore_user_hwstate(struct user /* Ensure the VFP is enabled. */ fpexc |= FPEXC_EN; @@ -137,6 +135,3 @@ index e559ad3cd148..4d26e72b009e 100644 /* * Save the userland NEON/VFP state. Under UP, --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0045-i2c-bcm2835-Add-debug-support.patch b/target/linux/bcm27xx/patches-6.18/0045-i2c-bcm2835-Add-debug-support.patch index 9f21a77bb62..d9ac231b57b 100644 --- a/target/linux/bcm27xx/patches-6.18/0045-i2c-bcm2835-Add-debug-support.patch +++ b/target/linux/bcm27xx/patches-6.18/0045-i2c-bcm2835-Add-debug-support.patch @@ -35,8 +35,6 @@ Signed-off-by: Noralf Trønnes drivers/i2c/busses/i2c-bcm2835.c | 99 +++++++++++++++++++++++++++++++- 1 file changed, 98 insertions(+), 1 deletion(-) -diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c -index 8554e790f8e3..e56349228c14 100644 --- a/drivers/i2c/busses/i2c-bcm2835.c +++ b/drivers/i2c/busses/i2c-bcm2835.c @@ -56,6 +56,18 @@ @@ -137,7 +135,7 @@ index 8554e790f8e3..e56349228c14 100644 static inline void bcm2835_i2c_writel(struct bcm2835_i2c_dev *i2c_dev, u32 reg, u32 val) { -@@ -257,6 +339,7 @@ static void bcm2835_i2c_start_transfer(struct bcm2835_i2c_dev *i2c_dev) +@@ -257,6 +339,7 @@ static void bcm2835_i2c_start_transfer(s bcm2835_i2c_writel(i2c_dev, BCM2835_I2C_A, msg->addr); bcm2835_i2c_writel(i2c_dev, BCM2835_I2C_DLEN, msg->len); bcm2835_i2c_writel(i2c_dev, BCM2835_I2C_C, c); @@ -145,7 +143,7 @@ index 8554e790f8e3..e56349228c14 100644 } static void bcm2835_i2c_finish_transfer(struct bcm2835_i2c_dev *i2c_dev) -@@ -283,6 +366,7 @@ static irqreturn_t bcm2835_i2c_isr(int this_irq, void *data) +@@ -283,6 +366,7 @@ static irqreturn_t bcm2835_i2c_isr(int t u32 val, err; val = bcm2835_i2c_readl(i2c_dev, BCM2835_I2C_S); @@ -153,7 +151,7 @@ index 8554e790f8e3..e56349228c14 100644 err = val & (BCM2835_I2C_S_CLKT | BCM2835_I2C_S_ERR); if (err) { -@@ -349,6 +433,13 @@ static int bcm2835_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], +@@ -349,6 +433,13 @@ static int bcm2835_i2c_xfer(struct i2c_a unsigned long time_left; int i; @@ -167,7 +165,7 @@ index 8554e790f8e3..e56349228c14 100644 for (i = 0; i < (num - 1); i++) if (msgs[i].flags & I2C_M_RD) { dev_warn_once(i2c_dev->dev, -@@ -367,6 +458,10 @@ static int bcm2835_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], +@@ -367,6 +458,10 @@ static int bcm2835_i2c_xfer(struct i2c_a bcm2835_i2c_finish_transfer(i2c_dev); @@ -178,7 +176,7 @@ index 8554e790f8e3..e56349228c14 100644 if (!time_left) { bcm2835_i2c_writel(i2c_dev, BCM2835_I2C_C, BCM2835_I2C_C_CLEAR); -@@ -376,7 +471,9 @@ static int bcm2835_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], +@@ -376,7 +471,9 @@ static int bcm2835_i2c_xfer(struct i2c_a if (!i2c_dev->msg_err) return num; @@ -189,6 +187,3 @@ index 8554e790f8e3..e56349228c14 100644 if (i2c_dev->msg_err & BCM2835_I2C_S_ERR) return -EREMOTEIO; --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0046-irqchip-irq-bcm2836-Remove-regmap-and-syscon-use.patch b/target/linux/bcm27xx/patches-6.18/0046-irqchip-irq-bcm2836-Remove-regmap-and-syscon-use.patch index 93a9773c1a5..265a67280bb 100644 --- a/target/linux/bcm27xx/patches-6.18/0046-irqchip-irq-bcm2836-Remove-regmap-and-syscon-use.patch +++ b/target/linux/bcm27xx/patches-6.18/0046-irqchip-irq-bcm2836-Remove-regmap-and-syscon-use.patch @@ -20,8 +20,6 @@ Signed-off-by: Phil Elwell drivers/irqchip/irq-bcm2836.c | 5 +++++ 2 files changed, 17 insertions(+), 20 deletions(-) -diff --git a/drivers/irqchip/irq-bcm2835.c b/drivers/irqchip/irq-bcm2835.c -index 3bfb4a5b23c2..9b60e4223399 100644 --- a/drivers/irqchip/irq-bcm2835.c +++ b/drivers/irqchip/irq-bcm2835.c @@ -41,8 +41,6 @@ @@ -42,7 +40,7 @@ index 3bfb4a5b23c2..9b60e4223399 100644 }; static struct armctrl_ic intc __read_mostly; -@@ -129,24 +127,20 @@ static void armctrl_unmask_irq(struct irq_data *d) +@@ -129,24 +127,20 @@ static void armctrl_unmask_irq(struct ir if (d->hwirq >= NUMBER_IRQS) { if (num_online_cpus() > 1) { unsigned int data; @@ -74,7 +72,7 @@ index 3bfb4a5b23c2..9b60e4223399 100644 } writel_relaxed(REG_FIQ_ENABLE | hwirq_to_fiq(d->hwirq), -@@ -248,12 +242,10 @@ static int __init armctrl_of_init(struct device_node *node, +@@ -248,12 +242,10 @@ static int __init armctrl_of_init(struct } if (is_2836) { @@ -91,8 +89,6 @@ index 3bfb4a5b23c2..9b60e4223399 100644 } /* Make a duplicate irq range which is used to enable FIQ */ -diff --git a/drivers/irqchip/irq-bcm2836.c b/drivers/irqchip/irq-bcm2836.c -index 067027467113..22519f3f4f66 100644 --- a/drivers/irqchip/irq-bcm2836.c +++ b/drivers/irqchip/irq-bcm2836.c @@ -22,6 +22,9 @@ struct bcm2836_arm_irqchip_intc { @@ -105,7 +101,7 @@ index 067027467113..22519f3f4f66 100644 static void bcm2836_arm_irqchip_mask_per_cpu_irq(unsigned int reg_offset, unsigned int bit, int cpu) -@@ -323,6 +326,8 @@ static int __init bcm2836_arm_irqchip_l1_intc_of_init(struct device_node *node, +@@ -323,6 +326,8 @@ static int __init bcm2836_arm_irqchip_l1 panic("%pOF: unable to map local interrupt registers\n", node); } @@ -114,6 +110,3 @@ index 067027467113..22519f3f4f66 100644 bcm2835_init_local_timer_frequency(); intc.domain = irq_domain_create_linear(of_fwnode_handle(node), LAST_IRQ + 1, --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0047-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch b/target/linux/bcm27xx/patches-6.18/0047-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch index 57d3ac55289..6fadff76a58 100644 --- a/target/linux/bcm27xx/patches-6.18/0047-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch +++ b/target/linux/bcm27xx/patches-6.18/0047-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch @@ -15,11 +15,9 @@ Signed-off-by: Phil Elwell drivers/tty/serial/amba-pl011.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c -index 7f17d288c807..f9bbfe065ba9 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c -@@ -1495,6 +1495,7 @@ static bool pl011_tx_char(struct uart_amba_port *uap, unsigned char c, +@@ -1495,6 +1495,7 @@ static bool pl011_tx_char(struct uart_am return false; /* unable to transmit character */ pl011_write(c, uap, REG_DR); @@ -27,6 +25,3 @@ index 7f17d288c807..f9bbfe065ba9 100644 uap->port.icount.tx++; return true; --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0048-amba_pl011-Add-cts-event-workaround-DT-property.patch b/target/linux/bcm27xx/patches-6.18/0048-amba_pl011-Add-cts-event-workaround-DT-property.patch index 16ab97ecb8b..e0f5055fb4d 100644 --- a/target/linux/bcm27xx/patches-6.18/0048-amba_pl011-Add-cts-event-workaround-DT-property.patch +++ b/target/linux/bcm27xx/patches-6.18/0048-amba_pl011-Add-cts-event-workaround-DT-property.patch @@ -19,8 +19,6 @@ Signed-off-by: Phil Elwell drivers/tty/serial/amba-pl011.c | 5 +++++ 2 files changed, 11 insertions(+) -diff --git a/Documentation/devicetree/bindings/serial/pl011.yaml b/Documentation/devicetree/bindings/serial/pl011.yaml -index 3fcf2d042372..e7472ef4e193 100644 --- a/Documentation/devicetree/bindings/serial/pl011.yaml +++ b/Documentation/devicetree/bindings/serial/pl011.yaml @@ -104,6 +104,12 @@ properties: @@ -36,11 +34,9 @@ index 3fcf2d042372..e7472ef4e193 100644 required: - compatible - reg -diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c -index f9bbfe065ba9..898504443644 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c -@@ -2895,6 +2895,11 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id) +@@ -2895,6 +2895,11 @@ static int pl011_probe(struct amba_devic if (IS_ERR(uap->clk)) return PTR_ERR(uap->clk); @@ -52,6 +48,3 @@ index f9bbfe065ba9..898504443644 100644 uap->reg_offset = vendor->reg_offset; uap->vendor = vendor; uap->fifosize = vendor->get_fifosize(dev); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0049-tty-amba-pl011-Avoid-rare-write-when-full-error.patch b/target/linux/bcm27xx/patches-6.18/0049-tty-amba-pl011-Avoid-rare-write-when-full-error.patch index 6b4cbdc0994..53366b6ad6e 100644 --- a/target/linux/bcm27xx/patches-6.18/0049-tty-amba-pl011-Avoid-rare-write-when-full-error.patch +++ b/target/linux/bcm27xx/patches-6.18/0049-tty-amba-pl011-Avoid-rare-write-when-full-error.patch @@ -27,11 +27,9 @@ Signed-off-by: Phil Elwell drivers/tty/serial/amba-pl011.c | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c -index 898504443644..2273ffccd2c9 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c -@@ -1528,6 +1528,10 @@ static bool pl011_tx_chars(struct uart_amba_port *uap, bool from_irq) +@@ -1528,6 +1528,10 @@ static bool pl011_tx_chars(struct uart_a if (likely(from_irq) && count-- == 0) break; @@ -42,6 +40,3 @@ index 898504443644..2273ffccd2c9 100644 if (!kfifo_peek(&tport->xmit_fifo, &c)) break; --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0050-Main-bcm2708-bcm2709-linux-port.patch b/target/linux/bcm27xx/patches-6.18/0050-Main-bcm2708-bcm2709-linux-port.patch index ba13e896866..bf1dbb7dc43 100644 --- a/target/linux/bcm27xx/patches-6.18/0050-Main-bcm2708-bcm2709-linux-port.patch +++ b/target/linux/bcm27xx/patches-6.18/0050-Main-bcm2708-bcm2709-linux-port.patch @@ -32,8 +32,6 @@ board_bcm2835: Remove coherent dma pool increase - API has gone drivers/mailbox/bcm2835-mailbox.c | 18 ++++++++++++++++-- 4 files changed, 35 insertions(+), 6 deletions(-) -diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig -index 882a8dc508f2..653a909c5ecd 100644 --- a/arch/arm/mach-bcm/Kconfig +++ b/arch/arm/mach-bcm/Kconfig @@ -162,6 +162,7 @@ config ARCH_BCM2835 @@ -44,8 +42,6 @@ index 882a8dc508f2..653a909c5ecd 100644 help This enables support for the Broadcom BCM2711 and BCM283x SoCs. This SoC is used in the Raspberry Pi and Roku 2 devices. -diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S -index 90a01f5950b9..3ff019fb1f43 100644 --- a/arch/arm/mm/proc-v6.S +++ b/arch/arm/mm/proc-v6.S @@ -75,10 +75,19 @@ SYM_FUNC_END(cpu_v6_reset) @@ -71,8 +67,6 @@ index 90a01f5950b9..3ff019fb1f43 100644 ret lr SYM_FUNC_END(cpu_v6_do_idle) -diff --git a/drivers/irqchip/irq-bcm2835.c b/drivers/irqchip/irq-bcm2835.c -index 9b60e4223399..527cc962d6fd 100644 --- a/drivers/irqchip/irq-bcm2835.c +++ b/drivers/irqchip/irq-bcm2835.c @@ -43,7 +43,9 @@ @@ -93,7 +87,7 @@ index 9b60e4223399..527cc962d6fd 100644 #define FIQ_START (NR_IRQS_BANK0 + MAKE_HWIRQ(NR_BANKS - 1, 0)) static const int reg_pending[] __initconst = { 0x00, 0x04, 0x08 }; -@@ -255,10 +258,12 @@ static int __init armctrl_of_init(struct device_node *node, +@@ -255,10 +258,12 @@ static int __init armctrl_of_init(struct MAKE_HWIRQ(b, i) + NUMBER_IRQS); BUG_ON(irq <= 0); irq_set_chip(irq, &armctrl_chip); @@ -107,8 +101,6 @@ index 9b60e4223399..527cc962d6fd 100644 return 0; } -diff --git a/drivers/mailbox/bcm2835-mailbox.c b/drivers/mailbox/bcm2835-mailbox.c -index ea12fb8d2401..8c54980b4b7e 100644 --- a/drivers/mailbox/bcm2835-mailbox.c +++ b/drivers/mailbox/bcm2835-mailbox.c @@ -45,12 +45,15 @@ @@ -127,7 +119,7 @@ index ea12fb8d2401..8c54980b4b7e 100644 struct bcm2835_mbox { void __iomem *regs; -@@ -144,7 +147,7 @@ static int bcm2835_mbox_probe(struct platform_device *pdev) +@@ -144,7 +147,7 @@ static int bcm2835_mbox_probe(struct pla return -ENOMEM; spin_lock_init(&mbox->lock); @@ -136,7 +128,7 @@ index ea12fb8d2401..8c54980b4b7e 100644 bcm2835_mbox_irq, IRQF_NO_SUSPEND, dev_name(dev), mbox); if (ret) { -@@ -193,7 +196,18 @@ static struct platform_driver bcm2835_mbox_driver = { +@@ -193,7 +196,18 @@ static struct platform_driver bcm2835_mb }, .probe = bcm2835_mbox_probe, }; @@ -156,6 +148,3 @@ index ea12fb8d2401..8c54980b4b7e 100644 MODULE_AUTHOR("Lubomir Rintel "); MODULE_DESCRIPTION("BCM2835 mailbox IPC driver"); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0051-Add-dwc_otg-driver.patch b/target/linux/bcm27xx/patches-6.18/0051-Add-dwc_otg-driver.patch index 198f09c5592..d7ad76c358d 100644 --- a/target/linux/bcm27xx/patches-6.18/0051-Add-dwc_otg-driver.patch +++ b/target/linux/bcm27xx/patches-6.18/0051-Add-dwc_otg-driver.patch @@ -1222,11 +1222,9 @@ Signed-off-by: Jonathan Bell create mode 100644 drivers/usb/host/dwc_otg/test/test_mod_param.pl create mode 100644 drivers/usb/host/dwc_otg/test/test_sysfs.pl -diff --git a/arch/arm/include/asm/irqflags.h b/arch/arm/include/asm/irqflags.h -index aeec7f24eb75..a3b186608c60 100644 --- a/arch/arm/include/asm/irqflags.h +++ b/arch/arm/include/asm/irqflags.h -@@ -163,13 +163,23 @@ static inline unsigned long arch_local_save_flags(void) +@@ -163,13 +163,23 @@ static inline unsigned long arch_local_s } /* @@ -1253,8 +1251,6 @@ index aeec7f24eb75..a3b186608c60 100644 : : "r" (flags) : "memory", "cc"); -diff --git a/arch/arm/kernel/fiqasm.S b/arch/arm/kernel/fiqasm.S -index 8dd26e1a9bd6..eef484756af2 100644 --- a/arch/arm/kernel/fiqasm.S +++ b/arch/arm/kernel/fiqasm.S @@ -47,3 +47,7 @@ ENTRY(__get_fiq_regs) @@ -1265,8 +1261,6 @@ index 8dd26e1a9bd6..eef484756af2 100644 +ENTRY(__FIQ_Branch) + mov pc, r8 +ENDPROC(__FIQ_Branch) -diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile -index 949eca0adebe..80af388baede 100644 --- a/drivers/usb/Makefile +++ b/drivers/usb/Makefile @@ -9,6 +9,7 @@ obj-$(CONFIG_USB_COMMON) += common/ @@ -1277,11 +1271,9 @@ index 949eca0adebe..80af388baede 100644 obj-$(CONFIG_USB_DWC3) += dwc3/ obj-$(CONFIG_USB_DWC2) += dwc2/ obj-$(CONFIG_USB_ISP1760) += isp1760/ -diff --git a/drivers/usb/core/generic.c b/drivers/usb/core/generic.c -index a48994e11ef3..88723aea8488 100644 --- a/drivers/usb/core/generic.c +++ b/drivers/usb/core/generic.c -@@ -202,6 +202,7 @@ int usb_choose_configuration(struct usb_device *udev) +@@ -202,6 +202,7 @@ int usb_choose_configuration(struct usb_ dev_warn(&udev->dev, "no configuration chosen from %d choice%s\n", num_configs, str_plural(num_configs)); @@ -1289,11 +1281,9 @@ index a48994e11ef3..88723aea8488 100644 } return i; } -diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index 256fe8c86828..49107595caa8 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5788,7 +5788,7 @@ static void port_event(struct usb_hub *hub, int port1) +@@ -5788,7 +5788,7 @@ static void port_event(struct usb_hub *h port_dev->over_current_count++; port_over_current_notify(port_dev); @@ -1302,11 +1292,9 @@ index 256fe8c86828..49107595caa8 100644 port_dev->over_current_count); usb_clear_port_feature(hdev, port1, USB_PORT_FEAT_C_OVER_CURRENT); -diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c -index 43522f1d6b2b..d25022abdbdc 100644 --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c -@@ -2238,6 +2238,85 @@ int usb_set_configuration(struct usb_device *dev, int configuration) +@@ -2238,6 +2238,85 @@ free_interfaces: if (cp->string == NULL && !(dev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS)) cp->string = usb_cache_string(dev, cp->desc.iConfiguration); @@ -1392,8 +1380,6 @@ index 43522f1d6b2b..d25022abdbdc 100644 /* Now that the interfaces are installed, re-enable LPM. */ usb_unlocked_enable_lpm(dev); -diff --git a/drivers/usb/core/otg_productlist.h b/drivers/usb/core/otg_productlist.h -index db67df29fb2b..b16e528859a8 100644 --- a/drivers/usb/core/otg_productlist.h +++ b/drivers/usb/core/otg_productlist.h @@ -11,33 +11,82 @@ @@ -1485,7 +1471,7 @@ index db67df29fb2b..b16e528859a8 100644 static int is_targeted(struct usb_device *dev) { struct usb_device_id *id = productlist_table; -@@ -87,16 +136,57 @@ static int is_targeted(struct usb_device *dev) +@@ -87,16 +136,57 @@ static int is_targeted(struct usb_device continue; return 1; @@ -1508,15 +1494,11 @@ index db67df29fb2b..b16e528859a8 100644 + if ((id->match_flags & USB_DEVICE_ID_MATCH_VENDOR) && + id->idVendor != le16_to_cpu(dev->descriptor.idVendor)) + continue; - ++ + if ((id->match_flags & USB_DEVICE_ID_MATCH_PRODUCT) && + id->idProduct != le16_to_cpu(dev->descriptor.idProduct)) + continue; - -- /* OTG MESSAGE: report errors here, customize to match your product */ -- dev_err(&dev->dev, "device v%04x p%04x is not supported\n", -- le16_to_cpu(dev->descriptor.idVendor), -- le16_to_cpu(dev->descriptor.idProduct)); ++ + /* No need to test id->bcdDevice_lo != 0, since 0 is never + greater than any unsigned number. */ + if ((id->match_flags & USB_DEVICE_ID_MATCH_DEV_LO) && @@ -1538,20 +1520,21 @@ index db67df29fb2b..b16e528859a8 100644 + if ((id->match_flags & USB_DEVICE_ID_MATCH_DEV_PROTOCOL) && + (id->bDeviceProtocol != dev->descriptor.bDeviceProtocol)) + continue; -+ + + return 1; + } + } -+ + +- /* OTG MESSAGE: report errors here, customize to match your product */ +- dev_err(&dev->dev, "device v%04x p%04x is not supported\n", +- le16_to_cpu(dev->descriptor.idVendor), +- le16_to_cpu(dev->descriptor.idProduct)); + /* add other match criteria here ... */ + report_errors(dev); return 0; } -diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c -new file mode 100644 -index 000000000000..a896d73f7a93 --- /dev/null +++ b/drivers/usb/gadget/file_storage.c @@ -0,0 +1,3676 @@ @@ -5231,8 +5214,6 @@ index 000000000000..a896d73f7a93 + kref_put(&fsg->ref, fsg_release); +} +module_exit(fsg_cleanup); -diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig -index c4f17ce5c77b..08e80deee437 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -687,6 +687,16 @@ config USB_RENESAS_USBHS_HCD @@ -5252,11 +5233,9 @@ index c4f17ce5c77b..08e80deee437 100644 config USB_HCD_BCMA tristate "BCMA usb host driver" depends on BCMA -diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile -index 4df946c05ba0..ca260ef6df90 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile -@@ -81,6 +81,7 @@ obj-$(CONFIG_USB_XHCI_TEGRA) += xhci-tegra.o +@@ -81,6 +81,7 @@ obj-$(CONFIG_USB_XHCI_TEGRA) += xhci-teg obj-$(CONFIG_USB_SL811_HCD) += sl811-hcd.o obj-$(CONFIG_USB_SL811_CS) += sl811_cs.o obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o @@ -5264,9 +5243,6 @@ index 4df946c05ba0..ca260ef6df90 100644 obj-$(CONFIG_USB_FSL_USB2) += fsl-mph-dr-of.o obj-$(CONFIG_USB_EHCI_FSL) += fsl-mph-dr-of.o obj-$(CONFIG_USB_EHCI_FSL) += ehci-fsl.o -diff --git a/drivers/usb/host/dwc_common_port/Makefile b/drivers/usb/host/dwc_common_port/Makefile -new file mode 100644 -index 000000000000..f10d466d1aea --- /dev/null +++ b/drivers/usb/host/dwc_common_port/Makefile @@ -0,0 +1,58 @@ @@ -5328,9 +5304,6 @@ index 000000000000..f10d466d1aea + +clean: + rm -rf *.o *.ko .*.cmd *.mod.c .*.o.d .*.o.tmp modules.order Module.markers Module.symvers .tmp_versions/ -diff --git a/drivers/usb/host/dwc_common_port/Makefile.fbsd b/drivers/usb/host/dwc_common_port/Makefile.fbsd -new file mode 100644 -index 000000000000..45db9915b9d3 --- /dev/null +++ b/drivers/usb/host/dwc_common_port/Makefile.fbsd @@ -0,0 +1,17 @@ @@ -5351,9 +5324,6 @@ index 000000000000..45db9915b9d3 + dwc_common_fbsd.c dwc_mem.c + +.include -diff --git a/drivers/usb/host/dwc_common_port/Makefile.linux b/drivers/usb/host/dwc_common_port/Makefile.linux -new file mode 100644 -index 000000000000..0cef7b461bd5 --- /dev/null +++ b/drivers/usb/host/dwc_common_port/Makefile.linux @@ -0,0 +1,49 @@ @@ -5406,9 +5376,6 @@ index 000000000000..0cef7b461bd5 + +clean: + rm -rf *.o *.ko .*.cmd *.mod.c .*.o.d .*.o.tmp modules.order Module.markers Module.symvers .tmp_versions/ -diff --git a/drivers/usb/host/dwc_common_port/changes.txt b/drivers/usb/host/dwc_common_port/changes.txt -new file mode 100644 -index 000000000000..f6839f92c276 --- /dev/null +++ b/drivers/usb/host/dwc_common_port/changes.txt @@ -0,0 +1,174 @@ @@ -5586,9 +5553,6 @@ index 000000000000..f6839f92c276 +A DWC_LIBMODULE #define has also been added. If this is not defined, then the +module code in dwc_common_linux.c is not compiled in. This allows linking the +library code directly into a driver module, instead of as a standalone module. -diff --git a/drivers/usb/host/dwc_common_port/doc/doxygen.cfg b/drivers/usb/host/dwc_common_port/doc/doxygen.cfg -new file mode 100644 -index 000000000000..89aa887af29d --- /dev/null +++ b/drivers/usb/host/dwc_common_port/doc/doxygen.cfg @@ -0,0 +1,270 @@ @@ -5862,9 +5826,6 @@ index 000000000000..89aa887af29d +# Configuration::additions related to the search engine +#--------------------------------------------------------------------------- +SEARCHENGINE = NO -diff --git a/drivers/usb/host/dwc_common_port/dwc_cc.c b/drivers/usb/host/dwc_common_port/dwc_cc.c -new file mode 100644 -index 000000000000..5ec2ae28698c --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_cc.c @@ -0,0 +1,532 @@ @@ -6400,9 +6361,6 @@ index 000000000000..5ec2ae28698c +} + +#endif /* DWC_CCLIB */ -diff --git a/drivers/usb/host/dwc_common_port/dwc_cc.h b/drivers/usb/host/dwc_common_port/dwc_cc.h -new file mode 100644 -index 000000000000..f86e6f21792b --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_cc.h @@ -0,0 +1,224 @@ @@ -6630,9 +6588,6 @@ index 000000000000..f86e6f21792b +#endif + +#endif /* _DWC_CC_H_ */ -diff --git a/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c b/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c -new file mode 100644 -index 000000000000..6dd04b58f8f6 --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c @@ -0,0 +1,1308 @@ @@ -7944,9 +7899,6 @@ index 000000000000..6dd04b58f8f6 +{ + return wq->pending; +} -diff --git a/drivers/usb/host/dwc_common_port/dwc_common_linux.c b/drivers/usb/host/dwc_common_port/dwc_common_linux.c -new file mode 100644 -index 000000000000..43a2c60c2b5f --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_common_linux.c @@ -0,0 +1,1409 @@ @@ -9359,9 +9311,6 @@ index 000000000000..43a2c60c2b5f +MODULE_LICENSE ("GPL"); + +#endif /* DWC_LIBMODULE */ -diff --git a/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c b/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c -new file mode 100644 -index 000000000000..49b07e172264 --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c @@ -0,0 +1,1275 @@ @@ -10640,9 +10589,6 @@ index 000000000000..49b07e172264 +{ + return wq->pending; +} -diff --git a/drivers/usb/host/dwc_common_port/dwc_crypto.c b/drivers/usb/host/dwc_common_port/dwc_crypto.c -new file mode 100644 -index 000000000000..3b0353296148 --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_crypto.c @@ -0,0 +1,308 @@ @@ -10954,9 +10900,6 @@ index 000000000000..3b0353296148 +} + +#endif /* DWC_CRYPTOLIB */ -diff --git a/drivers/usb/host/dwc_common_port/dwc_crypto.h b/drivers/usb/host/dwc_common_port/dwc_crypto.h -new file mode 100644 -index 000000000000..26fcddcfe9ba --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_crypto.h @@ -0,0 +1,111 @@ @@ -11071,9 +11014,6 @@ index 000000000000..26fcddcfe9ba +#endif + +#endif /* _DWC_CRYPTO_H_ */ -diff --git a/drivers/usb/host/dwc_common_port/dwc_dh.c b/drivers/usb/host/dwc_common_port/dwc_dh.c -new file mode 100644 -index 000000000000..2b429a32aaf0 --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_dh.c @@ -0,0 +1,291 @@ @@ -11368,9 +11308,6 @@ index 000000000000..2b429a32aaf0 +#endif /* !CONFIG_MACH_IPMATE */ + +#endif /* DWC_CRYPTOLIB */ -diff --git a/drivers/usb/host/dwc_common_port/dwc_dh.h b/drivers/usb/host/dwc_common_port/dwc_dh.h -new file mode 100644 -index 000000000000..25c1cc0d588a --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_dh.h @@ -0,0 +1,106 @@ @@ -11480,9 +11417,6 @@ index 000000000000..25c1cc0d588a +#endif + +#endif /* _DWC_DH_H_ */ -diff --git a/drivers/usb/host/dwc_common_port/dwc_list.h b/drivers/usb/host/dwc_common_port/dwc_list.h -new file mode 100644 -index 000000000000..4ce560df0cae --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_list.h @@ -0,0 +1,594 @@ @@ -12080,9 +12014,6 @@ index 000000000000..4ce560df0cae +#endif + +#endif /* _DWC_LIST_H_ */ -diff --git a/drivers/usb/host/dwc_common_port/dwc_mem.c b/drivers/usb/host/dwc_common_port/dwc_mem.c -new file mode 100644 -index 000000000000..ad645ff1ba7e --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_mem.c @@ -0,0 +1,245 @@ @@ -12331,9 +12262,6 @@ index 000000000000..ad645ff1ba7e +} + +#endif /* DWC_DEBUG_MEMORY */ -diff --git a/drivers/usb/host/dwc_common_port/dwc_modpow.c b/drivers/usb/host/dwc_common_port/dwc_modpow.c -new file mode 100644 -index 000000000000..20045381208a --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_modpow.c @@ -0,0 +1,636 @@ @@ -12973,9 +12901,6 @@ index 000000000000..20045381208a +#endif /* CONFIG_MACH_IPMATE */ + +#endif /*DWC_CRYPTOLIB */ -diff --git a/drivers/usb/host/dwc_common_port/dwc_modpow.h b/drivers/usb/host/dwc_common_port/dwc_modpow.h -new file mode 100644 -index 000000000000..64f00c276e71 --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_modpow.h @@ -0,0 +1,34 @@ @@ -13013,9 +12938,6 @@ index 000000000000..64f00c276e71 +#endif + +#endif /* _LINUX_BIGNUM_H */ -diff --git a/drivers/usb/host/dwc_common_port/dwc_notifier.c b/drivers/usb/host/dwc_common_port/dwc_notifier.c -new file mode 100644 -index 000000000000..8b3772afe11d --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_notifier.c @@ -0,0 +1,319 @@ @@ -13338,9 +13260,6 @@ index 000000000000..8b3772afe11d +} + +#endif /* DWC_NOTIFYLIB */ -diff --git a/drivers/usb/host/dwc_common_port/dwc_notifier.h b/drivers/usb/host/dwc_common_port/dwc_notifier.h -new file mode 100644 -index 000000000000..4a8cdfe565b1 --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_notifier.h @@ -0,0 +1,122 @@ @@ -13466,9 +13385,6 @@ index 000000000000..4a8cdfe565b1 +#endif + +#endif /* __DWC_NOTIFIER_H__ */ -diff --git a/drivers/usb/host/dwc_common_port/dwc_os.h b/drivers/usb/host/dwc_common_port/dwc_os.h -new file mode 100644 -index 000000000000..7a4052964e95 --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_os.h @@ -0,0 +1,1275 @@ @@ -14747,9 +14663,6 @@ index 000000000000..7a4052964e95 +#endif + +#endif /* _DWC_OS_H_ */ -diff --git a/drivers/usb/host/dwc_common_port/usb.h b/drivers/usb/host/dwc_common_port/usb.h -new file mode 100644 -index 000000000000..b1cedb1876b7 --- /dev/null +++ b/drivers/usb/host/dwc_common_port/usb.h @@ -0,0 +1,275 @@ @@ -15028,9 +14941,6 @@ index 000000000000..b1cedb1876b7 +#endif + +#endif /* _USB_H_ */ -diff --git a/drivers/usb/host/dwc_otg/Makefile b/drivers/usb/host/dwc_otg/Makefile -new file mode 100644 -index 000000000000..8cbe3e684f26 --- /dev/null +++ b/drivers/usb/host/dwc_otg/Makefile @@ -0,0 +1,86 @@ @@ -15120,9 +15030,6 @@ index 000000000000..8cbe3e684f26 + rm -rf *.o *.ko .*cmd *.mod.c .tmp_versions Module.symvers + +endif -diff --git a/drivers/usb/host/dwc_otg/doc/doxygen.cfg b/drivers/usb/host/dwc_otg/doc/doxygen.cfg -new file mode 100644 -index 000000000000..712b057ef7c2 --- /dev/null +++ b/drivers/usb/host/dwc_otg/doc/doxygen.cfg @@ -0,0 +1,224 @@ @@ -15350,9 +15257,6 @@ index 000000000000..712b057ef7c2 +# Configuration::additions related to the search engine +#--------------------------------------------------------------------------- +SEARCHENGINE = NO -diff --git a/drivers/usb/host/dwc_otg/dummy_audio.c b/drivers/usb/host/dwc_otg/dummy_audio.c -new file mode 100644 -index 000000000000..7cf69282abce --- /dev/null +++ b/drivers/usb/host/dwc_otg/dummy_audio.c @@ -0,0 +1,1574 @@ @@ -16930,9 +16834,6 @@ index 000000000000..7cf69282abce + remove_proc_entry("isoc_test", NULL); +} +module_exit (cleanup); -diff --git a/drivers/usb/host/dwc_otg/dwc_cfi_common.h b/drivers/usb/host/dwc_otg/dwc_cfi_common.h -new file mode 100644 -index 000000000000..7770e201ad3b --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_cfi_common.h @@ -0,0 +1,142 @@ @@ -17078,9 +16979,6 @@ index 000000000000..7770e201ad3b +typedef struct cfi_string cfi_string_t; + +#endif -diff --git a/drivers/usb/host/dwc_otg/dwc_otg_adp.c b/drivers/usb/host/dwc_otg/dwc_otg_adp.c -new file mode 100644 -index 000000000000..cb49aedd51f6 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_adp.c @@ -0,0 +1,842 @@ @@ -17926,9 +17824,6 @@ index 000000000000..cb49aedd51f6 +#endif + return 1; +} -diff --git a/drivers/usb/host/dwc_otg/dwc_otg_adp.h b/drivers/usb/host/dwc_otg/dwc_otg_adp.h -new file mode 100644 -index 000000000000..4110b25d2002 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_adp.h @@ -0,0 +1,80 @@ @@ -18012,9 +17907,6 @@ index 000000000000..4110b25d2002 +extern int32_t dwc_otg_adp_handle_srp_intr(dwc_otg_core_if_t * core_if); + +#endif //__DWC_OTG_ADP_H__ -diff --git a/drivers/usb/host/dwc_otg/dwc_otg_attr.c b/drivers/usb/host/dwc_otg/dwc_otg_attr.c -new file mode 100644 -index 000000000000..2f8ea77c3892 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_attr.c @@ -0,0 +1,1212 @@ @@ -19230,9 +19122,6 @@ index 000000000000..2f8ea77c3892 + device_remove_file(&dev->dev, &dev_attr_sleep_status); +#endif +} -diff --git a/drivers/usb/host/dwc_otg/dwc_otg_attr.h b/drivers/usb/host/dwc_otg/dwc_otg_attr.h -new file mode 100644 -index 000000000000..e10b67f97c52 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_attr.h @@ -0,0 +1,89 @@ @@ -19325,9 +19214,6 @@ index 000000000000..e10b67f97c52 +#endif + ); +#endif -diff --git a/drivers/usb/host/dwc_otg/dwc_otg_cfi.c b/drivers/usb/host/dwc_otg/dwc_otg_cfi.c -new file mode 100644 -index 000000000000..e73016ef863d --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_cfi.c @@ -0,0 +1,1874 @@ @@ -21205,9 +21091,6 @@ index 000000000000..e73016ef863d +} + +#endif //DWC_UTE_CFI -diff --git a/drivers/usb/host/dwc_otg/dwc_otg_cfi.h b/drivers/usb/host/dwc_otg/dwc_otg_cfi.h -new file mode 100644 -index 000000000000..55fd337a283c --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_cfi.h @@ -0,0 +1,320 @@ @@ -21531,9 +21414,6 @@ index 000000000000..55fd337a283c +int cfi_setup(struct dwc_otg_pcd *pcd, struct cfi_usb_ctrlrequest *ctrl); + +#endif /* (__DWC_OTG_CFI_H__) */ -diff --git a/drivers/usb/host/dwc_otg/dwc_otg_cil.c b/drivers/usb/host/dwc_otg/dwc_otg_cil.c -new file mode 100644 -index 000000000000..b3dd2ad5237c --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_cil.c @@ -0,0 +1,7121 @@ @@ -28658,9 +28538,6 @@ index 000000000000..b3dd2ad5237c + dwc_otg_pcd_start_srp_timer(core_if); + return; +} -diff --git a/drivers/usb/host/dwc_otg/dwc_otg_cil.h b/drivers/usb/host/dwc_otg/dwc_otg_cil.h -new file mode 100644 -index 000000000000..79dbf8374f02 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_cil.h @@ -0,0 +1,1464 @@ @@ -30128,9 +30005,6 @@ index 000000000000..79dbf8374f02 +////////////////////////////////////////////////////////////////////// + +#endif -diff --git a/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c b/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c -new file mode 100644 -index 000000000000..57a9fe4e5ee0 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c @@ -0,0 +1,1578 @@ @@ -31712,9 +31586,6 @@ index 000000000000..57a9fe4e5ee0 + DWC_SPINUNLOCK(core_if->lock); + return retval; +} -diff --git a/drivers/usb/host/dwc_otg/dwc_otg_core_if.h b/drivers/usb/host/dwc_otg/dwc_otg_core_if.h -new file mode 100644 -index 000000000000..4138fd173337 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_core_if.h @@ -0,0 +1,705 @@ @@ -32423,9 +32294,6 @@ index 000000000000..4138fd173337 +/** @} */ + +#endif /* __DWC_CORE_IF_H__ */ -diff --git a/drivers/usb/host/dwc_otg/dwc_otg_dbg.h b/drivers/usb/host/dwc_otg/dwc_otg_dbg.h -new file mode 100644 -index 000000000000..ccc24e010e44 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_dbg.h @@ -0,0 +1,117 @@ @@ -32546,9 +32414,6 @@ index 000000000000..ccc24e010e44 + +#endif /*DEBUG*/ +#endif -diff --git a/drivers/usb/host/dwc_otg/dwc_otg_driver.c b/drivers/usb/host/dwc_otg/dwc_otg_driver.c -new file mode 100644 -index 000000000000..b3e72bffafa1 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_driver.c @@ -0,0 +1,1725 @@ @@ -34277,9 +34142,6 @@ index 000000000000..b3e72bffafa1 + + +*/ -diff --git a/drivers/usb/host/dwc_otg/dwc_otg_driver.h b/drivers/usb/host/dwc_otg/dwc_otg_driver.h -new file mode 100644 -index 000000000000..6a8be63a0ab2 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_driver.h @@ -0,0 +1,86 @@ @@ -34369,9 +34231,6 @@ index 000000000000..6a8be63a0ab2 +#endif + +#endif -diff --git a/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c -new file mode 100644 -index 000000000000..98e4563fee02 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c @@ -0,0 +1,1370 @@ @@ -35745,9 +35604,6 @@ index 000000000000..98e4563fee02 + mb(); + fiq_fsm_spin_unlock(&state->lock); +} -diff --git a/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h -new file mode 100644 -index 000000000000..1399d579eb58 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h @@ -0,0 +1,476 @@ @@ -36227,9 +36083,6 @@ index 000000000000..1399d579eb58 +extern void dwc_otg_fiq_nop(struct fiq_state *state); + +#endif /* DWC_OTG_FIQ_FSM_H_ */ -diff --git a/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S b/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S -new file mode 100644 -index 000000000000..ffa8d21bc61e --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S @@ -0,0 +1,80 @@ @@ -36313,9 +36166,6 @@ index 000000000000..ffa8d21bc61e + subs pc, lr, #4; +_dwc_otg_fiq_stub_end: +END(_dwc_otg_fiq_stub) -diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd.c -new file mode 100644 -index 000000000000..9e05e075172b --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd.c @@ -0,0 +1,4362 @@ @@ -40681,9 +40531,6 @@ index 000000000000..9e05e075172b +} + +#endif /* DWC_DEVICE_ONLY */ -diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd.h b/drivers/usb/host/dwc_otg/dwc_otg_hcd.h -new file mode 100644 -index 000000000000..e0611c1592b1 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd.h @@ -0,0 +1,870 @@ @@ -41557,9 +41404,6 @@ index 000000000000..e0611c1592b1 +#endif +#endif +#endif /* DWC_DEVICE_ONLY */ -diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c -new file mode 100644 -index 000000000000..0cf505019090 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c @@ -0,0 +1,1135 @@ @@ -42698,9 +42542,6 @@ index 000000000000..0cf505019090 +} + +#endif /* DWC_DEVICE_ONLY */ -diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h b/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h -new file mode 100644 -index 000000000000..847c547d7ebb --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h @@ -0,0 +1,441 @@ @@ -43145,9 +42986,6 @@ index 000000000000..847c547d7ebb + +#endif /* __DWC_HCD_IF_H__ */ +#endif /* DWC_DEVICE_ONLY */ -diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c -new file mode 100644 -index 000000000000..2a1617b475fc --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c @@ -0,0 +1,2757 @@ @@ -45908,9 +45746,6 @@ index 000000000000..2a1617b475fc + return retval; +} +#endif /* DWC_DEVICE_ONLY */ -diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c -new file mode 100644 -index 000000000000..430a1a510295 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c @@ -0,0 +1,1081 @@ @@ -46995,9 +46830,6 @@ index 000000000000..430a1a510295 +} + +#endif /* DWC_DEVICE_ONLY */ -diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c -new file mode 100644 -index 000000000000..d8a49a8568f2 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c @@ -0,0 +1,974 @@ @@ -47975,9 +47807,6 @@ index 000000000000..d8a49a8568f2 +} + +#endif /* DWC_DEVICE_ONLY */ -diff --git a/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h b/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h -new file mode 100644 -index 000000000000..0bfa98157169 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h @@ -0,0 +1,200 @@ @@ -48181,9 +48010,6 @@ index 000000000000..0bfa98157169 + + +#endif /* _DWC_OS_DEP_H_ */ -diff --git a/drivers/usb/host/dwc_otg/dwc_otg_pcd.c b/drivers/usb/host/dwc_otg/dwc_otg_pcd.c -new file mode 100644 -index 000000000000..ec2d45167a0f --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd.c @@ -0,0 +1,2723 @@ @@ -50910,9 +50736,6 @@ index 000000000000..ec2d45167a0f +} + +#endif /* DWC_HOST_ONLY */ -diff --git a/drivers/usb/host/dwc_otg/dwc_otg_pcd.h b/drivers/usb/host/dwc_otg/dwc_otg_pcd.h -new file mode 100644 -index 000000000000..fffc4c9d8bc6 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd.h @@ -0,0 +1,277 @@ @@ -51193,9 +51016,6 @@ index 000000000000..fffc4c9d8bc6 +extern void do_test_mode(void *data); +#endif +#endif /* DWC_HOST_ONLY */ -diff --git a/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h b/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h -new file mode 100644 -index 000000000000..badc93a41c38 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h @@ -0,0 +1,381 @@ @@ -51580,9 +51400,6 @@ index 000000000000..badc93a41c38 +#endif /* __DWC_PCD_IF_H__ */ + +#endif /* DWC_HOST_ONLY */ -diff --git a/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c b/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c -new file mode 100644 -index 000000000000..9a255a96c209 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c @@ -0,0 +1,5148 @@ @@ -56734,9 +56551,6 @@ index 000000000000..9a255a96c209 +} + +#endif /* DWC_HOST_ONLY */ -diff --git a/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c b/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c -new file mode 100644 -index 000000000000..e214955d6914 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c @@ -0,0 +1,1262 @@ @@ -58002,9 +57816,6 @@ index 000000000000..e214955d6914 +} + +#endif /* DWC_HOST_ONLY */ -diff --git a/drivers/usb/host/dwc_otg/dwc_otg_regs.h b/drivers/usb/host/dwc_otg/dwc_otg_regs.h -new file mode 100644 -index 000000000000..8e0e7b569f1a --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_regs.h @@ -0,0 +1,2550 @@ @@ -60558,9 +60369,6 @@ index 000000000000..8e0e7b569f1a +} gpwrdn_data_t; + +#endif -diff --git a/drivers/usb/host/dwc_otg/test/Makefile b/drivers/usb/host/dwc_otg/test/Makefile -new file mode 100644 -index 000000000000..fc453759dea3 --- /dev/null +++ b/drivers/usb/host/dwc_otg/test/Makefile @@ -0,0 +1,16 @@ @@ -60580,9 +60388,6 @@ index 000000000000..fc453759dea3 + else echo "=======> $$test, FAILED" ; \ + fi \ + done -diff --git a/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm b/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm -new file mode 100644 -index 000000000000..85e55fd6ddbc --- /dev/null +++ b/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm @@ -0,0 +1,337 @@ @@ -60923,9 +60728,6 @@ index 000000000000..85e55fd6ddbc +); + +1; -diff --git a/drivers/usb/host/dwc_otg/test/test_mod_param.pl b/drivers/usb/host/dwc_otg/test/test_mod_param.pl -new file mode 100644 -index 000000000000..dc3820df577b --- /dev/null +++ b/drivers/usb/host/dwc_otg/test/test_mod_param.pl @@ -0,0 +1,133 @@ @@ -61062,9 +60864,6 @@ index 000000000000..dc3820df577b + +test_main(); +0; -diff --git a/drivers/usb/host/dwc_otg/test/test_sysfs.pl b/drivers/usb/host/dwc_otg/test/test_sysfs.pl -new file mode 100644 -index 000000000000..cdc9963176e5 --- /dev/null +++ b/drivers/usb/host/dwc_otg/test/test_sysfs.pl @@ -0,0 +1,193 @@ @@ -61261,6 +61060,3 @@ index 000000000000..cdc9963176e5 + +test_main(); +0; --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0052-bcm2708_fb-Add-framebuffer-driver.patch b/target/linux/bcm27xx/patches-6.18/0052-bcm2708_fb-Add-framebuffer-driver.patch index 443a5087fe8..37f5047b292 100644 --- a/target/linux/bcm27xx/patches-6.18/0052-bcm2708_fb-Add-framebuffer-driver.patch +++ b/target/linux/bcm27xx/patches-6.18/0052-bcm2708_fb-Add-framebuffer-driver.patch @@ -164,8 +164,6 @@ Signed-off-by: Phil Elwell 6 files changed, 2204 insertions(+), 1602 deletions(-) create mode 100644 drivers/video/fbdev/bcm2708_fb.c -diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig -index a257b739188d..9353d51f38d3 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -61,6 +61,19 @@ config FB_MACMODES @@ -188,11 +186,9 @@ index a257b739188d..9353d51f38d3 100644 config FB_GRVGA tristate "Aeroflex Gaisler framebuffer support" depends on FB && SPARC -diff --git a/drivers/video/fbdev/Makefile b/drivers/video/fbdev/Makefile -index b3d12f977c06..ee9b2c3c7206 100644 --- a/drivers/video/fbdev/Makefile +++ b/drivers/video/fbdev/Makefile -@@ -12,6 +12,7 @@ obj-$(CONFIG_FB_SBUS) += sbuslib.o +@@ -12,6 +12,7 @@ obj-$(CONFIG_FB_SBUS) += sbusli obj-$(CONFIG_FB_WMT_GE_ROPS) += wmt_ge_rops.o # Hardware specific drivers go first @@ -200,9 +196,6 @@ index b3d12f977c06..ee9b2c3c7206 100644 obj-$(CONFIG_FB_AMIGA) += amifb.o c2p_planar.o obj-$(CONFIG_FB_ARC) += arcfb.o obj-$(CONFIG_FB_CLPS711X) += clps711x-fb.o -diff --git a/drivers/video/fbdev/bcm2708_fb.c b/drivers/video/fbdev/bcm2708_fb.c -new file mode 100644 -index 000000000000..91f3e55538bf --- /dev/null +++ b/drivers/video/fbdev/bcm2708_fb.c @@ -0,0 +1,1262 @@ @@ -1468,11 +1461,9 @@ index 000000000000..91f3e55538bf +MODULE_PARM_DESC(fbheight, "Height of ARM Framebuffer"); +MODULE_PARM_DESC(fbdepth, "Bit depth of ARM Framebuffer"); +MODULE_PARM_DESC(fbswap, "Swap order of red and blue in 24 and 32 bit modes"); -diff --git a/drivers/video/fbdev/core/fb_chrdev.c b/drivers/video/fbdev/core/fb_chrdev.c -index 4ebd16b7e3b8..e3dd94bb7ef5 100644 --- a/drivers/video/fbdev/core/fb_chrdev.c +++ b/drivers/video/fbdev/core/fb_chrdev.c -@@ -59,6 +59,30 @@ static ssize_t fb_write(struct file *file, const char __user *buf, size_t count, +@@ -59,6 +59,30 @@ static ssize_t fb_write(struct file *fil return info->fbops->fb_write(info, buf, count, ppos); } @@ -1503,7 +1494,7 @@ index 4ebd16b7e3b8..e3dd94bb7ef5 100644 static long do_fb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg) { -@@ -67,6 +91,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd, +@@ -67,6 +91,7 @@ static long do_fb_ioctl(struct fb_info * struct fb_fix_screeninfo fix; struct fb_cmap cmap_from; struct fb_cmap_user cmap; @@ -1511,7 +1502,7 @@ index 4ebd16b7e3b8..e3dd94bb7ef5 100644 void __user *argp = (void __user *)arg; long ret = 0; -@@ -148,6 +173,15 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd, +@@ -148,6 +173,15 @@ static long do_fb_ioctl(struct fb_info * unlock_fb_info(info); console_unlock(); break; @@ -1527,7 +1518,7 @@ index 4ebd16b7e3b8..e3dd94bb7ef5 100644 default: lock_fb_info(info); fb = info->fbops; -@@ -287,6 +321,7 @@ static long fb_compat_ioctl(struct file *file, unsigned int cmd, +@@ -287,6 +321,7 @@ static long fb_compat_ioctl(struct file case FBIOPAN_DISPLAY: case FBIOGET_CON2FBMAP: case FBIOPUT_CON2FBMAP: @@ -1535,8 +1526,6 @@ index 4ebd16b7e3b8..e3dd94bb7ef5 100644 arg = (unsigned long) compat_ptr(arg); fallthrough; case FBIOBLANK: -diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm -index 3c14e43b82fe..7626beb6a5bb 100644 --- a/drivers/video/logo/logo_linux_clut224.ppm +++ b/drivers/video/logo/logo_linux_clut224.ppm @@ -1,1604 +1,883 @@ @@ -4025,8 +4014,6 @@ index 3c14e43b82fe..7626beb6a5bb 100644 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 -diff --git a/include/uapi/linux/fb.h b/include/uapi/linux/fb.h -index 22acaaec7b1c..eab4c7f3d833 100644 --- a/include/uapi/linux/fb.h +++ b/include/uapi/linux/fb.h @@ -36,6 +36,12 @@ @@ -4055,6 +4042,3 @@ index 22acaaec7b1c..eab4c7f3d833 100644 struct fb_fillrect { __u32 dx; /* screen-relative */ __u32 dy; --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0053-dmaengine-Add-support-for-BCM2708.patch b/target/linux/bcm27xx/patches-6.18/0053-dmaengine-Add-support-for-BCM2708.patch index af79946f565..e929b2daa96 100644 --- a/target/linux/bcm27xx/patches-6.18/0053-dmaengine-Add-support-for-BCM2708.patch +++ b/target/linux/bcm27xx/patches-6.18/0053-dmaengine-Add-support-for-BCM2708.patch @@ -188,8 +188,6 @@ Signed-off-by: Phil Elwell create mode 100644 drivers/dma/bcm2708-dmaengine.c create mode 100644 include/linux/platform_data/dma-bcm2708.h -diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig -index cab445e9b9a0..4ddb58fb0959 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -143,7 +143,7 @@ config BCM_SBA_RAID @@ -212,8 +210,6 @@ index cab445e9b9a0..4ddb58fb0959 100644 config XGENE_DMA tristate "APM X-Gene DMA support" depends on ARCH_XGENE || COMPILE_TEST -diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile -index a54d7688392b..d45d964899b4 100644 --- a/drivers/dma/Makefile +++ b/drivers/dma/Makefile @@ -22,6 +22,7 @@ obj-$(CONFIG_AT_HDMAC) += at_hdmac.o @@ -224,9 +220,6 @@ index a54d7688392b..d45d964899b4 100644 obj-$(CONFIG_DMA_BCM2835) += bcm2835-dma.o obj-$(CONFIG_DMA_JZ4780) += dma-jz4780.o obj-$(CONFIG_DMA_SA11X0) += sa11x0-dma.o -diff --git a/drivers/dma/bcm2708-dmaengine.c b/drivers/dma/bcm2708-dmaengine.c -new file mode 100644 -index 000000000000..a9a7f92584c8 --- /dev/null +++ b/drivers/dma/bcm2708-dmaengine.c @@ -0,0 +1,281 @@ @@ -511,9 +504,6 @@ index 000000000000..a9a7f92584c8 +EXPORT_SYMBOL(bcm_dmaman_remove); + +MODULE_LICENSE("GPL"); -diff --git a/include/linux/platform_data/dma-bcm2708.h b/include/linux/platform_data/dma-bcm2708.h -new file mode 100644 -index 000000000000..6ca874d332a8 --- /dev/null +++ b/include/linux/platform_data/dma-bcm2708.h @@ -0,0 +1,143 @@ @@ -660,6 +650,3 @@ index 000000000000..6ca874d332a8 +#endif /* CONFIG_DMA_BCM2708 || CONFIG_DMA_BCM2708_MODULE */ + +#endif /* _PLAT_BCM2708_DMA_H */ --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0054-mmc-bcm2835-mmc-added-alternative-MMC-driver.patch b/target/linux/bcm27xx/patches-6.18/0054-mmc-bcm2835-mmc-added-alternative-MMC-driver.patch index 231f5ccd3f3..2d0c63b4e82 100644 --- a/target/linux/bcm27xx/patches-6.18/0054-mmc-bcm2835-mmc-added-alternative-MMC-driver.patch +++ b/target/linux/bcm27xx/patches-6.18/0054-mmc-bcm2835-mmc-added-alternative-MMC-driver.patch @@ -280,8 +280,6 @@ Signed-off-by: Phil Elwell 9 files changed, 1641 insertions(+), 5 deletions(-) create mode 100644 drivers/mmc/host/bcm2835-mmc.c -diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c -index c0ffe0817fd4..b90bbd28acc8 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -180,6 +180,13 @@ static DEFINE_MUTEX(open_lock); @@ -298,7 +296,7 @@ index c0ffe0817fd4..b90bbd28acc8 100644 static inline int mmc_blk_part_switch(struct mmc_card *card, unsigned int part_type); static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq, -@@ -3265,6 +3272,8 @@ static int mmc_blk_probe(struct mmc_card *card) +@@ -3278,6 +3285,8 @@ static int mmc_blk_probe(struct mmc_card { struct mmc_blk_data *md; int ret = 0; @@ -307,7 +305,7 @@ index c0ffe0817fd4..b90bbd28acc8 100644 /* * Check that the card supports the command class(es) we need. -@@ -3272,7 +3281,16 @@ static int mmc_blk_probe(struct mmc_card *card) +@@ -3285,7 +3294,16 @@ static int mmc_blk_probe(struct mmc_card if (!(card->csd.cmdclass & CCC_BLOCK_READ)) return -ENODEV; @@ -325,7 +323,7 @@ index c0ffe0817fd4..b90bbd28acc8 100644 card->complete_wq = alloc_workqueue("mmc_complete", WQ_MEM_RECLAIM | WQ_HIGHPRI, 0); -@@ -3287,6 +3305,17 @@ static int mmc_blk_probe(struct mmc_card *card) +@@ -3300,6 +3318,17 @@ static int mmc_blk_probe(struct mmc_card goto out_free; } @@ -343,8 +341,6 @@ index c0ffe0817fd4..b90bbd28acc8 100644 ret = mmc_blk_alloc_parts(card, md); if (ret) goto out; -diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c -index 860378bea557..0c51f3df9537 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -1861,7 +1861,8 @@ EXPORT_SYMBOL(mmc_erase); @@ -357,13 +353,11 @@ index 860378bea557..0c51f3df9537 100644 } EXPORT_SYMBOL(mmc_card_can_erase); -diff --git a/drivers/mmc/core/quirks.h b/drivers/mmc/core/quirks.h -index c417ed34c057..832ddaffa9ef 100644 --- a/drivers/mmc/core/quirks.h +++ b/drivers/mmc/core/quirks.h -@@ -153,6 +153,20 @@ static const struct mmc_fixup __maybe_unused mmc_blk_fixups[] = { - MMC_FIXUP("M62704", CID_MANFID_KINGSTON, 0x0100, add_quirk_mmc, - MMC_QUIRK_TRIM_BROKEN), +@@ -162,6 +162,20 @@ static const struct mmc_fixup __maybe_un + MMC_FIXUP("IB2932", CID_MANFID_KINGSTON, 0x0100, add_quirk_mmc, + MMC_QUIRK_FIXED_SECURE_ERASE_TRIM_TIME), + /* + * Some SD cards reports discard support while they don't @@ -382,8 +376,6 @@ index c417ed34c057..832ddaffa9ef 100644 END_FIXUP }; -diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig -index c94ae4794545..85e418954f20 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -5,6 +5,35 @@ @@ -422,11 +414,9 @@ index c94ae4794545..85e418954f20 100644 config MMC_DEBUG bool "MMC host drivers debugging" depends on MMC != n -diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile -index 5057fea8afb6..f0cb916d248f 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile -@@ -23,6 +23,7 @@ obj-$(CONFIG_MMC_SDHCI_F_SDH30) += sdhci_f_sdh30.o +@@ -23,6 +23,7 @@ obj-$(CONFIG_MMC_SDHCI_F_SDH30) += sdhci obj-$(CONFIG_MMC_SDHCI_MILBEAUT) += sdhci-milbeaut.o obj-$(CONFIG_MMC_SDHCI_SPEAR) += sdhci-spear.o obj-$(CONFIG_MMC_SDHCI_AM654) += sdhci_am654.o @@ -434,9 +424,6 @@ index 5057fea8afb6..f0cb916d248f 100644 obj-$(CONFIG_MMC_WBSD) += wbsd.o obj-$(CONFIG_MMC_AU1X) += au1xmmc.o obj-$(CONFIG_MMC_ALCOR) += alcor.o -diff --git a/drivers/mmc/host/bcm2835-mmc.c b/drivers/mmc/host/bcm2835-mmc.c -new file mode 100644 -index 000000000000..c0d25994b166 --- /dev/null +++ b/drivers/mmc/host/bcm2835-mmc.c @@ -0,0 +1,1560 @@ @@ -2000,11 +1987,9 @@ index 000000000000..c0d25994b166 +MODULE_DESCRIPTION("BCM2835 SDHCI driver"); +MODULE_LICENSE("GPL v2"); +MODULE_AUTHOR("Gellert Weisz"); -diff --git a/drivers/mmc/host/sdhci-iproc.c b/drivers/mmc/host/sdhci-iproc.c -index 35ef5c5f5146..a2c5e886bd35 100644 --- a/drivers/mmc/host/sdhci-iproc.c +++ b/drivers/mmc/host/sdhci-iproc.c -@@ -198,6 +198,7 @@ static const struct sdhci_ops sdhci_iproc_32only_ops = { +@@ -198,6 +198,7 @@ static const struct sdhci_ops sdhci_ipro .write_b = sdhci_iproc_writeb, .set_clock = sdhci_set_clock, .get_max_clock = sdhci_iproc_get_max_clock, @@ -2012,8 +1997,6 @@ index 35ef5c5f5146..a2c5e886bd35 100644 .set_bus_width = sdhci_set_bus_width, .reset = sdhci_reset, .set_uhs_signaling = sdhci_set_uhs_signaling, -diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c -index fec9329e1edb..6e6efe8d419b 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -40,7 +40,7 @@ @@ -2025,7 +2008,7 @@ index fec9329e1edb..6e6efe8d419b 100644 #define MAX_TUNING_LOOP 40 -@@ -3245,7 +3245,7 @@ static void sdhci_timeout_timer(struct timer_list *t) +@@ -3245,7 +3245,7 @@ static void sdhci_timeout_timer(struct t spin_lock_irqsave(&host->lock, flags); if (host->cmd && !sdhci_data_line_cmd(host->cmd)) { @@ -2034,7 +2017,7 @@ index fec9329e1edb..6e6efe8d419b 100644 mmc_hostname(host->mmc)); sdhci_err_stats_inc(host, REQ_TIMEOUT); sdhci_dumpregs(host); -@@ -3268,7 +3268,7 @@ static void sdhci_timeout_data_timer(struct timer_list *t) +@@ -3268,7 +3268,7 @@ static void sdhci_timeout_data_timer(str if (host->data || host->data_cmd || (host->cmd && sdhci_data_line_cmd(host->cmd))) { @@ -2043,18 +2026,13 @@ index fec9329e1edb..6e6efe8d419b 100644 mmc_hostname(host->mmc)); sdhci_err_stats_inc(host, REQ_TIMEOUT); sdhci_dumpregs(host); -diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h -index ddcdf23d731c..b1ad2c63ca59 100644 --- a/include/linux/mmc/card.h +++ b/include/linux/mmc/card.h -@@ -330,6 +330,7 @@ struct mmc_card { - #define MMC_QUIRK_BROKEN_CACHE_FLUSH (1<<16) /* Don't flush cache until the write has occurred */ - #define MMC_QUIRK_BROKEN_SD_POWEROFF_NOTIFY (1<<17) /* Disable broken SD poweroff notify support */ +@@ -332,6 +332,7 @@ struct mmc_card { #define MMC_QUIRK_NO_UHS_DDR50_TUNING (1<<18) /* Disable DDR50 tuning */ + #define MMC_QUIRK_BROKEN_MDT (1<<19) /* Wrong manufacturing year */ + #define MMC_QUIRK_FIXED_SECURE_ERASE_TRIM_TIME (1<<20) /* Secure erase/trim time is fixed regardless of size */ +#define MMC_QUIRK_ERASE_BROKEN (1<<31) /* Skip erase */ bool written_flag; /* Indicates eMMC has been written since power on */ bool reenable_cmdq; /* Re-enable Command Queue */ --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0055-mmc-block-Don-t-do-single-sector-reads-during-recove.patch b/target/linux/bcm27xx/patches-6.18/0055-mmc-block-Don-t-do-single-sector-reads-during-recove.patch index 7754cc6bf3f..7dfa28317b4 100644 --- a/target/linux/bcm27xx/patches-6.18/0055-mmc-block-Don-t-do-single-sector-reads-during-recove.patch +++ b/target/linux/bcm27xx/patches-6.18/0055-mmc-block-Don-t-do-single-sector-reads-during-recove.patch @@ -20,11 +20,9 @@ Signed-off-by: Jonathan Bell drivers/mmc/core/block.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c -index b90bbd28acc8..f6262101198a 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c -@@ -1979,7 +1979,7 @@ static void mmc_blk_mq_rw_recovery(struct mmc_queue *mq, struct request *req) +@@ -1985,7 +1985,7 @@ static void mmc_blk_mq_rw_recovery(struc return; } @@ -33,6 +31,3 @@ index b90bbd28acc8..f6262101198a 100644 queue_physical_block_size(mq->queue) >> 9) { /* Read one (native) sector at a time */ mmc_blk_read_single(mq, req); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0056-vc_mem-Add-vc_mem-driver-for-querying-firmware-memor.patch b/target/linux/bcm27xx/patches-6.18/0056-vc_mem-Add-vc_mem-driver-for-querying-firmware-memor.patch index 500aede2771..cc7a3e691fc 100644 --- a/target/linux/bcm27xx/patches-6.18/0056-vc_mem-Add-vc_mem-driver-for-querying-firmware-memor.patch +++ b/target/linux/bcm27xx/patches-6.18/0056-vc_mem-Add-vc_mem-driver-for-querying-firmware-memor.patch @@ -64,9 +64,6 @@ Signed-off-by: Phil Elwell create mode 100644 drivers/char/broadcom/vc_mem.c create mode 100644 include/linux/broadcom/vc_mem.h -diff --git a/drivers/char/broadcom/Kconfig b/drivers/char/broadcom/Kconfig -new file mode 100644 -index 000000000000..fc1315209dab --- /dev/null +++ b/drivers/char/broadcom/Kconfig @@ -0,0 +1,18 @@ @@ -88,16 +85,10 @@ index 000000000000..fc1315209dab + Helper for videocore memory access and total size allocation. + +endif -diff --git a/drivers/char/broadcom/Makefile b/drivers/char/broadcom/Makefile -new file mode 100644 -index 000000000000..06c5c8ad00e7 --- /dev/null +++ b/drivers/char/broadcom/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_BCM2708_VCMEM) += vc_mem.o -diff --git a/drivers/char/broadcom/vc_mem.c b/drivers/char/broadcom/vc_mem.c -new file mode 100644 -index 000000000000..4b7faf084e0c --- /dev/null +++ b/drivers/char/broadcom/vc_mem.c @@ -0,0 +1,635 @@ @@ -736,9 +727,6 @@ index 000000000000..4b7faf084e0c +module_param(phys_addr, uint, 0644); +module_param(mem_size, uint, 0644); +module_param(mem_base, uint, 0644); -diff --git a/include/linux/broadcom/vc_mem.h b/include/linux/broadcom/vc_mem.h -new file mode 100644 -index 000000000000..3c7079237496 --- /dev/null +++ b/include/linux/broadcom/vc_mem.h @@ -0,0 +1,39 @@ @@ -781,6 +769,3 @@ index 000000000000..3c7079237496 +#endif + +#endif /* _VC_MEM_H */ --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0057-Add-SMI-driver.patch b/target/linux/bcm27xx/patches-6.18/0057-Add-SMI-driver.patch index c5a4bbf9f04..8d6f0a6ae7e 100644 --- a/target/linux/bcm27xx/patches-6.18/0057-Add-SMI-driver.patch +++ b/target/linux/bcm27xx/patches-6.18/0057-Add-SMI-driver.patch @@ -90,9 +90,6 @@ Signed-off-by: Phil Elwell create mode 100644 drivers/misc/bcm2835_smi.c create mode 100644 include/linux/broadcom/bcm2835_smi.h -diff --git a/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi-dev.txt b/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi-dev.txt -new file mode 100644 -index 000000000000..68cc8ebc3392 --- /dev/null +++ b/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi-dev.txt @@ -0,0 +1,17 @@ @@ -113,9 +110,6 @@ index 000000000000..68cc8ebc3392 +- None. + + -diff --git a/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi.txt b/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi.txt -new file mode 100644 -index 000000000000..b76dc694f1ac --- /dev/null +++ b/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi.txt @@ -0,0 +1,48 @@ @@ -167,8 +161,6 @@ index 000000000000..b76dc694f1ac + brcm,pull = <2 2 2 2 2 2 0 0 0 0 0 0 0 0>; +}; + -diff --git a/drivers/char/broadcom/Kconfig b/drivers/char/broadcom/Kconfig -index fc1315209dab..875429161b9a 100644 --- a/drivers/char/broadcom/Kconfig +++ b/drivers/char/broadcom/Kconfig @@ -16,3 +16,12 @@ config BCM2708_VCMEM @@ -184,16 +176,11 @@ index fc1315209dab..875429161b9a 100644 + This driver provides a character device interface (ioctl + read/write) to + Broadcom's Secondary Memory interface. The low-level functionality is provided + by the SMI driver itself. -diff --git a/drivers/char/broadcom/Makefile b/drivers/char/broadcom/Makefile -index 06c5c8ad00e7..a1f3da49e5f1 100644 --- a/drivers/char/broadcom/Makefile +++ b/drivers/char/broadcom/Makefile @@ -1 +1,2 @@ obj-$(CONFIG_BCM2708_VCMEM) += vc_mem.o +obj-$(CONFIG_BCM2835_SMI_DEV) += bcm2835_smi_dev.o -diff --git a/drivers/char/broadcom/bcm2835_smi_dev.c b/drivers/char/broadcom/bcm2835_smi_dev.c -new file mode 100644 -index 000000000000..ae0c0d24fad9 --- /dev/null +++ b/drivers/char/broadcom/bcm2835_smi_dev.c @@ -0,0 +1,408 @@ @@ -605,8 +592,6 @@ index 000000000000..ae0c0d24fad9 +MODULE_DESCRIPTION( + "Character device driver for BCM2835's secondary memory interface"); +MODULE_AUTHOR("Luke Wren "); -diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig -index b9c11f67315f..c59f251c7aa4 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -9,6 +9,14 @@ config SENSORS_LIS3LV02D @@ -624,11 +609,9 @@ index b9c11f67315f..c59f251c7aa4 100644 config AD525X_DPOT tristate "Analog Devices Digital Potentiometers" depends on (I2C || SPI) && SYSFS -diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile -index b32a2597d246..fcbf09dfee39 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile -@@ -9,6 +9,7 @@ obj-$(CONFIG_AD525X_DPOT) += ad525x_dpot.o +@@ -9,6 +9,7 @@ obj-$(CONFIG_AD525X_DPOT) += ad525x_dpot obj-$(CONFIG_AD525X_DPOT_I2C) += ad525x_dpot-i2c.o obj-$(CONFIG_AD525X_DPOT_SPI) += ad525x_dpot-spi.o obj-$(CONFIG_ATMEL_SSC) += atmel-ssc.o @@ -636,9 +619,6 @@ index b32a2597d246..fcbf09dfee39 100644 obj-$(CONFIG_DUMMY_IRQ) += dummy-irq.o obj-$(CONFIG_ICS932S401) += ics932s401.o obj-$(CONFIG_LKDTM) += lkdtm/ -diff --git a/drivers/misc/bcm2835_smi.c b/drivers/misc/bcm2835_smi.c -new file mode 100644 -index 000000000000..09246d5ea7d0 --- /dev/null +++ b/drivers/misc/bcm2835_smi.c @@ -0,0 +1,952 @@ @@ -1594,9 +1574,6 @@ index 000000000000..09246d5ea7d0 +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("Device driver for BCM2835's secondary memory interface"); +MODULE_AUTHOR("Luke Wren "); -diff --git a/include/linux/broadcom/bcm2835_smi.h b/include/linux/broadcom/bcm2835_smi.h -new file mode 100644 -index 000000000000..ee3a75edfc03 --- /dev/null +++ b/include/linux/broadcom/bcm2835_smi.h @@ -0,0 +1,391 @@ @@ -1991,6 +1968,3 @@ index 000000000000..ee3a75edfc03 +#endif /* BCM2835_SMI_IMPLEMENTATION */ + +#endif /* BCM2835_SMI_H */ --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0058-Add-Chris-Boot-s-i2c-driver.patch b/target/linux/bcm27xx/patches-6.18/0058-Add-Chris-Boot-s-i2c-driver.patch index 7c3d4c3fa3d..fd081d7c332 100644 --- a/target/linux/bcm27xx/patches-6.18/0058-Add-Chris-Boot-s-i2c-driver.patch +++ b/target/linux/bcm27xx/patches-6.18/0058-Add-Chris-Boot-s-i2c-driver.patch @@ -104,8 +104,6 @@ both bcm2708_bsc_fifo_fill and ~drain are changed as well. 3 files changed, 531 insertions(+) create mode 100644 drivers/i2c/busses/i2c-bcm2708.c -diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig -index 4515ded4338c..aa18e6bd7399 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -16,6 +16,25 @@ config I2C_CCGX_UCSI @@ -134,8 +132,6 @@ index 4515ded4338c..aa18e6bd7399 100644 config I2C_ALI1535 tristate "ALI 1535" depends on PCI && HAS_IOPORT -diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile -index fb985769f5ff..86b29cbfc42d 100644 --- a/drivers/i2c/busses/Makefile +++ b/drivers/i2c/busses/Makefile @@ -3,6 +3,8 @@ @@ -147,9 +143,6 @@ index fb985769f5ff..86b29cbfc42d 100644 # ACPI drivers obj-$(CONFIG_I2C_SCMI) += i2c-scmi.o -diff --git a/drivers/i2c/busses/i2c-bcm2708.c b/drivers/i2c/busses/i2c-bcm2708.c -new file mode 100644 -index 000000000000..09907b5c2540 --- /dev/null +++ b/drivers/i2c/busses/i2c-bcm2708.c @@ -0,0 +1,510 @@ @@ -663,6 +656,3 @@ index 000000000000..09907b5c2540 +MODULE_AUTHOR("Chris Boot "); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:" DRV_NAME); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0059-char-Add-broadcom-char-drivers-back-to-build-files.patch b/target/linux/bcm27xx/patches-6.18/0059-char-Add-broadcom-char-drivers-back-to-build-files.patch index df8e2e4a721..9f3a9bd0623 100644 --- a/target/linux/bcm27xx/patches-6.18/0059-char-Add-broadcom-char-drivers-back-to-build-files.patch +++ b/target/linux/bcm27xx/patches-6.18/0059-char-Add-broadcom-char-drivers-back-to-build-files.patch @@ -10,8 +10,6 @@ Signed-off-by: popcornmix drivers/char/Makefile | 1 + 2 files changed, 3 insertions(+) -diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig -index d2cfc584e202..57442c5c8f63 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -5,6 +5,8 @@ @@ -23,8 +21,6 @@ index d2cfc584e202..57442c5c8f63 100644 source "drivers/tty/Kconfig" config TTY_PRINTK -diff --git a/drivers/char/Makefile b/drivers/char/Makefile -index 1291369b9126..da45158c075e 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile @@ -44,3 +44,4 @@ obj-$(CONFIG_PS3_FLASH) += ps3flash.o @@ -32,6 +28,3 @@ index 1291369b9126..da45158c075e 100644 obj-$(CONFIG_POWERNV_OP_PANEL) += powernv-op-panel.o obj-$(CONFIG_ADI) += adi.o +obj-$(CONFIG_BRCM_CHAR_DRIVERS) += broadcom/ --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0060-char-broadcom-Add-vcio-module.patch b/target/linux/bcm27xx/patches-6.18/0060-char-broadcom-Add-vcio-module.patch index 1e85fef5a95..11655fc8396 100644 --- a/target/linux/bcm27xx/patches-6.18/0060-char-broadcom-Add-vcio-module.patch +++ b/target/linux/bcm27xx/patches-6.18/0060-char-broadcom-Add-vcio-module.patch @@ -60,8 +60,6 @@ Signed-off-by: Phil Elwell 3 files changed, 194 insertions(+) create mode 100644 drivers/char/broadcom/vcio.c -diff --git a/drivers/char/broadcom/Kconfig b/drivers/char/broadcom/Kconfig -index 875429161b9a..29d880d47282 100644 --- a/drivers/char/broadcom/Kconfig +++ b/drivers/char/broadcom/Kconfig @@ -15,6 +15,12 @@ config BCM2708_VCMEM @@ -77,17 +75,12 @@ index 875429161b9a..29d880d47282 100644 endif config BCM2835_SMI_DEV -diff --git a/drivers/char/broadcom/Makefile b/drivers/char/broadcom/Makefile -index a1f3da49e5f1..2ae3e9d411e9 100644 --- a/drivers/char/broadcom/Makefile +++ b/drivers/char/broadcom/Makefile @@ -1,2 +1,3 @@ obj-$(CONFIG_BCM2708_VCMEM) += vc_mem.o +obj-$(CONFIG_BCM_VCIO) += vcio.o obj-$(CONFIG_BCM2835_SMI_DEV) += bcm2835_smi_dev.o -diff --git a/drivers/char/broadcom/vcio.c b/drivers/char/broadcom/vcio.c -new file mode 100644 -index 000000000000..9db2408c781a --- /dev/null +++ b/drivers/char/broadcom/vcio.c @@ -0,0 +1,187 @@ @@ -278,6 +271,3 @@ index 000000000000..9db2408c781a +MODULE_DESCRIPTION("Mailbox userspace access"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:rpi-vcio"); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0061-drivers-char-add-generic-gpiomem-driver.patch b/target/linux/bcm27xx/patches-6.18/0061-drivers-char-add-generic-gpiomem-driver.patch index e30815f414d..7688987cb7e 100644 --- a/target/linux/bcm27xx/patches-6.18/0061-drivers-char-add-generic-gpiomem-driver.patch +++ b/target/linux/bcm27xx/patches-6.18/0061-drivers-char-add-generic-gpiomem-driver.patch @@ -25,8 +25,6 @@ Signed-off-by: Jonathan Bell 3 files changed, 284 insertions(+) create mode 100644 drivers/char/raspberrypi-gpiomem.c -diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig -index 57442c5c8f63..ff87476d945a 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -425,4 +425,12 @@ config ADI @@ -42,18 +40,13 @@ index 57442c5c8f63..ff87476d945a 100644 + register page to the user's pointer. + endmenu -diff --git a/drivers/char/Makefile b/drivers/char/Makefile -index da45158c075e..2c5ea59dfec6 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile -@@ -45,3 +45,4 @@ obj-$(CONFIG_XILLYBUS_CLASS) += xillybus/ +@@ -45,3 +45,4 @@ obj-$(CONFIG_XILLYBUS_CLASS) += xillybus obj-$(CONFIG_POWERNV_OP_PANEL) += powernv-op-panel.o obj-$(CONFIG_ADI) += adi.o obj-$(CONFIG_BRCM_CHAR_DRIVERS) += broadcom/ +obj-$(CONFIG_RASPBERRYPI_GPIOMEM) += raspberrypi-gpiomem.o -diff --git a/drivers/char/raspberrypi-gpiomem.c b/drivers/char/raspberrypi-gpiomem.c -new file mode 100644 -index 000000000000..0f9b15bc14a8 --- /dev/null +++ b/drivers/char/raspberrypi-gpiomem.c @@ -0,0 +1,275 @@ @@ -332,6 +325,3 @@ index 000000000000..0f9b15bc14a8 +MODULE_LICENSE("Dual BSD/GPL"); +MODULE_DESCRIPTION("Driver for accessing GPIOs from userspace"); +MODULE_AUTHOR("Jonathan Bell "); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0062-firmware-bcm2835-Support-ARCH_BCM270x.patch b/target/linux/bcm27xx/patches-6.18/0062-firmware-bcm2835-Support-ARCH_BCM270x.patch index ba5a7296ed7..41bd1ccfd28 100644 --- a/target/linux/bcm27xx/patches-6.18/0062-firmware-bcm2835-Support-ARCH_BCM270x.patch +++ b/target/linux/bcm27xx/patches-6.18/0062-firmware-bcm2835-Support-ARCH_BCM270x.patch @@ -25,8 +25,6 @@ Signed-off-by: Noralf Trønnes drivers/firmware/raspberrypi.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) -diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c -index 7ecde6921a0a..3ce22dac1786 100644 --- a/drivers/firmware/raspberrypi.c +++ b/drivers/firmware/raspberrypi.c @@ -34,6 +34,8 @@ struct rpi_firmware { @@ -38,7 +36,7 @@ index 7ecde6921a0a..3ce22dac1786 100644 static DEFINE_MUTEX(transaction_lock); static void response_callback(struct mbox_client *cl, void *msg) -@@ -301,6 +303,7 @@ static int rpi_firmware_probe(struct platform_device *pdev) +@@ -301,6 +303,7 @@ static int rpi_firmware_probe(struct pla kref_init(&fw->consumers); platform_set_drvdata(pdev, fw); @@ -46,7 +44,7 @@ index 7ecde6921a0a..3ce22dac1786 100644 rpi_firmware_print_firmware_revision(fw); rpi_register_hwmon_driver(dev, fw); -@@ -329,6 +332,7 @@ static void rpi_firmware_remove(struct platform_device *pdev) +@@ -329,6 +332,7 @@ static void rpi_firmware_remove(struct p rpi_clk = NULL; rpi_firmware_put(fw); @@ -54,7 +52,7 @@ index 7ecde6921a0a..3ce22dac1786 100644 } static const struct of_device_id rpi_firmware_of_match[] = { -@@ -408,7 +412,18 @@ static struct platform_driver rpi_firmware_driver = { +@@ -408,7 +412,18 @@ static struct platform_driver rpi_firmwa .shutdown = rpi_firmware_shutdown, .remove = rpi_firmware_remove, }; @@ -74,6 +72,3 @@ index 7ecde6921a0a..3ce22dac1786 100644 MODULE_AUTHOR("Eric Anholt "); MODULE_DESCRIPTION("Raspberry Pi firmware driver"); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0063-leds-Add-the-input-trigger-for-pwr_led.patch b/target/linux/bcm27xx/patches-6.18/0063-leds-Add-the-input-trigger-for-pwr_led.patch index ad0af92884c..420c0b4a0ba 100644 --- a/target/linux/bcm27xx/patches-6.18/0063-leds-Add-the-input-trigger-for-pwr_led.patch +++ b/target/linux/bcm27xx/patches-6.18/0063-leds-Add-the-input-trigger-for-pwr_led.patch @@ -29,11 +29,9 @@ See: https://github.com/raspberrypi/linux/issues/1064 5 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 drivers/leds/trigger/ledtrig-input.c -diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c -index a3428b22de3a..c4e0ceda70a7 100644 --- a/drivers/leds/leds-gpio.c +++ b/drivers/leds/leds-gpio.c -@@ -50,8 +50,15 @@ static void gpio_led_set(struct led_classdev *led_cdev, +@@ -50,8 +50,15 @@ static void gpio_led_set(struct led_clas led_dat->platform_gpio_blink_set(led_dat->gpiod, level, NULL, NULL); led_dat->blinking = 0; @@ -50,7 +48,7 @@ index a3428b22de3a..c4e0ceda70a7 100644 gpiod_set_value_cansleep(led_dat->gpiod, level); else gpiod_set_value(led_dat->gpiod, level); -@@ -65,6 +72,13 @@ static int gpio_led_set_blocking(struct led_classdev *led_cdev, +@@ -65,6 +72,13 @@ static int gpio_led_set_blocking(struct return 0; } @@ -64,7 +62,7 @@ index a3428b22de3a..c4e0ceda70a7 100644 static int gpio_blink_set(struct led_classdev *led_cdev, unsigned long *delay_on, unsigned long *delay_off) { -@@ -94,6 +108,7 @@ static int create_gpio_led(const struct gpio_led *template, +@@ -94,6 +108,7 @@ static int create_gpio_led(const struct led_dat->platform_gpio_blink_set = blink_set; led_dat->cdev.blink_set = gpio_blink_set; } @@ -72,8 +70,6 @@ index a3428b22de3a..c4e0ceda70a7 100644 if (template->default_state == LEDS_GPIO_DEFSTATE_KEEP) { state = gpiod_get_value_cansleep(led_dat->gpiod); if (state < 0) -diff --git a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig -index c11282a74b5a..011b27ef30ec 100644 --- a/drivers/leds/trigger/Kconfig +++ b/drivers/leds/trigger/Kconfig @@ -113,6 +113,13 @@ config LEDS_TRIGGER_CAMERA @@ -90,11 +86,9 @@ index c11282a74b5a..011b27ef30ec 100644 config LEDS_TRIGGER_PANIC bool "LED Panic Trigger" help -diff --git a/drivers/leds/trigger/Makefile b/drivers/leds/trigger/Makefile -index 3b3628889f68..5c4653d7f4de 100644 --- a/drivers/leds/trigger/Makefile +++ b/drivers/leds/trigger/Makefile -@@ -11,6 +11,7 @@ obj-$(CONFIG_LEDS_TRIGGER_ACTIVITY) += ledtrig-activity.o +@@ -11,6 +11,7 @@ obj-$(CONFIG_LEDS_TRIGGER_ACTIVITY) += l obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o obj-$(CONFIG_LEDS_TRIGGER_TRANSIENT) += ledtrig-transient.o obj-$(CONFIG_LEDS_TRIGGER_CAMERA) += ledtrig-camera.o @@ -102,9 +96,6 @@ index 3b3628889f68..5c4653d7f4de 100644 obj-$(CONFIG_LEDS_TRIGGER_PANIC) += ledtrig-panic.o obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o obj-$(CONFIG_LEDS_TRIGGER_PATTERN) += ledtrig-pattern.o -diff --git a/drivers/leds/trigger/ledtrig-input.c b/drivers/leds/trigger/ledtrig-input.c -new file mode 100644 -index 000000000000..8a974a355656 --- /dev/null +++ b/drivers/leds/trigger/ledtrig-input.c @@ -0,0 +1,55 @@ @@ -163,8 +154,6 @@ index 000000000000..8a974a355656 +MODULE_AUTHOR("Phil Elwell "); +MODULE_DESCRIPTION("Set LED GPIO to Input \"trigger\""); +MODULE_LICENSE("GPL"); -diff --git a/include/linux/leds.h b/include/linux/leds.h -index b16b803cc1ac..4dff7add72ce 100644 --- a/include/linux/leds.h +++ b/include/linux/leds.h @@ -109,6 +109,9 @@ struct led_classdev { @@ -177,6 +166,3 @@ index b16b803cc1ac..4dff7add72ce 100644 /* set_brightness_work / blink_timer flags, atomic, private. */ unsigned long work_flags; --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0064-Added-Device-IDs-for-August-DVB-T-205.patch b/target/linux/bcm27xx/patches-6.18/0064-Added-Device-IDs-for-August-DVB-T-205.patch index 8074887c54f..87f5d4088ce 100644 --- a/target/linux/bcm27xx/patches-6.18/0064-Added-Device-IDs-for-August-DVB-T-205.patch +++ b/target/linux/bcm27xx/patches-6.18/0064-Added-Device-IDs-for-August-DVB-T-205.patch @@ -7,11 +7,9 @@ Subject: [PATCH] Added Device IDs for August DVB-T 205 drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c -index 487c6ab784ab..62dc688f0ac7 100644 --- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c +++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c -@@ -1964,6 +1964,10 @@ static const struct usb_device_id rtl28xxu_id_table[] = { +@@ -1964,6 +1964,10 @@ static const struct usb_device_id rtl28x &rtl28xxu_props, "Compro VideoMate U650F", NULL) }, { DVB_USB_DEVICE(USB_VID_KWORLD_2, 0xd394, &rtl28xxu_props, "MaxMedia HU394-T", NULL) }, @@ -22,6 +20,3 @@ index 487c6ab784ab..62dc688f0ac7 100644 { DVB_USB_DEVICE(USB_VID_LEADTEK, 0x6a03, &rtl28xxu_props, "Leadtek WinFast DTV Dongle mini", NULL) }, { DVB_USB_DEVICE(USB_VID_GTEK, USB_PID_CPYTO_REDI_PC50A, --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0065-Improve-__copy_to_user-and-__copy_from_user-performa.patch b/target/linux/bcm27xx/patches-6.18/0065-Improve-__copy_to_user-and-__copy_from_user-performa.patch index 5528cd5b130..4b085bcf919 100644 --- a/target/linux/bcm27xx/patches-6.18/0065-Improve-__copy_to_user-and-__copy_from_user-performa.patch +++ b/target/linux/bcm27xx/patches-6.18/0065-Improve-__copy_to_user-and-__copy_from_user-performa.patch @@ -84,11 +84,9 @@ Signed-off-by: Phil Elwell create mode 100644 arch/arm/lib/memmove_rpi.S create mode 100644 arch/arm/lib/memset_rpi.S -diff --git a/arch/arm/include/asm/string.h b/arch/arm/include/asm/string.h -index 96fc6cf460ec..94f1abb48d49 100644 --- a/arch/arm/include/asm/string.h +++ b/arch/arm/include/asm/string.h -@@ -72,4 +72,9 @@ static inline void *memset64(uint64_t *p, uint64_t v, __kernel_size_t n) +@@ -72,4 +72,9 @@ static inline void *memset64(uint64_t *p #endif @@ -98,8 +96,6 @@ index 96fc6cf460ec..94f1abb48d49 100644 +#endif + #endif -diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h -index f90be312418e..4fe53e1a647c 100644 --- a/arch/arm/include/asm/uaccess.h +++ b/arch/arm/include/asm/uaccess.h @@ -533,6 +533,9 @@ do { \ @@ -112,8 +108,6 @@ index f90be312418e..4fe53e1a647c 100644 static inline unsigned long __must_check raw_copy_from_user(void *to, const void __user *from, unsigned long n) { -diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile -index 0ca5aae1bcc3..c3a0c40550ee 100644 --- a/arch/arm/lib/Makefile +++ b/arch/arm/lib/Makefile @@ -7,8 +7,8 @@ @@ -144,9 +138,6 @@ index 0ca5aae1bcc3..c3a0c40550ee 100644 # using lib_ here won't override already available weak symbols obj-$(CONFIG_UACCESS_WITH_MEMCPY) += uaccess_with_memcpy.o -diff --git a/arch/arm/lib/arm-mem.h b/arch/arm/lib/arm-mem.h -new file mode 100644 -index 000000000000..5d4bda19ad20 --- /dev/null +++ b/arch/arm/lib/arm-mem.h @@ -0,0 +1,159 @@ @@ -309,8 +300,6 @@ index 000000000000..5d4bda19ad20 + .endif +92: +.endm -diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S -index 270de7debd0f..2eda93fc22e6 100644 --- a/arch/arm/lib/copy_from_user.S +++ b/arch/arm/lib/copy_from_user.S @@ -104,7 +104,8 @@ UNWIND( .save {r0, r2, r3, \regs} ) @@ -331,9 +320,6 @@ index 270de7debd0f..2eda93fc22e6 100644 .pushsection .text.fixup,"ax" .align 0 -diff --git a/arch/arm/lib/exports_rpi.c b/arch/arm/lib/exports_rpi.c -new file mode 100644 -index 000000000000..1f826047db75 --- /dev/null +++ b/arch/arm/lib/exports_rpi.c @@ -0,0 +1,37 @@ @@ -374,9 +360,6 @@ index 000000000000..1f826047db75 +#include + +EXPORT_SYMBOL(memcmp); -diff --git a/arch/arm/lib/memcmp_rpi.S b/arch/arm/lib/memcmp_rpi.S -new file mode 100644 -index 000000000000..bf6e4edfc9d3 --- /dev/null +++ b/arch/arm/lib/memcmp_rpi.S @@ -0,0 +1,285 @@ @@ -665,9 +648,6 @@ index 000000000000..bf6e4edfc9d3 + .unreq DAT7 + .unreq OFF +ENDPROC(memcmp) -diff --git a/arch/arm/lib/memcpy_rpi.S b/arch/arm/lib/memcpy_rpi.S -new file mode 100644 -index 000000000000..d246f9f3903a --- /dev/null +++ b/arch/arm/lib/memcpy_rpi.S @@ -0,0 +1,65 @@ @@ -736,9 +716,6 @@ index 000000000000..d246f9f3903a +ENDPROC(__memcpy) +ENDPROC(memcpy) +ENDPROC(mmiocpy) -diff --git a/arch/arm/lib/memcpymove.h b/arch/arm/lib/memcpymove.h -new file mode 100644 -index 000000000000..65a6e065a7f2 --- /dev/null +++ b/arch/arm/lib/memcpymove.h @@ -0,0 +1,488 @@ @@ -1230,9 +1207,6 @@ index 000000000000..65a6e065a7f2 + .unreq LAST + .unreq OFF +.endm -diff --git a/arch/arm/lib/memmove_rpi.S b/arch/arm/lib/memmove_rpi.S -new file mode 100644 -index 000000000000..5715dfd95859 --- /dev/null +++ b/arch/arm/lib/memmove_rpi.S @@ -0,0 +1,63 @@ @@ -1299,9 +1273,6 @@ index 000000000000..5715dfd95859 + bpl memcpy /* pl works even over -1 - 0 and 0x7fffffff - 0x80000000 boundaries */ + memcpy 1 +ENDPROC(memmove) -diff --git a/arch/arm/lib/memset_rpi.S b/arch/arm/lib/memset_rpi.S -new file mode 100644 -index 000000000000..087d68ea5d18 --- /dev/null +++ b/arch/arm/lib/memset_rpi.S @@ -0,0 +1,132 @@ @@ -1437,8 +1408,6 @@ index 000000000000..087d68ea5d18 +ENDPROC(__memset) +ENDPROC(memset) +ENDPROC(mmioset) -diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c -index c0ac7796d775..c416c7d3242f 100644 --- a/arch/arm/lib/uaccess_with_memcpy.c +++ b/arch/arm/lib/uaccess_with_memcpy.c @@ -19,6 +19,14 @@ @@ -1456,7 +1425,7 @@ index c0ac7796d775..c416c7d3242f 100644 static int pin_page_for_write(const void __user *_addr, pte_t **ptep, spinlock_t **ptlp) { -@@ -43,7 +51,7 @@ pin_page_for_write(const void __user *_addr, pte_t **ptep, spinlock_t **ptlp) +@@ -43,7 +51,7 @@ pin_page_for_write(const void __user *_a return 0; pmd = pmd_offset(pud, addr); @@ -1465,7 +1434,7 @@ index c0ac7796d775..c416c7d3242f 100644 return 0; /* -@@ -89,6 +97,47 @@ pin_page_for_write(const void __user *_addr, pte_t **ptep, spinlock_t **ptlp) +@@ -89,6 +97,47 @@ pin_page_for_write(const void __user *_a return 1; } @@ -1513,7 +1482,7 @@ index c0ac7796d775..c416c7d3242f 100644 static unsigned long noinline __copy_to_user_memcpy(void __user *to, const void *from, unsigned long n) { -@@ -137,6 +186,54 @@ __copy_to_user_memcpy(void __user *to, const void *from, unsigned long n) +@@ -137,6 +186,54 @@ out: return n; } @@ -1568,7 +1537,7 @@ index c0ac7796d775..c416c7d3242f 100644 unsigned long arm_copy_to_user(void __user *to, const void *from, unsigned long n) { -@@ -147,7 +244,7 @@ arm_copy_to_user(void __user *to, const void *from, unsigned long n) +@@ -147,7 +244,7 @@ arm_copy_to_user(void __user *to, const * With frame pointer disabled, tail call optimization kicks in * as well making this test almost invisible. */ @@ -1577,7 +1546,7 @@ index c0ac7796d775..c416c7d3242f 100644 unsigned long ua_flags = uaccess_save_and_enable(); n = __copy_to_user_std(to, from, n); uaccess_restore(ua_flags); -@@ -157,6 +254,32 @@ arm_copy_to_user(void __user *to, const void *from, unsigned long n) +@@ -157,6 +254,32 @@ arm_copy_to_user(void __user *to, const } return n; } @@ -1610,8 +1579,6 @@ index c0ac7796d775..c416c7d3242f 100644 static unsigned long noinline __clear_user_memset(void __user *addr, unsigned long n) -diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig -index 653a909c5ecd..203be91af9eb 100644 --- a/arch/arm/mach-bcm/Kconfig +++ b/arch/arm/mach-bcm/Kconfig @@ -181,6 +181,13 @@ config ARCH_BCM_53573 @@ -1628,6 +1595,3 @@ index 653a909c5ecd..203be91af9eb 100644 config ARCH_BRCMSTB bool "Broadcom BCM7XXX based boards" depends on ARCH_MULTI_V7 --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0066-mfd-Add-Raspberry-Pi-Sense-HAT-core-driver.patch b/target/linux/bcm27xx/patches-6.18/0066-mfd-Add-Raspberry-Pi-Sense-HAT-core-driver.patch index 32fa94fa598..6c03852b2ab 100644 --- a/target/linux/bcm27xx/patches-6.18/0066-mfd-Add-Raspberry-Pi-Sense-HAT-core-driver.patch +++ b/target/linux/bcm27xx/patches-6.18/0066-mfd-Add-Raspberry-Pi-Sense-HAT-core-driver.patch @@ -38,8 +38,6 @@ Signed-off-by: Dave Stevenson create mode 100644 drivers/video/fbdev/rpisense-fb.c create mode 100644 include/linux/mfd/rpisense/framebuffer.h -diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig -index 9353d51f38d3..062bf7338c54 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -1833,6 +1833,19 @@ config FB_SM712 @@ -62,11 +60,9 @@ index 9353d51f38d3..062bf7338c54 100644 source "drivers/video/fbdev/omap/Kconfig" source "drivers/video/fbdev/omap2/Kconfig" source "drivers/video/fbdev/mmp/Kconfig" -diff --git a/drivers/video/fbdev/Makefile b/drivers/video/fbdev/Makefile -index ee9b2c3c7206..ea305adc3f3c 100644 --- a/drivers/video/fbdev/Makefile +++ b/drivers/video/fbdev/Makefile -@@ -124,6 +124,7 @@ obj-$(CONFIG_FB_VGA16) += vga16fb.o +@@ -124,6 +124,7 @@ obj-$(CONFIG_FB_VGA16) += vga obj-$(CONFIG_FB_OF) += offb.o obj-$(CONFIG_FB_SSD1307) += ssd1307fb.o obj-$(CONFIG_FB_SIMPLE) += simplefb.o @@ -74,9 +70,6 @@ index ee9b2c3c7206..ea305adc3f3c 100644 # the test framebuffer is last obj-$(CONFIG_FB_VIRTUAL) += vfb.o -diff --git a/drivers/video/fbdev/rpisense-fb.c b/drivers/video/fbdev/rpisense-fb.c -new file mode 100644 -index 000000000000..a2a63ddbe012 --- /dev/null +++ b/drivers/video/fbdev/rpisense-fb.c @@ -0,0 +1,295 @@ @@ -375,9 +368,6 @@ index 000000000000..a2a63ddbe012 +MODULE_AUTHOR("Serge Schneider "); +MODULE_LICENSE("GPL"); + -diff --git a/include/linux/mfd/rpisense/framebuffer.h b/include/linux/mfd/rpisense/framebuffer.h -new file mode 100644 -index 000000000000..621f24386bb0 --- /dev/null +++ b/include/linux/mfd/rpisense/framebuffer.h @@ -0,0 +1,35 @@ @@ -416,6 +406,3 @@ index 000000000000..621f24386bb0 +}; + +#endif --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0067-drivers-mfd-sensehat-Add-Raspberry-Pi-Sense-HAT-to-s.patch b/target/linux/bcm27xx/patches-6.18/0067-drivers-mfd-sensehat-Add-Raspberry-Pi-Sense-HAT-to-s.patch index c04acb325ed..2b957c70cee 100644 --- a/target/linux/bcm27xx/patches-6.18/0067-drivers-mfd-sensehat-Add-Raspberry-Pi-Sense-HAT-to-s.patch +++ b/target/linux/bcm27xx/patches-6.18/0067-drivers-mfd-sensehat-Add-Raspberry-Pi-Sense-HAT-to-s.patch @@ -17,11 +17,9 @@ Signed-off-by: Charles Mirabile drivers/mfd/simple-mfd-i2c.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/drivers/mfd/simple-mfd-i2c.c b/drivers/mfd/simple-mfd-i2c.c -index 9f911afafc25..28675b53cbc4 100644 --- a/drivers/mfd/simple-mfd-i2c.c +++ b/drivers/mfd/simple-mfd-i2c.c -@@ -118,6 +118,7 @@ static const struct of_device_id simple_mfd_i2c_of_match[] = { +@@ -118,6 +118,7 @@ static const struct of_device_id simple_ { .compatible = "maxim,max5970", .data = &maxim_max5970}, { .compatible = "maxim,max5978", .data = &maxim_max5970}, { .compatible = "maxim,max77705-battery", .data = &maxim_mon_max77705}, @@ -29,6 +27,3 @@ index 9f911afafc25..28675b53cbc4 100644 { .compatible = "silergy,sy7636a", .data = &silergy_sy7636a}, { .compatible = "spacemit,p1", .data = &spacemit_p1, }, {} --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0068-Input-sensehat-joystick-Revert-to-downstream-keymap.patch b/target/linux/bcm27xx/patches-6.18/0068-Input-sensehat-joystick-Revert-to-downstream-keymap.patch index 36d31bcb770..78ace2a7ea2 100644 --- a/target/linux/bcm27xx/patches-6.18/0068-Input-sensehat-joystick-Revert-to-downstream-keymap.patch +++ b/target/linux/bcm27xx/patches-6.18/0068-Input-sensehat-joystick-Revert-to-downstream-keymap.patch @@ -14,8 +14,6 @@ Signed-off-by: Dave Stevenson drivers/input/joystick/sensehat-joystick.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/input/joystick/sensehat-joystick.c b/drivers/input/joystick/sensehat-joystick.c -index a84df39d3b2f..f24beb98e444 100644 --- a/drivers/input/joystick/sensehat-joystick.c +++ b/drivers/input/joystick/sensehat-joystick.c @@ -28,7 +28,7 @@ struct sensehat_joystick { @@ -27,6 +25,3 @@ index a84df39d3b2f..f24beb98e444 100644 }; static irqreturn_t sensehat_joystick_report(int irq, void *cookie) --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0069-ASoC-Add-support-for-all-the-downstream-rpi-sound-ca.patch b/target/linux/bcm27xx/patches-6.18/0069-ASoC-Add-support-for-all-the-downstream-rpi-sound-ca.patch index 91d4c56deed..748ef741e60 100644 --- a/target/linux/bcm27xx/patches-6.18/0069-ASoC-Add-support-for-all-the-downstream-rpi-sound-ca.patch +++ b/target/linux/bcm27xx/patches-6.18/0069-ASoC-Add-support-for-all-the-downstream-rpi-sound-ca.patch @@ -1472,9 +1472,6 @@ Signed-off-by: Giedrius Trainavičius create mode 100644 sound/soc/raspberrypi/Makefile create mode 100644 sound/soc/raspberrypi/rp1_aout.c -diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt -new file mode 100644 -index 000000000000..7bc73e57add3 --- /dev/null +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -0,0 +1,464 @@ @@ -1942,8 +1939,6 @@ index 000000000000..7bc73e57add3 +zii Zodiac Inflight Innovations +zte ZTE Corp. +zyxel ZyXEL Communications Corp. -diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml -index f1d1882009ba..8f01aa016db1 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml @@ -235,6 +235,8 @@ patternProperties: @@ -1955,8 +1950,6 @@ index f1d1882009ba..8f01aa016db1 100644 "^bluegiga,.*": description: Bluegiga Technologies Ltd. "^blutek,.*": -diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig -index 3a1611008e48..977df860c856 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@ -106,6 +106,12 @@ config COMMON_CLK_HI655X @@ -1972,11 +1965,9 @@ index 3a1611008e48..977df860c856 100644 config COMMON_CLK_SCMI tristate "Clock driver controlled via SCMI interface" depends on ARM_SCMI_PROTOCOL || COMPILE_TEST -diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile -index 61ec08404442..fc95155f9167 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile -@@ -72,6 +72,8 @@ obj-$(CONFIG_COMMON_CLK_LAN966X) += clk-lan966x.o +@@ -72,6 +72,8 @@ obj-$(CONFIG_COMMON_CLK_LAN966X) += clk- obj-$(CONFIG_COMMON_CLK_LOCHNAGAR) += clk-lochnagar.o obj-$(CONFIG_MACH_LOONGSON32) += clk-loongson1.o obj-$(CONFIG_COMMON_CLK_LOONGSON2) += clk-loongson2.o @@ -1985,9 +1976,6 @@ index 61ec08404442..fc95155f9167 100644 obj-$(CONFIG_COMMON_CLK_MAX77686) += clk-max77686.o obj-$(CONFIG_COMMON_CLK_MAX9485) += clk-max9485.o obj-$(CONFIG_ARCH_MILBEAUT_M10V) += clk-milbeaut.o -diff --git a/drivers/clk/clk-hifiberry-dachd.c b/drivers/clk/clk-hifiberry-dachd.c -new file mode 100644 -index 000000000000..5280b5100559 --- /dev/null +++ b/drivers/clk/clk-hifiberry-dachd.c @@ -0,0 +1,331 @@ @@ -2322,9 +2310,6 @@ index 000000000000..5280b5100559 +MODULE_AUTHOR("Joerg Schambacher "); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:clk-hifiberry-dachd"); -diff --git a/drivers/clk/clk-hifiberry-dacpro.c b/drivers/clk/clk-hifiberry-dacpro.c -new file mode 100644 -index 000000000000..0cbc0349f9f6 --- /dev/null +++ b/drivers/clk/clk-hifiberry-dacpro.c @@ -0,0 +1,180 @@ @@ -2508,8 +2493,6 @@ index 000000000000..0cbc0349f9f6 +MODULE_DESCRIPTION("HiFiBerry DAC Pro clock driver"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:clk-hifiberry-dacpro"); -diff --git a/sound/drivers/Kconfig b/sound/drivers/Kconfig -index 6debd8e95cb7..51b17967f206 100644 --- a/sound/drivers/Kconfig +++ b/sound/drivers/Kconfig @@ -263,4 +263,25 @@ config SND_AC97_POWER_SAVE_DEFAULT @@ -2538,8 +2521,6 @@ index 6debd8e95cb7..51b17967f206 100644 + will be called snd-soc-upisnd-ctrl and snd-soc-upisnd-codec. + endif # SND_DRIVERS -diff --git a/sound/drivers/Makefile b/sound/drivers/Makefile -index a08bdd70ec9c..1cce9943ddef 100644 --- a/sound/drivers/Makefile +++ b/sound/drivers/Makefile @@ -9,6 +9,7 @@ snd-aloop-y := aloop.o @@ -2550,7 +2531,7 @@ index a08bdd70ec9c..1cce9943ddef 100644 snd-portman2x4-y := portman2x4.o snd-serial-u16550-y := serial-u16550.o snd-serial-generic-y := serial-generic.o -@@ -23,6 +24,7 @@ obj-$(CONFIG_SND_SERIAL_U16550) += snd-serial-u16550.o +@@ -23,6 +24,7 @@ obj-$(CONFIG_SND_SERIAL_U16550) += snd-s obj-$(CONFIG_SND_SERIAL_GENERIC) += snd-serial-generic.o obj-$(CONFIG_SND_MTPAV) += snd-mtpav.o obj-$(CONFIG_SND_MTS64) += snd-mts64.o @@ -2559,9 +2540,6 @@ index a08bdd70ec9c..1cce9943ddef 100644 -obj-$(CONFIG_SND) += opl3/ opl4/ mpu401/ vx/ pcsp/ +obj-$(CONFIG_SND) += opl3/ opl4/ mpu401/ vx/ pcsp/ upisnd/ -diff --git a/sound/drivers/pimidi.c b/sound/drivers/pimidi.c -new file mode 100644 -index 000000000000..c399707425b7 --- /dev/null +++ b/sound/drivers/pimidi.c @@ -0,0 +1,1113 @@ @@ -3678,9 +3656,6 @@ index 000000000000..c399707425b7 +MODULE_LICENSE("GPL"); + +/* vim: set ts=8 sw=8 noexpandtab: */ -diff --git a/sound/drivers/upisnd/Makefile b/sound/drivers/upisnd/Makefile -new file mode 100644 -index 000000000000..00f3d5125380 --- /dev/null +++ b/sound/drivers/upisnd/Makefile @@ -0,0 +1,23 @@ @@ -3707,9 +3682,6 @@ index 000000000000..00f3d5125380 +obj-$(CONFIG_SND_PISOUND_MICRO) := snd-soc-upisnd-ctrl.o snd-soc-upisnd-codec.o +snd-soc-upisnd-ctrl-objs := upisnd_module.o upisnd_ctrl.o upisnd_comm.o upisnd_sound.o upisnd_midi.o upisnd_pins.o upisnd_gpio.o upisnd_sysfs.o upisnd_utils.o +snd-soc-upisnd-codec-objs := upisnd_codec.o -diff --git a/sound/drivers/upisnd/upisnd_codec.c b/sound/drivers/upisnd/upisnd_codec.c -new file mode 100644 -index 000000000000..1ca772555048 --- /dev/null +++ b/sound/drivers/upisnd/upisnd_codec.c @@ -0,0 +1,1748 @@ @@ -5461,9 +5433,6 @@ index 000000000000..1ca772555048 +MODULE_LICENSE("GPL v2"); + +/* vim: set ts=8 sw=8 noexpandtab: */ -diff --git a/sound/drivers/upisnd/upisnd_codec.h b/sound/drivers/upisnd/upisnd_codec.h -new file mode 100644 -index 000000000000..c82be33711ff --- /dev/null +++ b/sound/drivers/upisnd/upisnd_codec.h @@ -0,0 +1,23 @@ @@ -5490,9 +5459,6 @@ index 000000000000..c82be33711ff +extern bool adau1961_is_hp_capless(struct snd_soc_component *component); + +#endif // UPISOUND_CODEC_H -diff --git a/sound/drivers/upisnd/upisnd_comm.c b/sound/drivers/upisnd/upisnd_comm.c -new file mode 100644 -index 000000000000..361098324c1d --- /dev/null +++ b/sound/drivers/upisnd/upisnd_comm.c @@ -0,0 +1,638 @@ @@ -6134,9 +6100,6 @@ index 000000000000..361098324c1d +} + +/* vim: set ts=8 sw=8 noexpandtab: */ -diff --git a/sound/drivers/upisnd/upisnd_comm.h b/sound/drivers/upisnd/upisnd_comm.h -new file mode 100644 -index 000000000000..5ecbaa14f81a --- /dev/null +++ b/sound/drivers/upisnd/upisnd_comm.h @@ -0,0 +1,104 @@ @@ -6244,9 +6207,6 @@ index 000000000000..5ecbaa14f81a +#endif // UPISOUND_COMM_H + +/* vim: set ts=8 sw=8 noexpandtab: */ -diff --git a/sound/drivers/upisnd/upisnd_common.h b/sound/drivers/upisnd/upisnd_common.h -new file mode 100644 -index 000000000000..0f810de86030 --- /dev/null +++ b/sound/drivers/upisnd/upisnd_common.h @@ -0,0 +1,97 @@ @@ -6347,9 +6307,6 @@ index 000000000000..0f810de86030 +#endif // UPISOUND_COMMON_H + +/* vim: set ts=8 sw=8 noexpandtab: */ -diff --git a/sound/drivers/upisnd/upisnd_ctrl.c b/sound/drivers/upisnd/upisnd_ctrl.c -new file mode 100644 -index 000000000000..fcd0b326bef7 --- /dev/null +++ b/sound/drivers/upisnd/upisnd_ctrl.c @@ -0,0 +1,246 @@ @@ -6599,9 +6556,6 @@ index 000000000000..fcd0b326bef7 +} + +/* vim: set ts=8 sw=8 noexpandtab: */ -diff --git a/sound/drivers/upisnd/upisnd_ctrl.h b/sound/drivers/upisnd/upisnd_ctrl.h -new file mode 100644 -index 000000000000..6851a491cc6a --- /dev/null +++ b/sound/drivers/upisnd/upisnd_ctrl.h @@ -0,0 +1,36 @@ @@ -6641,9 +6595,6 @@ index 000000000000..6851a491cc6a +#endif // UPISOUND_CTRL_H + +/* vim: set ts=8 sw=8 noexpandtab: */ -diff --git a/sound/drivers/upisnd/upisnd_debug.h b/sound/drivers/upisnd/upisnd_debug.h -new file mode 100644 -index 000000000000..b0b3fda9451f --- /dev/null +++ b/sound/drivers/upisnd/upisnd_debug.h @@ -0,0 +1,34 @@ @@ -6681,9 +6632,6 @@ index 000000000000..b0b3fda9451f +#endif // UPISOUND_DEBUG_H + +/* vim: set ts=8 sw=8 noexpandtab: */ -diff --git a/sound/drivers/upisnd/upisnd_gpio.c b/sound/drivers/upisnd/upisnd_gpio.c -new file mode 100644 -index 000000000000..8b0df275792c --- /dev/null +++ b/sound/drivers/upisnd/upisnd_gpio.c @@ -0,0 +1,869 @@ @@ -7556,9 +7504,6 @@ index 000000000000..8b0df275792c +} + +/* vim: set ts=8 sw=8 noexpandtab: */ -diff --git a/sound/drivers/upisnd/upisnd_gpio.h b/sound/drivers/upisnd/upisnd_gpio.h -new file mode 100644 -index 000000000000..7ad50b557063 --- /dev/null +++ b/sound/drivers/upisnd/upisnd_gpio.h @@ -0,0 +1,75 @@ @@ -7637,9 +7582,6 @@ index 000000000000..7ad50b557063 +#endif // UPISOUND_GPIO_H + +/* vim: set ts=8 sw=8 noexpandtab: */ -diff --git a/sound/drivers/upisnd/upisnd_midi.c b/sound/drivers/upisnd/upisnd_midi.c -new file mode 100644 -index 000000000000..b7fea8227bf6 --- /dev/null +++ b/sound/drivers/upisnd/upisnd_midi.c @@ -0,0 +1,337 @@ @@ -7980,9 +7922,6 @@ index 000000000000..b7fea8227bf6 +} + +/* vim: set ts=8 sw=8 noexpandtab: */ -diff --git a/sound/drivers/upisnd/upisnd_midi.h b/sound/drivers/upisnd/upisnd_midi.h -new file mode 100644 -index 000000000000..0a4678e17e07 --- /dev/null +++ b/sound/drivers/upisnd/upisnd_midi.h @@ -0,0 +1,47 @@ @@ -8033,9 +7972,6 @@ index 000000000000..0a4678e17e07 +#endif // UPISOUND_MIDI_H + +/* vim: set ts=8 sw=8 noexpandtab: */ -diff --git a/sound/drivers/upisnd/upisnd_module.c b/sound/drivers/upisnd/upisnd_module.c -new file mode 100644 -index 000000000000..ef545313c0c2 --- /dev/null +++ b/sound/drivers/upisnd/upisnd_module.c @@ -0,0 +1,273 @@ @@ -8312,9 +8248,6 @@ index 000000000000..ef545313c0c2 +MODULE_LICENSE("GPL v2"); + +/* vim: set ts=8 sw=8 noexpandtab: */ -diff --git a/sound/drivers/upisnd/upisnd_pins.c b/sound/drivers/upisnd/upisnd_pins.c -new file mode 100644 -index 000000000000..8e3e9bac6bed --- /dev/null +++ b/sound/drivers/upisnd/upisnd_pins.c @@ -0,0 +1,113 @@ @@ -8431,9 +8364,6 @@ index 000000000000..8e3e9bac6bed +} + +/* vim: set ts=8 sw=8 noexpandtab: */ -diff --git a/sound/drivers/upisnd/upisnd_pins.h b/sound/drivers/upisnd/upisnd_pins.h -new file mode 100644 -index 000000000000..5f4b3a5660a3 --- /dev/null +++ b/sound/drivers/upisnd/upisnd_pins.h @@ -0,0 +1,67 @@ @@ -8504,9 +8434,6 @@ index 000000000000..5f4b3a5660a3 +#endif // UPISOUND_PINS_H + +/* vim: set ts=8 sw=8 noexpandtab: */ -diff --git a/sound/drivers/upisnd/upisnd_protocol.h b/sound/drivers/upisnd/upisnd_protocol.h -new file mode 100644 -index 000000000000..59beaa3e6cbf --- /dev/null +++ b/sound/drivers/upisnd/upisnd_protocol.h @@ -0,0 +1,323 @@ @@ -8833,9 +8760,6 @@ index 000000000000..59beaa3e6cbf +#endif // UPISND_PROTOCOL_H + +/* vim: set ts=8 sw=8 noexpandtab: */ -diff --git a/sound/drivers/upisnd/upisnd_sound.c b/sound/drivers/upisnd/upisnd_sound.c -new file mode 100644 -index 000000000000..c3df5e1f1570 --- /dev/null +++ b/sound/drivers/upisnd/upisnd_sound.c @@ -0,0 +1,277 @@ @@ -9116,9 +9040,6 @@ index 000000000000..c3df5e1f1570 +} + +/* vim: set ts=8 sw=8 noexpandtab: */ -diff --git a/sound/drivers/upisnd/upisnd_sound.h b/sound/drivers/upisnd/upisnd_sound.h -new file mode 100644 -index 000000000000..100f30733ba2 --- /dev/null +++ b/sound/drivers/upisnd/upisnd_sound.h @@ -0,0 +1,28 @@ @@ -9150,9 +9071,6 @@ index 000000000000..100f30733ba2 +#endif // UPISOUND_SOUND_H + +/* vim: set ts=8 sw=8 noexpandtab: */ -diff --git a/sound/drivers/upisnd/upisnd_sysfs.c b/sound/drivers/upisnd/upisnd_sysfs.c -new file mode 100644 -index 000000000000..3feaa1289dba --- /dev/null +++ b/sound/drivers/upisnd/upisnd_sysfs.c @@ -0,0 +1,1826 @@ @@ -10982,9 +10900,6 @@ index 000000000000..3feaa1289dba +} + +/* vim: set ts=8 sw=8 noexpandtab: */ -diff --git a/sound/drivers/upisnd/upisnd_sysfs.h b/sound/drivers/upisnd/upisnd_sysfs.h -new file mode 100644 -index 000000000000..72a5666c0dc6 --- /dev/null +++ b/sound/drivers/upisnd/upisnd_sysfs.h @@ -0,0 +1,32 @@ @@ -11020,9 +10935,6 @@ index 000000000000..72a5666c0dc6 +#endif // UPISOUND_SYSFS_H + +/* vim: set ts=8 sw=8 noexpandtab: */ -diff --git a/sound/drivers/upisnd/upisnd_utils.c b/sound/drivers/upisnd/upisnd_utils.c -new file mode 100644 -index 000000000000..bf3346512d74 --- /dev/null +++ b/sound/drivers/upisnd/upisnd_utils.c @@ -0,0 +1,33 @@ @@ -11059,9 +10971,6 @@ index 000000000000..bf3346512d74 +} + +/* vim: set ts=8 sw=8 noexpandtab: */ -diff --git a/sound/drivers/upisnd/upisnd_utils.h b/sound/drivers/upisnd/upisnd_utils.h -new file mode 100644 -index 000000000000..e4b41f52fad0 --- /dev/null +++ b/sound/drivers/upisnd/upisnd_utils.h @@ -0,0 +1,25 @@ @@ -11090,8 +10999,6 @@ index 000000000000..e4b41f52fad0 +#endif // UPISOUND_UTILS_H + +/* vim: set ts=8 sw=8 noexpandtab: */ -diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig -index ce74818bd715..c2521d6d8342 100644 --- a/sound/soc/Kconfig +++ b/sound/soc/Kconfig @@ -123,6 +123,7 @@ source "sound/soc/meson/Kconfig" @@ -11102,8 +11009,6 @@ index ce74818bd715..c2521d6d8342 100644 source "sound/soc/renesas/Kconfig" source "sound/soc/rockchip/Kconfig" source "sound/soc/samsung/Kconfig" -diff --git a/sound/soc/Makefile b/sound/soc/Makefile -index 462322c38aa4..c99ebbcc6652 100644 --- a/sound/soc/Makefile +++ b/sound/soc/Makefile @@ -65,6 +65,7 @@ obj-$(CONFIG_SND_SOC) += mxs/ @@ -11114,8 +11019,6 @@ index 462322c38aa4..c99ebbcc6652 100644 obj-$(CONFIG_SND_SOC) += renesas/ obj-$(CONFIG_SND_SOC) += rockchip/ obj-$(CONFIG_SND_SOC) += samsung/ -diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig -index de4e8a0daf1c..07532624467a 100644 --- a/sound/soc/bcm/Kconfig +++ b/sound/soc/bcm/Kconfig @@ -29,4 +29,288 @@ config SND_BCM63XX_I2S_WHISTLER @@ -11407,11 +11310,9 @@ index de4e8a0daf1c..07532624467a 100644 + Say Y or M if you want to add support for tlv320aic3x add-on + endmenu -diff --git a/sound/soc/bcm/Makefile b/sound/soc/bcm/Makefile -index 0c1325a97b70..15c3c4a742c6 100644 --- a/sound/soc/bcm/Makefile +++ b/sound/soc/bcm/Makefile -@@ -12,4 +12,75 @@ obj-$(CONFIG_SND_SOC_CYGNUS) += snd-soc-cygnus.o +@@ -12,4 +12,75 @@ obj-$(CONFIG_SND_SOC_CYGNUS) += snd-soc- # BCM63XX Platform Support snd-soc-63xx-y := bcm63xx-i2s-whistler.o bcm63xx-pcm-whistler.o @@ -11489,9 +11390,6 @@ index 0c1325a97b70..15c3c4a742c6 100644 +obj-$(CONFIG_SND_BCM2708_SOC_PIFI_40) += snd-soc-pifi-40.o +obj-$(CONFIG_SND_BCM2708_SOC_CHIPDIP_DAC) += snd-soc-chipdip-dac.o +obj-$(CONFIG_SND_DACBERRY400) += snd-soc-dacberry400.o -diff --git a/sound/soc/bcm/allo-boss-dac.c b/sound/soc/bcm/allo-boss-dac.c -new file mode 100644 -index 000000000000..342a03e6a7f8 --- /dev/null +++ b/sound/soc/bcm/allo-boss-dac.c @@ -0,0 +1,470 @@ @@ -11965,9 +11863,6 @@ index 000000000000..342a03e6a7f8 +MODULE_AUTHOR("Baswaraj K "); +MODULE_DESCRIPTION("ALSA ASoC Machine Driver for Allo Boss DAC"); +MODULE_LICENSE("GPL v2"); -diff --git a/sound/soc/bcm/allo-boss2-dac.c b/sound/soc/bcm/allo-boss2-dac.c -new file mode 100644 -index 000000000000..7d0232678c9c --- /dev/null +++ b/sound/soc/bcm/allo-boss2-dac.c @@ -0,0 +1,1130 @@ @@ -13101,9 +12996,6 @@ index 000000000000..7d0232678c9c +MODULE_DESCRIPTION("ASoC Allo Boss2 Codec Driver"); +MODULE_AUTHOR("Sudeepkumar "); +MODULE_LICENSE("GPL v2"); -diff --git a/sound/soc/bcm/allo-katana-codec.c b/sound/soc/bcm/allo-katana-codec.c -new file mode 100644 -index 000000000000..4578e8d6501b --- /dev/null +++ b/sound/soc/bcm/allo-katana-codec.c @@ -0,0 +1,386 @@ @@ -13493,9 +13385,6 @@ index 000000000000..4578e8d6501b +MODULE_DESCRIPTION("ASoC Allo Katana Codec Driver"); +MODULE_AUTHOR("Jaikumar "); +MODULE_LICENSE("GPL v2"); -diff --git a/sound/soc/bcm/allo-piano-dac-plus.c b/sound/soc/bcm/allo-piano-dac-plus.c -new file mode 100644 -index 000000000000..187eff7a9aa1 --- /dev/null +++ b/sound/soc/bcm/allo-piano-dac-plus.c @@ -0,0 +1,1026 @@ @@ -14525,9 +14414,6 @@ index 000000000000..187eff7a9aa1 +MODULE_AUTHOR("Baswaraj K "); +MODULE_DESCRIPTION("ALSA ASoC Machine Driver for Allo Piano DAC Plus"); +MODULE_LICENSE("GPL v2"); -diff --git a/sound/soc/bcm/allo-piano-dac.c b/sound/soc/bcm/allo-piano-dac.c -new file mode 100644 -index 000000000000..bb36de653626 --- /dev/null +++ b/sound/soc/bcm/allo-piano-dac.c @@ -0,0 +1,122 @@ @@ -14653,9 +14539,6 @@ index 000000000000..bb36de653626 +MODULE_AUTHOR("Baswaraj K "); +MODULE_DESCRIPTION("ALSA ASoC Machine Driver for Allo Piano DAC"); +MODULE_LICENSE("GPL v2"); -diff --git a/sound/soc/bcm/audioinjector-isolated-soundcard.c b/sound/soc/bcm/audioinjector-isolated-soundcard.c -new file mode 100644 -index 000000000000..cf3c9929cb8d --- /dev/null +++ b/sound/soc/bcm/audioinjector-isolated-soundcard.c @@ -0,0 +1,184 @@ @@ -14843,9 +14726,6 @@ index 000000000000..cf3c9929cb8d +MODULE_DESCRIPTION("AudioInjector.net isolated Soundcard"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:audioinjector-isolated-soundcard"); -diff --git a/sound/soc/bcm/audioinjector-octo-soundcard.c b/sound/soc/bcm/audioinjector-octo-soundcard.c -new file mode 100644 -index 000000000000..0a5761109865 --- /dev/null +++ b/sound/soc/bcm/audioinjector-octo-soundcard.c @@ -0,0 +1,347 @@ @@ -15196,9 +15076,6 @@ index 000000000000..0a5761109865 +MODULE_DESCRIPTION("AudioInjector.net octo Soundcard"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:audioinjector-octo-soundcard"); -diff --git a/sound/soc/bcm/audioinjector-pi-soundcard.c b/sound/soc/bcm/audioinjector-pi-soundcard.c -new file mode 100644 -index 000000000000..5ff0b28eac8b --- /dev/null +++ b/sound/soc/bcm/audioinjector-pi-soundcard.c @@ -0,0 +1,190 @@ @@ -15392,9 +15269,6 @@ index 000000000000..5ff0b28eac8b +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:audioinjector-pi-soundcard"); + -diff --git a/sound/soc/bcm/audiosense-pi.c b/sound/soc/bcm/audiosense-pi.c -new file mode 100644 -index 000000000000..1975576e49ac --- /dev/null +++ b/sound/soc/bcm/audiosense-pi.c @@ -0,0 +1,247 @@ @@ -15645,8 +15519,6 @@ index 000000000000..1975576e49ac +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:audiosense-pi"); + -diff --git a/sound/soc/bcm/bcm2835-i2s.c b/sound/soc/bcm/bcm2835-i2s.c -index 87d2f06c2f53..cbbf6723ba20 100644 --- a/sound/soc/bcm/bcm2835-i2s.c +++ b/sound/soc/bcm/bcm2835-i2s.c @@ -30,7 +30,6 @@ @@ -15657,7 +15529,7 @@ index 87d2f06c2f53..cbbf6723ba20 100644 #include #include -@@ -620,6 +619,10 @@ static int bcm2835_i2s_prepare(struct snd_pcm_substream *substream, +@@ -620,6 +619,10 @@ static int bcm2835_i2s_prepare(struct sn struct bcm2835_i2s_dev *dev = snd_soc_dai_get_drvdata(dai); uint32_t cs_reg; @@ -15668,7 +15540,7 @@ index 87d2f06c2f53..cbbf6723ba20 100644 /* * Clear both FIFOs if the one that should be started * is not empty at the moment. This should only happen -@@ -701,6 +704,10 @@ static int bcm2835_i2s_startup(struct snd_pcm_substream *substream, +@@ -701,6 +704,10 @@ static int bcm2835_i2s_startup(struct sn /* Should this still be running stop it */ bcm2835_i2s_stop_clock(dev); @@ -15679,7 +15551,7 @@ index 87d2f06c2f53..cbbf6723ba20 100644 /* Enable PCM block */ regmap_update_bits(dev->i2s_regmap, BCM2835_I2S_CS_A_REG, BCM2835_I2S_EN, BCM2835_I2S_EN); -@@ -830,8 +837,7 @@ static int bcm2835_i2s_probe(struct platform_device *pdev) +@@ -830,8 +837,7 @@ static int bcm2835_i2s_probe(struct plat struct bcm2835_i2s_dev *dev; int ret; void __iomem *base; @@ -15689,7 +15561,7 @@ index 87d2f06c2f53..cbbf6723ba20 100644 dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL); -@@ -846,7 +852,7 @@ static int bcm2835_i2s_probe(struct platform_device *pdev) +@@ -846,7 +852,7 @@ static int bcm2835_i2s_probe(struct plat "could not get clk\n"); /* Request ioarea */ @@ -15698,7 +15570,7 @@ index 87d2f06c2f53..cbbf6723ba20 100644 if (IS_ERR(base)) return PTR_ERR(base); -@@ -855,19 +861,11 @@ static int bcm2835_i2s_probe(struct platform_device *pdev) +@@ -855,19 +861,11 @@ static int bcm2835_i2s_probe(struct plat if (IS_ERR(dev->i2s_regmap)) return PTR_ERR(dev->i2s_regmap); @@ -15720,9 +15592,6 @@ index 87d2f06c2f53..cbbf6723ba20 100644 /* Set the bus width */ dev->dma_data[SNDRV_PCM_STREAM_PLAYBACK].addr_width = -diff --git a/sound/soc/bcm/chipdip-dac.c b/sound/soc/bcm/chipdip-dac.c -new file mode 100644 -index 000000000000..64e346f1a066 --- /dev/null +++ b/sound/soc/bcm/chipdip-dac.c @@ -0,0 +1,275 @@ @@ -16001,9 +15870,6 @@ index 000000000000..64e346f1a066 +MODULE_AUTHOR("Evgenij Sapunov "); +MODULE_DESCRIPTION("ASoC Driver for ChipDip DAC"); +MODULE_LICENSE("GPL v2"); -diff --git a/sound/soc/bcm/dacberry400.c b/sound/soc/bcm/dacberry400.c -new file mode 100644 -index 000000000000..42ede1511e0f --- /dev/null +++ b/sound/soc/bcm/dacberry400.c @@ -0,0 +1,258 @@ @@ -16265,9 +16131,6 @@ index 000000000000..42ede1511e0f +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:dacberry400"); +MODULE_SOFTDEP("pre: snd-soc-tlv320aic3x"); -diff --git a/sound/soc/bcm/digidac1-soundcard.c b/sound/soc/bcm/digidac1-soundcard.c -new file mode 100644 -index 000000000000..320de17ffa3d --- /dev/null +++ b/sound/soc/bcm/digidac1-soundcard.c @@ -0,0 +1,421 @@ @@ -16692,9 +16555,6 @@ index 000000000000..320de17ffa3d +MODULE_AUTHOR("José M. Tasende "); +MODULE_DESCRIPTION("ASoC Driver for RRA DigiDAC1"); +MODULE_LICENSE("GPL v2"); -diff --git a/sound/soc/bcm/dionaudio_loco-v2.c b/sound/soc/bcm/dionaudio_loco-v2.c -new file mode 100644 -index 000000000000..81506325e07f --- /dev/null +++ b/sound/soc/bcm/dionaudio_loco-v2.c @@ -0,0 +1,118 @@ @@ -16816,9 +16676,6 @@ index 000000000000..81506325e07f +MODULE_AUTHOR("Miquel Blauw "); +MODULE_DESCRIPTION("ASoC Driver for DionAudio LOCO-V2"); +MODULE_LICENSE("GPL v2"); -diff --git a/sound/soc/bcm/dionaudio_loco.c b/sound/soc/bcm/dionaudio_loco.c -new file mode 100644 -index 000000000000..3082df7f886b --- /dev/null +++ b/sound/soc/bcm/dionaudio_loco.c @@ -0,0 +1,121 @@ @@ -16943,9 +16800,6 @@ index 000000000000..3082df7f886b +MODULE_AUTHOR("Miquel Blauw "); +MODULE_DESCRIPTION("ASoC Driver for DionAudio LOCO"); +MODULE_LICENSE("GPL v2"); -diff --git a/sound/soc/bcm/fe-pi-audio.c b/sound/soc/bcm/fe-pi-audio.c -new file mode 100644 -index 000000000000..ab66cfd25d4c --- /dev/null +++ b/sound/soc/bcm/fe-pi-audio.c @@ -0,0 +1,154 @@ @@ -17103,9 +16957,6 @@ index 000000000000..ab66cfd25d4c +MODULE_AUTHOR("Henry Kupis "); +MODULE_DESCRIPTION("ASoC Driver for Fe-Pi Audio"); +MODULE_LICENSE("GPL v2"); -diff --git a/sound/soc/bcm/googlevoicehat-codec.c b/sound/soc/bcm/googlevoicehat-codec.c -new file mode 100644 -index 000000000000..572db9373e63 --- /dev/null +++ b/sound/soc/bcm/googlevoicehat-codec.c @@ -0,0 +1,212 @@ @@ -17321,9 +17172,6 @@ index 000000000000..572db9373e63 +MODULE_DESCRIPTION("Google voiceHAT Codec driver"); +MODULE_AUTHOR("Peter Malkin "); +MODULE_LICENSE("GPL v2"); -diff --git a/sound/soc/bcm/hifiberry_adc.c b/sound/soc/bcm/hifiberry_adc.c -new file mode 100644 -index 000000000000..45c642e056c1 --- /dev/null +++ b/sound/soc/bcm/hifiberry_adc.c @@ -0,0 +1,174 @@ @@ -17501,9 +17349,6 @@ index 000000000000..45c642e056c1 +MODULE_AUTHOR("Joerg Schambacher "); +MODULE_DESCRIPTION("ASoC Driver for HiFiBerry ADC"); +MODULE_LICENSE("GPL"); -diff --git a/sound/soc/bcm/hifiberry_adc_controls.h b/sound/soc/bcm/hifiberry_adc_controls.h -new file mode 100644 -index 000000000000..8d8911bb0afb --- /dev/null +++ b/sound/soc/bcm/hifiberry_adc_controls.h @@ -0,0 +1,128 @@ @@ -17635,9 +17480,6 @@ index 000000000000..8d8911bb0afb + SOC_ENUM("PGA Gain Left", pcm186x_gain_sel[0]), + SOC_ENUM("PGA Gain Right", pcm186x_gain_sel[1]), +}; -diff --git a/sound/soc/bcm/hifiberry_dacplus.c b/sound/soc/bcm/hifiberry_dacplus.c -new file mode 100644 -index 000000000000..589ff3825e10 --- /dev/null +++ b/sound/soc/bcm/hifiberry_dacplus.c @@ -0,0 +1,563 @@ @@ -18204,9 +18046,6 @@ index 000000000000..589ff3825e10 +MODULE_AUTHOR("Daniel Matuschek "); +MODULE_DESCRIPTION("ASoC Driver for HiFiBerry DAC+"); +MODULE_LICENSE("GPL v2"); -diff --git a/sound/soc/bcm/hifiberry_dacplusadc.c b/sound/soc/bcm/hifiberry_dacplusadc.c -new file mode 100644 -index 000000000000..e73da125e70d --- /dev/null +++ b/sound/soc/bcm/hifiberry_dacplusadc.c @@ -0,0 +1,399 @@ @@ -18609,9 +18448,6 @@ index 000000000000..e73da125e70d +MODULE_AUTHOR("Daniel Matuschek "); +MODULE_DESCRIPTION("ASoC Driver for HiFiBerry DAC+ADC"); +MODULE_LICENSE("GPL v2"); -diff --git a/sound/soc/bcm/hifiberry_dacplusadcpro.c b/sound/soc/bcm/hifiberry_dacplusadcpro.c -new file mode 100644 -index 000000000000..9c853379dc49 --- /dev/null +++ b/sound/soc/bcm/hifiberry_dacplusadcpro.c @@ -0,0 +1,498 @@ @@ -19113,9 +18949,6 @@ index 000000000000..9c853379dc49 +MODULE_AUTHOR("Daniel Matuschek "); +MODULE_DESCRIPTION("ASoC Driver for HiFiBerry DAC+ADC"); +MODULE_LICENSE("GPL v2"); -diff --git a/sound/soc/bcm/hifiberry_dacplusdsp.c b/sound/soc/bcm/hifiberry_dacplusdsp.c -new file mode 100644 -index 000000000000..5a6ea965042d --- /dev/null +++ b/sound/soc/bcm/hifiberry_dacplusdsp.c @@ -0,0 +1,89 @@ @@ -19208,9 +19041,6 @@ index 000000000000..5a6ea965042d +MODULE_AUTHOR("Joerg Schambacher "); +MODULE_DESCRIPTION("ASoC Driver for HiFiBerry DAC+DSP"); +MODULE_LICENSE("GPL v2"); -diff --git a/sound/soc/bcm/hifiberry_dacplushd.c b/sound/soc/bcm/hifiberry_dacplushd.c -new file mode 100644 -index 000000000000..b535384f9fc7 --- /dev/null +++ b/sound/soc/bcm/hifiberry_dacplushd.c @@ -0,0 +1,233 @@ @@ -19447,9 +19277,6 @@ index 000000000000..b535384f9fc7 +MODULE_AUTHOR("Joerg Schambacher "); +MODULE_DESCRIPTION("ASoC Driver for HiFiBerry DAC+ HD"); +MODULE_LICENSE("GPL v2"); -diff --git a/sound/soc/bcm/i-sabre-q2m.c b/sound/soc/bcm/i-sabre-q2m.c -new file mode 100644 -index 000000000000..dc538400a05d --- /dev/null +++ b/sound/soc/bcm/i-sabre-q2m.c @@ -0,0 +1,159 @@ @@ -19612,9 +19439,6 @@ index 000000000000..dc538400a05d +MODULE_DESCRIPTION("ASoC Driver for I-Sabre Q2M"); +MODULE_AUTHOR("Audiophonics "); +MODULE_LICENSE("GPL"); -diff --git a/sound/soc/bcm/iqaudio-codec.c b/sound/soc/bcm/iqaudio-codec.c -new file mode 100644 -index 000000000000..02ea79029efc --- /dev/null +++ b/sound/soc/bcm/iqaudio-codec.c @@ -0,0 +1,283 @@ @@ -19901,9 +19725,6 @@ index 000000000000..02ea79029efc +MODULE_AUTHOR("Gordon Garrity "); +MODULE_DESCRIPTION("ASoC Driver for IQaudIO CODEC"); +MODULE_LICENSE("GPL v2"); -diff --git a/sound/soc/bcm/iqaudio-dac.c b/sound/soc/bcm/iqaudio-dac.c -new file mode 100644 -index 000000000000..a86531bf3687 --- /dev/null +++ b/sound/soc/bcm/iqaudio-dac.c @@ -0,0 +1,223 @@ @@ -20130,9 +19951,6 @@ index 000000000000..a86531bf3687 +MODULE_AUTHOR("Florian Meier "); +MODULE_DESCRIPTION("ASoC Driver for IQAudio DAC"); +MODULE_LICENSE("GPL v2"); -diff --git a/sound/soc/bcm/justboom-both.c b/sound/soc/bcm/justboom-both.c -new file mode 100644 -index 000000000000..6e5e6510238a --- /dev/null +++ b/sound/soc/bcm/justboom-both.c @@ -0,0 +1,266 @@ @@ -20402,9 +20220,6 @@ index 000000000000..6e5e6510238a +MODULE_AUTHOR("Johannes Krude "); +MODULE_DESCRIPTION("ASoC Driver for simultaneous use of JustBoom PI Digi & DAC HAT Sound Cards"); +MODULE_LICENSE("GPL v2"); -diff --git a/sound/soc/bcm/justboom-dac.c b/sound/soc/bcm/justboom-dac.c -new file mode 100644 -index 000000000000..dc6b2ddaa8cb --- /dev/null +++ b/sound/soc/bcm/justboom-dac.c @@ -0,0 +1,147 @@ @@ -20555,9 +20370,6 @@ index 000000000000..dc6b2ddaa8cb +MODULE_AUTHOR("Milan Neskovic "); +MODULE_DESCRIPTION("ASoC Driver for JustBoom PI DAC HAT Sound Card"); +MODULE_LICENSE("GPL v2"); -diff --git a/sound/soc/bcm/pifi-40.c b/sound/soc/bcm/pifi-40.c -new file mode 100644 -index 000000000000..64e755cf0595 --- /dev/null +++ b/sound/soc/bcm/pifi-40.c @@ -0,0 +1,281 @@ @@ -20842,9 +20654,6 @@ index 000000000000..64e755cf0595 +MODULE_AUTHOR("David Knell "); +MODULE_DESCRIPTION("ALSA ASoC Machine Driver for PiFi-40"); +MODULE_LICENSE("GPL v2"); -diff --git a/sound/soc/bcm/pisound.c b/sound/soc/bcm/pisound.c -new file mode 100644 -index 000000000000..72adf9f5aa87 --- /dev/null +++ b/sound/soc/bcm/pisound.c @@ -0,0 +1,1254 @@ @@ -22102,9 +21911,6 @@ index 000000000000..72adf9f5aa87 +MODULE_AUTHOR("Giedrius Trainavicius "); +MODULE_DESCRIPTION("ASoC Driver for Pisound, https://blokas.io/pisound"); +MODULE_LICENSE("GPL v2"); -diff --git a/sound/soc/bcm/rpi-cirrus.c b/sound/soc/bcm/rpi-cirrus.c -new file mode 100644 -index 000000000000..09383e604346 --- /dev/null +++ b/sound/soc/bcm/rpi-cirrus.c @@ -0,0 +1,1027 @@ @@ -23135,9 +22941,6 @@ index 000000000000..09383e604346 +MODULE_AUTHOR("Matthias Reichl "); +MODULE_DESCRIPTION("ASoC driver for Cirrus Logic Audio Card"); +MODULE_LICENSE("GPL"); -diff --git a/sound/soc/bcm/rpi-proto.c b/sound/soc/bcm/rpi-proto.c -new file mode 100644 -index 000000000000..39a0e7c0975d --- /dev/null +++ b/sound/soc/bcm/rpi-proto.c @@ -0,0 +1,147 @@ @@ -23288,9 +23091,6 @@ index 000000000000..39a0e7c0975d +MODULE_AUTHOR("Florian Meier"); +MODULE_DESCRIPTION("ASoC Driver for Raspberry Pi connected to PROTO board (WM8731)"); +MODULE_LICENSE("GPL"); -diff --git a/sound/soc/bcm/rpi-simple-soundcard.c b/sound/soc/bcm/rpi-simple-soundcard.c -new file mode 100644 -index 000000000000..91252697800f --- /dev/null +++ b/sound/soc/bcm/rpi-simple-soundcard.c @@ -0,0 +1,590 @@ @@ -23884,9 +23684,6 @@ index 000000000000..91252697800f +MODULE_AUTHOR("Tim Gover "); +MODULE_DESCRIPTION("ASoC Raspberry Pi simple soundcard driver "); +MODULE_LICENSE("GPL v2"); -diff --git a/sound/soc/bcm/rpi-wm8804-soundcard.c b/sound/soc/bcm/rpi-wm8804-soundcard.c -new file mode 100644 -index 000000000000..9e09047b6d1b --- /dev/null +++ b/sound/soc/bcm/rpi-wm8804-soundcard.c @@ -0,0 +1,549 @@ @@ -24439,8 +24236,6 @@ index 000000000000..9e09047b6d1b +MODULE_AUTHOR("Tim Gover "); +MODULE_DESCRIPTION("ASoC Raspberry Pi Hat generic digi driver for WM8804 based cards"); +MODULE_LICENSE("GPL v2"); -diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig -index 91ac99bc3edb..b6eed6d6d4ab 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -133,6 +133,7 @@ config SND_SOC_ALL_CODECS @@ -24534,11 +24329,9 @@ index 91ac99bc3edb..b6eed6d6d4ab 100644 + depends on I2C + endmenu -diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile -index da4077463278..8cc7279814b1 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile -@@ -874,3 +874,12 @@ obj-$(CONFIG_SND_SOC_LPASS_TX_MACRO) += snd-soc-lpass-tx-macro.o +@@ -874,3 +874,12 @@ obj-$(CONFIG_SND_SOC_LPASS_TX_MACRO) += # Mux obj-$(CONFIG_SND_SOC_SIMPLE_MUX) += snd-soc-simple-mux.o @@ -24551,11 +24344,9 @@ index da4077463278..8cc7279814b1 100644 +obj-$(CONFIG_SND_SOC_MA120X0P) += snd-soc-ma120x0p.o +obj-$(CONFIG_SND_SOC_PCM1794A) += snd-soc-pcm1794a.o +obj-$(CONFIG_SND_SOC_TAS5713) += snd-soc-tas5713.o -diff --git a/sound/soc/codecs/adau1977-i2c.c b/sound/soc/codecs/adau1977-i2c.c -index 441c8079246a..034965008891 100644 --- a/sound/soc/codecs/adau1977-i2c.c +++ b/sound/soc/codecs/adau1977-i2c.c -@@ -35,9 +35,19 @@ static const struct i2c_device_id adau1977_i2c_ids[] = { +@@ -35,9 +35,19 @@ static const struct i2c_device_id adau19 }; MODULE_DEVICE_TABLE(i2c, adau1977_i2c_ids); @@ -24575,11 +24366,9 @@ index 441c8079246a..034965008891 100644 }, .probe = adau1977_i2c_probe, .id_table = adau1977_i2c_ids, -diff --git a/sound/soc/codecs/cs42xx8-i2c.c b/sound/soc/codecs/cs42xx8-i2c.c -index 039b3ecb3b9b..d1d11473066d 100644 --- a/sound/soc/codecs/cs42xx8-i2c.c +++ b/sound/soc/codecs/cs42xx8-i2c.c -@@ -58,11 +58,18 @@ static const struct i2c_device_id cs42xx8_i2c_id[] = { +@@ -58,11 +58,18 @@ static const struct i2c_device_id cs42xx }; MODULE_DEVICE_TABLE(i2c, cs42xx8_i2c_id); @@ -24599,11 +24388,9 @@ index 039b3ecb3b9b..d1d11473066d 100644 }, .probe = cs42xx8_i2c_probe, .remove = cs42xx8_i2c_remove, -diff --git a/sound/soc/codecs/cs42xx8.c b/sound/soc/codecs/cs42xx8.c -index 6a925f3f7137..b905e9a3538c 100644 --- a/sound/soc/codecs/cs42xx8.c +++ b/sound/soc/codecs/cs42xx8.c -@@ -510,6 +510,16 @@ const struct cs42xx8_driver_data cs42888_data = { +@@ -510,6 +510,16 @@ const struct cs42xx8_driver_data cs42888 }; EXPORT_SYMBOL_GPL(cs42888_data); @@ -24620,11 +24407,9 @@ index 6a925f3f7137..b905e9a3538c 100644 int cs42xx8_probe(struct device *dev, struct regmap *regmap, struct cs42xx8_driver_data *drvdata) { struct cs42xx8_priv *cs42xx8; -diff --git a/sound/soc/codecs/da7213.c b/sound/soc/codecs/da7213.c -index 3420011da444..96bb581ae631 100644 --- a/sound/soc/codecs/da7213.c +++ b/sound/soc/codecs/da7213.c -@@ -1347,6 +1347,8 @@ static int da7213_hw_params(struct snd_pcm_substream *substream, +@@ -1347,6 +1347,8 @@ static int da7213_hw_params(struct snd_p switch (params_width(params)) { case 16: dai_ctrl |= DA7213_DAI_WORD_LENGTH_S16_LE; @@ -24633,7 +24418,7 @@ index 3420011da444..96bb581ae631 100644 dai_clk_mode = DA7213_DAI_BCLKS_PER_WCLK_32; /* 32bit for 1ch and 2ch */ break; case 20: -@@ -1362,6 +1364,9 @@ static int da7213_hw_params(struct snd_pcm_substream *substream, +@@ -1362,6 +1364,9 @@ static int da7213_hw_params(struct snd_p return -EINVAL; } @@ -24643,7 +24428,7 @@ index 3420011da444..96bb581ae631 100644 /* Set sampling rate */ switch (params_rate(params)) { case 8000: -@@ -1524,6 +1529,21 @@ static int da7213_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) +@@ -1524,6 +1529,21 @@ static int da7213_set_dai_fmt(struct snd return 0; } @@ -24673,8 +24458,6 @@ index 3420011da444..96bb581ae631 100644 .mute_stream = da7213_mute, .no_capture_mute = 1, .auto_selectable_formats = &da7213_dai_formats, -diff --git a/sound/soc/codecs/da7213.h b/sound/soc/codecs/da7213.h -index 29cbf0eb6124..ebff7be55d43 100644 --- a/sound/soc/codecs/da7213.h +++ b/sound/soc/codecs/da7213.h @@ -602,6 +602,7 @@ struct da7213_priv { @@ -24685,9 +24468,6 @@ index 29cbf0eb6124..ebff7be55d43 100644 int clk_src; bool master; bool alc_calib_auto; -diff --git a/sound/soc/codecs/i-sabre-codec.c b/sound/soc/codecs/i-sabre-codec.c -new file mode 100644 -index 000000000000..9903c6c9ef5f --- /dev/null +++ b/sound/soc/codecs/i-sabre-codec.c @@ -0,0 +1,389 @@ @@ -25080,9 +24860,6 @@ index 000000000000..9903c6c9ef5f +MODULE_DESCRIPTION("ASoC I-Sabre Q2M codec driver"); +MODULE_AUTHOR("Audiophonics "); +MODULE_LICENSE("GPL"); -diff --git a/sound/soc/codecs/i-sabre-codec.h b/sound/soc/codecs/i-sabre-codec.h -new file mode 100644 -index 000000000000..9cac5a2446b9 --- /dev/null +++ b/sound/soc/codecs/i-sabre-codec.h @@ -0,0 +1,42 @@ @@ -25128,9 +24905,6 @@ index 000000000000..9cac5a2446b9 +#define ISABRECODEC_MAX_REG 0x24 /* Maximum Register Number */ + +#endif /* _SND_SOC_ISABRECODEC */ -diff --git a/sound/soc/codecs/ma120x0p.c b/sound/soc/codecs/ma120x0p.c -new file mode 100644 -index 000000000000..3df7e759ace1 --- /dev/null +++ b/sound/soc/codecs/ma120x0p.c @@ -0,0 +1,1380 @@ @@ -26514,9 +26288,6 @@ index 000000000000..3df7e759ace1 +MODULE_AUTHOR("Ariel Muszkat ariel.muszkat@gmail.com>"); +MODULE_DESCRIPTION("ASoC driver for ma120x0p"); +MODULE_LICENSE("GPL v2"); -diff --git a/sound/soc/codecs/pcm1794a.c b/sound/soc/codecs/pcm1794a.c -new file mode 100644 -index 000000000000..3877a138f896 --- /dev/null +++ b/sound/soc/codecs/pcm1794a.c @@ -0,0 +1,68 @@ @@ -26588,8 +26359,6 @@ index 000000000000..3877a138f896 +MODULE_DESCRIPTION("ASoC PCM1794A codec driver"); +MODULE_AUTHOR("Florian Meier "); +MODULE_LICENSE("GPL v2"); -diff --git a/sound/soc/codecs/pcm3168a.c b/sound/soc/codecs/pcm3168a.c -index c8617a488b11..0363869aed63 100644 --- a/sound/soc/codecs/pcm3168a.c +++ b/sound/soc/codecs/pcm3168a.c @@ -60,6 +60,7 @@ struct pcm3168a_priv { @@ -26600,7 +26369,7 @@ index c8617a488b11..0363869aed63 100644 struct pcm3168a_io_params io_params[2]; struct snd_soc_dai_driver dai_drv[2]; -@@ -478,6 +479,12 @@ static int pcm3168a_hw_params(struct snd_pcm_substream *substream, +@@ -478,6 +479,12 @@ static int pcm3168a_hw_params(struct snd ms = 0; } @@ -26613,7 +26382,7 @@ index c8617a488b11..0363869aed63 100644 format = io_params->format; if (io_params->slot_width) -@@ -759,6 +766,11 @@ int pcm3168a_probe(struct device *dev, struct regmap *regmap) +@@ -759,6 +766,11 @@ int pcm3168a_probe(struct device *dev, s if (!pcm3168a->sysclk) pcm3168a->sysclk = 24576000; @@ -26625,11 +26394,9 @@ index c8617a488b11..0363869aed63 100644 for (i = 0; i < ARRAY_SIZE(pcm3168a->supplies); i++) pcm3168a->supplies[i].supply = pcm3168a_supply_names[i]; -diff --git a/sound/soc/codecs/pcm512x.c b/sound/soc/codecs/pcm512x.c -index 007dfc0fa224..34649db9c48f 100644 --- a/sound/soc/codecs/pcm512x.c +++ b/sound/soc/codecs/pcm512x.c -@@ -537,7 +537,7 @@ static unsigned long pcm512x_ncp_target(struct pcm512x_priv *pcm512x, +@@ -537,7 +537,7 @@ static unsigned long pcm512x_ncp_target( static const u32 pcm512x_dai_rates[] = { 8000, 11025, 16000, 22050, 32000, 44100, 48000, 64000, @@ -26638,7 +26405,7 @@ index 007dfc0fa224..34649db9c48f 100644 }; static const struct snd_pcm_hw_constraint_list constraints_slave = { -@@ -630,7 +630,7 @@ static int pcm512x_dai_startup_slave(struct snd_pcm_substream *substream, +@@ -630,7 +630,7 @@ static int pcm512x_dai_startup_slave(str struct regmap *regmap = pcm512x->regmap; if (IS_ERR(pcm512x->sclk)) { @@ -26647,9 +26414,6 @@ index 007dfc0fa224..34649db9c48f 100644 PTR_ERR(pcm512x->sclk)); /* Disable reporting of missing SCLK as an error */ -diff --git a/sound/soc/codecs/tas5713.c b/sound/soc/codecs/tas5713.c -new file mode 100644 -index 000000000000..01dd21a1d7a2 --- /dev/null +++ b/sound/soc/codecs/tas5713.c @@ -0,0 +1,360 @@ @@ -27013,9 +26777,6 @@ index 000000000000..01dd21a1d7a2 +MODULE_AUTHOR("Sebastian Eickhoff "); +MODULE_DESCRIPTION("ASoC driver for TAS5713"); +MODULE_LICENSE("GPL v2"); -diff --git a/sound/soc/codecs/tas5713.h b/sound/soc/codecs/tas5713.h -new file mode 100644 -index 000000000000..8f019e048987 --- /dev/null +++ b/sound/soc/codecs/tas5713.h @@ -0,0 +1,210 @@ @@ -27229,11 +26990,9 @@ index 000000000000..8f019e048987 + + +#endif /* _TAS5713_H */ -diff --git a/sound/soc/dwc/dwc-i2s.c b/sound/soc/dwc/dwc-i2s.c -index 28001e9857d9..0df1bfc52f4e 100644 --- a/sound/soc/dwc/dwc-i2s.c +++ b/sound/soc/dwc/dwc-i2s.c -@@ -209,12 +209,21 @@ static void i2s_start(struct dw_i2s_dev *dev, +@@ -209,12 +209,21 @@ static void i2s_start(struct dw_i2s_dev static void i2s_stop(struct dw_i2s_dev *dev, struct snd_pcm_substream *substream) { @@ -27259,7 +27018,7 @@ index 28001e9857d9..0df1bfc52f4e 100644 if (!(dev->use_pio || dev->is_jh7110)) i2s_disable_dma(dev, substream->stream); -@@ -224,14 +233,39 @@ static void i2s_stop(struct dw_i2s_dev *dev, +@@ -224,14 +233,39 @@ static void i2s_stop(struct dw_i2s_dev * if (!dev->active) { i2s_write_reg(dev->i2s_base, CER, 0); @@ -27300,7 +27059,7 @@ index 28001e9857d9..0df1bfc52f4e 100644 if (dev->is_jh7110) { struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); -@@ -243,22 +277,52 @@ static int dw_i2s_startup(struct snd_pcm_substream *substream, +@@ -243,22 +277,52 @@ static int dw_i2s_startup(struct snd_pcm return 0; } @@ -27355,7 +27114,7 @@ index 28001e9857d9..0df1bfc52f4e 100644 } else { i2s_write_reg(dev->i2s_base, RCR(ch_reg), dev->xfer_resolution); -@@ -266,9 +330,11 @@ static void dw_i2s_config(struct dw_i2s_dev *dev, int stream) +@@ -266,9 +330,11 @@ static void dw_i2s_config(struct dw_i2s_ dev->fifo_th - 1); i2s_write_reg(dev->i2s_base, RER(ch_reg), RER_RXCHEN | dev->tdm_mask << RER_RXSLOT_SHIFT); @@ -27368,7 +27127,7 @@ index 28001e9857d9..0df1bfc52f4e 100644 } static int dw_i2s_hw_params(struct snd_pcm_substream *substream, -@@ -276,24 +342,32 @@ static int dw_i2s_hw_params(struct snd_pcm_substream *substream, +@@ -276,24 +342,32 @@ static int dw_i2s_hw_params(struct snd_p { struct dw_i2s_dev *dev = snd_soc_dai_get_drvdata(dai); struct i2s_clk_config_data *config = &dev->config; @@ -27404,7 +27163,7 @@ index 28001e9857d9..0df1bfc52f4e 100644 dev->xfer_resolution = 0x05; break; -@@ -314,17 +388,37 @@ static int dw_i2s_hw_params(struct snd_pcm_substream *substream, +@@ -314,17 +388,37 @@ static int dw_i2s_hw_params(struct snd_p case TWO_CHANNEL_SUPPORT: break; default: @@ -27445,7 +27204,7 @@ index 28001e9857d9..0df1bfc52f4e 100644 if (dev->i2s_clk_cfg) { ret = dev->i2s_clk_cfg(config); if (ret < 0) { -@@ -332,8 +426,7 @@ static int dw_i2s_hw_params(struct snd_pcm_substream *substream, +@@ -332,8 +426,7 @@ static int dw_i2s_hw_params(struct snd_p return ret; } } else { @@ -27455,7 +27214,7 @@ index 28001e9857d9..0df1bfc52f4e 100644 ret = clk_set_rate(dev->clk, bitclk); if (ret) { -@@ -342,6 +435,8 @@ static int dw_i2s_hw_params(struct snd_pcm_substream *substream, +@@ -342,6 +435,8 @@ static int dw_i2s_hw_params(struct snd_p return ret; } } @@ -27464,7 +27223,7 @@ index 28001e9857d9..0df1bfc52f4e 100644 } return 0; } -@@ -373,9 +468,12 @@ static int dw_i2s_trigger(struct snd_pcm_substream *substream, +@@ -373,9 +468,12 @@ static int dw_i2s_trigger(struct snd_pcm i2s_start(dev, substream); break; @@ -27478,7 +27237,7 @@ index 28001e9857d9..0df1bfc52f4e 100644 dev->active--; i2s_stop(dev, substream); break; -@@ -459,6 +557,18 @@ static int dw_i2s_set_tdm_slot(struct snd_soc_dai *cpu_dai, unsigned int tx_mask +@@ -459,6 +557,18 @@ static int dw_i2s_set_tdm_slot(struct sn return 0; } @@ -27497,7 +27256,7 @@ index 28001e9857d9..0df1bfc52f4e 100644 static int dw_i2s_dai_probe(struct snd_soc_dai *dai) { struct dw_i2s_dev *dev = snd_soc_dai_get_drvdata(dai); -@@ -470,11 +580,13 @@ static int dw_i2s_dai_probe(struct snd_soc_dai *dai) +@@ -470,11 +580,13 @@ static int dw_i2s_dai_probe(struct snd_s static const struct snd_soc_dai_ops dw_i2s_dai_ops = { .probe = dw_i2s_dai_probe, .startup = dw_i2s_startup, @@ -27511,7 +27270,7 @@ index 28001e9857d9..0df1bfc52f4e 100644 }; static int dw_i2s_runtime_suspend(struct device *dev) -@@ -605,7 +717,7 @@ static int dw_configure_dai(struct dw_i2s_dev *dev, +@@ -605,7 +717,7 @@ static int dw_configure_dai(struct dw_i2 idx = 1; dw_i2s_dai->playback.channels_min = MIN_CHANNEL_NUM; dw_i2s_dai->playback.channels_max = @@ -27520,7 +27279,7 @@ index 28001e9857d9..0df1bfc52f4e 100644 dw_i2s_dai->playback.formats = formats[idx]; dw_i2s_dai->playback.rates = rates; } -@@ -619,7 +731,7 @@ static int dw_configure_dai(struct dw_i2s_dev *dev, +@@ -619,7 +731,7 @@ static int dw_configure_dai(struct dw_i2 idx = 1; dw_i2s_dai->capture.channels_min = MIN_CHANNEL_NUM; dw_i2s_dai->capture.channels_max = @@ -27529,7 +27288,7 @@ index 28001e9857d9..0df1bfc52f4e 100644 dw_i2s_dai->capture.formats = formats[idx]; dw_i2s_dai->capture.rates = rates; } -@@ -680,8 +792,8 @@ static int dw_configure_dai_by_pd(struct dw_i2s_dev *dev, +@@ -680,8 +792,8 @@ static int dw_configure_dai_by_pd(struct dev->capture_dma_data.pd.data = pdata->capture_dma_data; dev->play_dma_data.pd.addr = res->start + I2S_TXDMA; dev->capture_dma_data.pd.addr = res->start + I2S_RXDMA; @@ -27540,7 +27299,7 @@ index 28001e9857d9..0df1bfc52f4e 100644 dev->play_dma_data.pd.addr_width = bus_widths[idx]; dev->capture_dma_data.pd.addr_width = bus_widths[idx]; dev->play_dma_data.pd.filter = pdata->filter; -@@ -701,7 +813,7 @@ static int dw_configure_dai_by_dt(struct dw_i2s_dev *dev, +@@ -701,7 +813,7 @@ static int dw_configure_dai_by_dt(struct u32 idx2; int ret; @@ -27549,7 +27308,7 @@ index 28001e9857d9..0df1bfc52f4e 100644 if (ret < 0) return ret; -@@ -712,7 +824,10 @@ static int dw_configure_dai_by_dt(struct dw_i2s_dev *dev, +@@ -712,7 +824,10 @@ static int dw_configure_dai_by_dt(struct dev->play_dma_data.dt.addr = res->start + I2S_TXDMA; dev->play_dma_data.dt.fifo_size = fifo_depth * (fifo_width[idx2]) >> 8; @@ -27561,7 +27320,7 @@ index 28001e9857d9..0df1bfc52f4e 100644 } if (COMP1_RX_ENABLED(comp1)) { idx2 = COMP2_RX_WORDSIZE_0(comp2); -@@ -721,9 +836,14 @@ static int dw_configure_dai_by_dt(struct dw_i2s_dev *dev, +@@ -721,9 +836,14 @@ static int dw_configure_dai_by_dt(struct dev->capture_dma_data.dt.addr = res->start + I2S_RXDMA; dev->capture_dma_data.dt.fifo_size = fifo_depth * (fifo_width[idx2] >> 8); @@ -27577,7 +27336,7 @@ index 28001e9857d9..0df1bfc52f4e 100644 return 0; } -@@ -967,6 +1087,8 @@ static int dw_i2s_probe(struct platform_device *pdev) +@@ -967,6 +1087,8 @@ static int dw_i2s_probe(struct platform_ } } @@ -27586,8 +27345,6 @@ index 28001e9857d9..0df1bfc52f4e 100644 dev->i2s_reg_comp1 = I2S_COMP_PARAM_1; dev->i2s_reg_comp2 = I2S_COMP_PARAM_2; if (pdata) { -diff --git a/sound/soc/dwc/local.h b/sound/soc/dwc/local.h -index dce88c9ad5f3..afff89db5dbb 100644 --- a/sound/soc/dwc/local.h +++ b/sound/soc/dwc/local.h @@ -63,6 +63,17 @@ @@ -27621,9 +27378,6 @@ index dce88c9ad5f3..afff89db5dbb 100644 u32 l_reg; u32 r_reg; bool is_jh7110; /* Flag for StarFive JH7110 SoC */ -diff --git a/sound/soc/raspberrypi/Kconfig b/sound/soc/raspberrypi/Kconfig -new file mode 100644 -index 000000000000..389bb82e3651 --- /dev/null +++ b/sound/soc/raspberrypi/Kconfig @@ -0,0 +1,12 @@ @@ -27639,17 +27393,11 @@ index 000000000000..389bb82e3651 + Output is from RP1 GPIOs pins 12 and 13 only, and additional + components will be needed. It may be useful when HDMI, I2S + or USB audio devices are unavailable, or for compatibility. -diff --git a/sound/soc/raspberrypi/Makefile b/sound/soc/raspberrypi/Makefile -new file mode 100644 -index 000000000000..80ff460c785a --- /dev/null +++ b/sound/soc/raspberrypi/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_SND_RP1_AUDIO_OUT) += rp1_aout.o -diff --git a/sound/soc/raspberrypi/rp1_aout.c b/sound/soc/raspberrypi/rp1_aout.c -new file mode 100644 -index 000000000000..ffcc7b815d5e --- /dev/null +++ b/sound/soc/raspberrypi/rp1_aout.c @@ -0,0 +1,372 @@ @@ -28025,11 +27773,9 @@ index 000000000000..ffcc7b815d5e +MODULE_AUTHOR("Nick Hollinghurst "); +MODULE_AUTHOR("Jonathan Bell "); +MODULE_LICENSE("GPL"); -diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c -index 7a6b4ec3a699..5e790314ac40 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c -@@ -1484,8 +1484,16 @@ int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd, +@@ -1484,8 +1484,16 @@ int snd_soc_runtime_set_dai_fmt(struct s * ext_fmt includes 4 */ for_each_rtd_codec_dais(rtd, i, codec_dai) { @@ -28047,11 +27793,9 @@ index 7a6b4ec3a699..5e790314ac40 100644 if (ret != 0 && ret != -ENOTSUPP) return ret; } -diff --git a/sound/usb/card.c b/sound/usb/card.c -index 270dad84d825..970ad247a507 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c -@@ -1006,8 +1006,14 @@ static int usb_audio_probe(struct usb_interface *intf, +@@ -1006,8 +1006,14 @@ static int usb_audio_probe(struct usb_in if (ignore_ctl_error) chip->quirk_flags |= QUIRK_FLAG_IGNORE_CTL_ERROR; @@ -28067,11 +27811,9 @@ index 270dad84d825..970ad247a507 100644 /* * For devices with more than one control interface, we assume the -diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c -index 9f585dbc770c..e2ab7b1ba1a8 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c -@@ -2410,6 +2410,8 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = { +@@ -2412,6 +2412,8 @@ static const struct usb_audio_quirk_flag QUIRK_FLAG_ALIGN_TRANSFER), DEVICE_FLG(0x534d, 0x2109, /* MacroSilicon MS2109 */ QUIRK_FLAG_ALIGN_TRANSFER), @@ -28080,6 +27822,3 @@ index 9f585dbc770c..e2ab7b1ba1a8 100644 /* Vendor matches */ VENDOR_FLG(0x045e, /* MS Lifecam */ --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0070-rpi_display-add-backlight-driver-and-overlay.patch b/target/linux/bcm27xx/patches-6.18/0070-rpi_display-add-backlight-driver-and-overlay.patch index 777dbfd7913..87362ac2c73 100644 --- a/target/linux/bcm27xx/patches-6.18/0070-rpi_display-add-backlight-driver-and-overlay.patch +++ b/target/linux/bcm27xx/patches-6.18/0070-rpi_display-add-backlight-driver-and-overlay.patch @@ -22,8 +22,6 @@ Signed-off-by: Alex Riesen 3 files changed, 126 insertions(+) create mode 100644 drivers/video/backlight/rpi_backlight.c -diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig -index d9374d208cee..7b836f9adf91 100644 --- a/drivers/video/backlight/Kconfig +++ b/drivers/video/backlight/Kconfig @@ -249,6 +249,13 @@ config BACKLIGHT_PWM @@ -40,11 +38,9 @@ index d9374d208cee..7b836f9adf91 100644 config BACKLIGHT_DA903X tristate "Backlight Driver for DA9030/DA9034 using WLED" depends on PMIC_DA903X -diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile -index dfbb169bf6ea..bcb568afe5d4 100644 --- a/drivers/video/backlight/Makefile +++ b/drivers/video/backlight/Makefile -@@ -52,6 +52,7 @@ obj-$(CONFIG_BACKLIGHT_OMAP1) += omap1_bl.o +@@ -52,6 +52,7 @@ obj-$(CONFIG_BACKLIGHT_OMAP1) += omap1_ obj-$(CONFIG_BACKLIGHT_PANDORA) += pandora_bl.o obj-$(CONFIG_BACKLIGHT_PWM) += pwm_bl.o obj-$(CONFIG_BACKLIGHT_QCOM_WLED) += qcom-wled.o @@ -52,9 +48,6 @@ index dfbb169bf6ea..bcb568afe5d4 100644 obj-$(CONFIG_BACKLIGHT_RT4831) += rt4831-backlight.o obj-$(CONFIG_BACKLIGHT_SAHARA) += kb3886_bl.o obj-$(CONFIG_BACKLIGHT_SKY81452) += sky81452-backlight.o -diff --git a/drivers/video/backlight/rpi_backlight.c b/drivers/video/backlight/rpi_backlight.c -new file mode 100644 -index 000000000000..877f29f1d7b0 --- /dev/null +++ b/drivers/video/backlight/rpi_backlight.c @@ -0,0 +1,118 @@ @@ -176,6 +169,3 @@ index 000000000000..877f29f1d7b0 +MODULE_AUTHOR("Gordon Hollingworth "); +MODULE_DESCRIPTION("Raspberry Pi mailbox based Backlight Driver"); +MODULE_LICENSE("GPL"); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0071-bcm2835-virtgpio-Virtual-GPIO-driver.patch b/target/linux/bcm27xx/patches-6.18/0071-bcm2835-virtgpio-Virtual-GPIO-driver.patch index 0d73c73e537..0c42e4bdf3f 100644 --- a/target/linux/bcm27xx/patches-6.18/0071-bcm2835-virtgpio-Virtual-GPIO-driver.patch +++ b/target/linux/bcm27xx/patches-6.18/0071-bcm2835-virtgpio-Virtual-GPIO-driver.patch @@ -33,8 +33,6 @@ Signed-off-by: Phil Elwell 3 files changed, 220 insertions(+) create mode 100644 drivers/gpio/gpio-bcm-virt.c -diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig -index 4d644dcecad9..8ce7a57de297 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -237,6 +237,12 @@ config GPIO_BLZP1600 @@ -50,11 +48,9 @@ index 4d644dcecad9..8ce7a57de297 100644 config GPIO_BRCMSTB tristate "BRCMSTB GPIO support" default y if (ARCH_BRCMSTB || BMIPS_GENERIC) -diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile -index ec296fa14bfd..75dbe47f4a32 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile -@@ -43,6 +43,7 @@ obj-$(CONFIG_GPIO_ASPEED_SGPIO) += gpio-aspeed-sgpio.o +@@ -43,6 +43,7 @@ obj-$(CONFIG_GPIO_ASPEED_SGPIO) += gpio obj-$(CONFIG_GPIO_ATH79) += gpio-ath79.o obj-$(CONFIG_GPIO_BCM_KONA) += gpio-bcm-kona.o obj-$(CONFIG_GPIO_BCM_XGS_IPROC) += gpio-xgs-iproc.o @@ -62,9 +58,6 @@ index ec296fa14bfd..75dbe47f4a32 100644 obj-$(CONFIG_GPIO_BD71815) += gpio-bd71815.o obj-$(CONFIG_GPIO_BD71828) += gpio-bd71828.o obj-$(CONFIG_GPIO_BD9571MWV) += gpio-bd9571mwv.o -diff --git a/drivers/gpio/gpio-bcm-virt.c b/drivers/gpio/gpio-bcm-virt.c -new file mode 100644 -index 000000000000..037bd7a3f64e --- /dev/null +++ b/drivers/gpio/gpio-bcm-virt.c @@ -0,0 +1,213 @@ @@ -281,6 +274,3 @@ index 000000000000..037bd7a3f64e +MODULE_AUTHOR("Dom Cobley "); +MODULE_DESCRIPTION("brcmvirt GPIO driver"); +MODULE_ALIAS("platform:brcmvirt-gpio"); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0072-OF-DT-Overlay-configfs-interface.patch b/target/linux/bcm27xx/patches-6.18/0072-OF-DT-Overlay-configfs-interface.patch index c56b5fe2a70..a7a0c033893 100644 --- a/target/linux/bcm27xx/patches-6.18/0072-OF-DT-Overlay-configfs-interface.patch +++ b/target/linux/bcm27xx/patches-6.18/0072-OF-DT-Overlay-configfs-interface.patch @@ -64,9 +64,6 @@ Signed-off-by: Phil Elwell create mode 100644 Documentation/devicetree/configfs-overlays.txt create mode 100644 drivers/of/configfs.c -diff --git a/Documentation/devicetree/configfs-overlays.txt b/Documentation/devicetree/configfs-overlays.txt -new file mode 100644 -index 000000000000..5fa43e064307 --- /dev/null +++ b/Documentation/devicetree/configfs-overlays.txt @@ -0,0 +1,31 @@ @@ -101,8 +98,6 @@ index 000000000000..5fa43e064307 +better suited to different use patterns. The firmware interface is what's +intended to be used by hardware managers in the kernel, while the copy interface +make sense for developers (since it avoids problems with namespaces). -diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig -index 50697cc3b07e..9c1af8445ec7 100644 --- a/drivers/of/Kconfig +++ b/drivers/of/Kconfig @@ -126,4 +126,15 @@ config OF_OVERLAY_KUNIT_TEST @@ -121,8 +116,6 @@ index 50697cc3b07e..9c1af8445ec7 100644 + Enable a simple user-space driven DT overlay interface. + endif # OF -diff --git a/drivers/of/Makefile b/drivers/of/Makefile -index 379a0afcbdc0..f294b36207f8 100644 --- a/drivers/of/Makefile +++ b/drivers/of/Makefile @@ -1,6 +1,7 @@ @@ -133,9 +126,6 @@ index 379a0afcbdc0..f294b36207f8 100644 obj-$(CONFIG_OF_DYNAMIC) += dynamic.o obj-$(CONFIG_OF_FLATTREE) += fdt.o empty_root.dtb.o obj-$(CONFIG_OF_EARLY_FLATTREE) += fdt_address.o -diff --git a/drivers/of/configfs.c b/drivers/of/configfs.c -new file mode 100644 -index 000000000000..0e6bccb8ff2e --- /dev/null +++ b/drivers/of/configfs.c @@ -0,0 +1,277 @@ @@ -416,6 +406,3 @@ index 000000000000..0e6bccb8ff2e + return ret; +} +late_initcall(of_cfs_init); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0073-brcm-adds-support-for-BCM43341-wifi.patch b/target/linux/bcm27xx/patches-6.18/0073-brcm-adds-support-for-BCM43341-wifi.patch index d30aad4f5ea..9f192da0610 100644 --- a/target/linux/bcm27xx/patches-6.18/0073-brcm-adds-support-for-BCM43341-wifi.patch +++ b/target/linux/bcm27xx/patches-6.18/0073-brcm-adds-support-for-BCM43341-wifi.patch @@ -8,8 +8,6 @@ Signed-off-by: Phil Elwell drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c -index 4e6ed02c1591..b3c4ac025e91 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c @@ -609,6 +609,7 @@ BRCMF_FW_DEF(4329, "brcmfmac4329-sdio"); @@ -20,7 +18,7 @@ index 4e6ed02c1591..b3c4ac025e91 100644 BRCMF_FW_DEF(4335, "brcmfmac4335-sdio"); BRCMF_FW_DEF(43362, "brcmfmac43362-sdio"); BRCMF_FW_DEF(4339, "brcmfmac4339-sdio"); -@@ -641,7 +642,7 @@ static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = { +@@ -641,7 +642,7 @@ static const struct brcmf_firmware_mappi BRCMF_FW_ENTRY(BRCM_CC_4330_CHIP_ID, 0xFFFFFFFF, 4330), BRCMF_FW_ENTRY(BRCM_CC_4334_CHIP_ID, 0xFFFFFFFF, 4334), BRCMF_FW_ENTRY(BRCM_CC_43340_CHIP_ID, 0xFFFFFFFF, 43340), @@ -29,6 +27,3 @@ index 4e6ed02c1591..b3c4ac025e91 100644 BRCMF_FW_ENTRY(BRCM_CC_4335_CHIP_ID, 0xFFFFFFFF, 4335), BRCMF_FW_ENTRY(BRCM_CC_43362_CHIP_ID, 0xFFFFFFFE, 43362), BRCMF_FW_ENTRY(BRCM_CC_4339_CHIP_ID, 0xFFFFFFFF, 4339), --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0074-hci_h5-Don-t-send-conf_req-when-ACTIVE.patch b/target/linux/bcm27xx/patches-6.18/0074-hci_h5-Don-t-send-conf_req-when-ACTIVE.patch index d2e11d3ac94..a9390ed6451 100644 --- a/target/linux/bcm27xx/patches-6.18/0074-hci_h5-Don-t-send-conf_req-when-ACTIVE.patch +++ b/target/linux/bcm27xx/patches-6.18/0074-hci_h5-Don-t-send-conf_req-when-ACTIVE.patch @@ -9,11 +9,9 @@ other with conf_req and conf_rsp messages, in a demented game of tag. drivers/bluetooth/hci_h5.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c -index d0d4420c1a0f..c6bf30801b49 100644 --- a/drivers/bluetooth/hci_h5.c +++ b/drivers/bluetooth/hci_h5.c -@@ -358,7 +358,8 @@ static void h5_handle_internal_rx(struct hci_uart *hu) +@@ -358,7 +358,8 @@ static void h5_handle_internal_rx(struct h5_link_control(hu, conf_req, 3); } else if (memcmp(data, conf_req, 2) == 0) { h5_link_control(hu, conf_rsp, 2); @@ -23,6 +21,3 @@ index d0d4420c1a0f..c6bf30801b49 100644 } else if (memcmp(data, conf_rsp, 2) == 0) { if (H5_HDR_LEN(hdr) > 2) h5->tx_win = (data[2] & 0x07); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0075-ARM64-Round-Robin-dispatch-IRQs-between-CPUs.patch b/target/linux/bcm27xx/patches-6.18/0075-ARM64-Round-Robin-dispatch-IRQs-between-CPUs.patch index 7ef653d4464..eab3151f4a3 100644 --- a/target/linux/bcm27xx/patches-6.18/0075-ARM64-Round-Robin-dispatch-IRQs-between-CPUs.patch +++ b/target/linux/bcm27xx/patches-6.18/0075-ARM64-Round-Robin-dispatch-IRQs-between-CPUs.patch @@ -53,8 +53,6 @@ Signed-off-by: Phil Elwell include/linux/irqchip/irq-bcm2836.h | 2 ++ 3 files changed, 38 insertions(+), 1 deletion(-) -diff --git a/drivers/irqchip/irq-bcm2835.c b/drivers/irqchip/irq-bcm2835.c -index 527cc962d6fd..176c487505af 100644 --- a/drivers/irqchip/irq-bcm2835.c +++ b/drivers/irqchip/irq-bcm2835.c @@ -40,6 +40,7 @@ @@ -65,7 +63,7 @@ index 527cc962d6fd..176c487505af 100644 #include #include -@@ -154,12 +155,24 @@ static void armctrl_unmask_irq(struct irq_data *d) +@@ -154,12 +155,24 @@ static void armctrl_unmask_irq(struct ir } } @@ -90,7 +88,7 @@ index 527cc962d6fd..176c487505af 100644 }; static int armctrl_xlate(struct irq_domain *d, struct device_node *ctrlr, -@@ -332,7 +345,8 @@ static void bcm2836_chained_handle_irq(struct irq_desc *desc) +@@ -332,7 +345,8 @@ static void bcm2836_chained_handle_irq(s { u32 hwirq; @@ -100,11 +98,9 @@ index 527cc962d6fd..176c487505af 100644 generic_handle_domain_irq(intc.domain, hwirq); } -diff --git a/drivers/irqchip/irq-bcm2836.c b/drivers/irqchip/irq-bcm2836.c -index 22519f3f4f66..85f16f308bcd 100644 --- a/drivers/irqchip/irq-bcm2836.c +++ b/drivers/irqchip/irq-bcm2836.c -@@ -89,6 +89,27 @@ static void bcm2836_arm_irqchip_unmask_gpu_irq(struct irq_data *d) +@@ -89,6 +89,27 @@ static void bcm2836_arm_irqchip_unmask_g { } @@ -132,8 +128,6 @@ index 22519f3f4f66..85f16f308bcd 100644 static struct irq_chip bcm2836_arm_irqchip_gpu = { .name = "bcm2836-gpu", .irq_mask = bcm2836_arm_irqchip_mask_gpu_irq, -diff --git a/include/linux/irqchip/irq-bcm2836.h b/include/linux/irqchip/irq-bcm2836.h -index ac5719d8f56b..6fe053486447 100644 --- a/include/linux/irqchip/irq-bcm2836.h +++ b/include/linux/irqchip/irq-bcm2836.h @@ -59,3 +59,5 @@ @@ -142,6 +136,3 @@ index ac5719d8f56b..6fe053486447 100644 #define LAST_IRQ LOCAL_IRQ_PMU_FAST + +void bcm2836_arm_irqchip_spin_gpu_irq(void); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0076-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch b/target/linux/bcm27xx/patches-6.18/0076-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch index 79b5b7f256f..27bd3138f1c 100644 --- a/target/linux/bcm27xx/patches-6.18/0076-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch +++ b/target/linux/bcm27xx/patches-6.18/0076-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch @@ -7,11 +7,9 @@ Subject: [PATCH] ARM64: Force hardware emulation of deprecated instructions. arch/arm64/kernel/armv8_deprecated.c | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/arch/arm64/kernel/armv8_deprecated.c b/arch/arm64/kernel/armv8_deprecated.c -index e737c6295ec7..abb590819ac0 100644 --- a/arch/arm64/kernel/armv8_deprecated.c +++ b/arch/arm64/kernel/armv8_deprecated.c -@@ -540,9 +540,14 @@ static void __init register_insn_emulation(struct insn_emulation *insn) +@@ -540,9 +540,14 @@ static void __init register_insn_emulati switch (insn->status) { case INSN_DEPRECATED: @@ -26,6 +24,3 @@ index e737c6295ec7..abb590819ac0 100644 insn->max = INSN_HW; break; case INSN_OBSOLETE: --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0077-AXI-performance-monitor-driver-2222.patch b/target/linux/bcm27xx/patches-6.18/0077-AXI-performance-monitor-driver-2222.patch index 538f583adfc..a9a00d64c59 100644 --- a/target/linux/bcm27xx/patches-6.18/0077-AXI-performance-monitor-driver-2222.patch +++ b/target/linux/bcm27xx/patches-6.18/0077-AXI-performance-monitor-driver-2222.patch @@ -32,8 +32,6 @@ Signed-off-by: Dom Cobley 3 files changed, 835 insertions(+) create mode 100644 drivers/perf/raspberrypi_axi_monitor.c -diff --git a/drivers/perf/Kconfig b/drivers/perf/Kconfig -index 638321fc9800..e882f75e7a7a 100644 --- a/drivers/perf/Kconfig +++ b/drivers/perf/Kconfig @@ -271,6 +271,14 @@ config ALIBABA_UNCORE_DRW_PMU @@ -51,18 +49,13 @@ index 638321fc9800..e882f75e7a7a 100644 source "drivers/perf/hisilicon/Kconfig" config MARVELL_CN10K_DDR_PMU -diff --git a/drivers/perf/Makefile b/drivers/perf/Makefile -index ea52711a87e3..1ab73aa986d4 100644 --- a/drivers/perf/Makefile +++ b/drivers/perf/Makefile -@@ -35,3 +35,4 @@ obj-$(CONFIG_DWC_PCIE_PMU) += dwc_pcie_pmu.o +@@ -35,3 +35,4 @@ obj-$(CONFIG_DWC_PCIE_PMU) += dwc_pcie_p obj-$(CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU) += arm_cspmu/ obj-$(CONFIG_MESON_DDR_PMU) += amlogic/ obj-$(CONFIG_CXL_PMU) += cxl_pmu.o +obj-$(CONFIG_RPI_AXIPERF) += raspberrypi_axi_monitor.o -diff --git a/drivers/perf/raspberrypi_axi_monitor.c b/drivers/perf/raspberrypi_axi_monitor.c -new file mode 100644 -index 000000000000..b5ad12a2a9ab --- /dev/null +++ b/drivers/perf/raspberrypi_axi_monitor.c @@ -0,0 +1,826 @@ @@ -892,6 +885,3 @@ index 000000000000..b5ad12a2a9ab +MODULE_DESCRIPTION("RPI AXI Performance monitor driver"); +MODULE_LICENSE("GPL"); + --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0078-ARM-bcm2835-Set-Serial-number-and-Revision.patch b/target/linux/bcm27xx/patches-6.18/0078-ARM-bcm2835-Set-Serial-number-and-Revision.patch index d78129e5fad..17add599581 100644 --- a/target/linux/bcm27xx/patches-6.18/0078-ARM-bcm2835-Set-Serial-number-and-Revision.patch +++ b/target/linux/bcm27xx/patches-6.18/0078-ARM-bcm2835-Set-Serial-number-and-Revision.patch @@ -25,8 +25,6 @@ Signed-off-by: Noralf Trønnes arch/arm/mach-bcm/board_bcm2835.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) -diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c -index bfc556f76720..73ec2427fbcf 100644 --- a/arch/arm/mach-bcm/board_bcm2835.c +++ b/arch/arm/mach-bcm/board_bcm2835.c @@ -6,12 +6,25 @@ @@ -55,7 +53,7 @@ index bfc556f76720..73ec2427fbcf 100644 static const char * const bcm2835_compat[] = { #ifdef CONFIG_ARCH_MULTI_V6 "brcm,bcm2835", -@@ -24,6 +37,7 @@ static const char * const bcm2835_compat[] = { +@@ -24,6 +37,7 @@ static const char * const bcm2835_compat }; DT_MACHINE_START(BCM2835, "BCM2835") @@ -63,6 +61,3 @@ index bfc556f76720..73ec2427fbcf 100644 .dt_compat = bcm2835_compat, .smp = smp_ops(bcm2836_smp_ops), MACHINE_END --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0079-dwc-otg-FIQ-Fix-bad-mode-in-data-abort-handler.patch b/target/linux/bcm27xx/patches-6.18/0079-dwc-otg-FIQ-Fix-bad-mode-in-data-abort-handler.patch index fe78535e479..e10b05a0903 100644 --- a/target/linux/bcm27xx/patches-6.18/0079-dwc-otg-FIQ-Fix-bad-mode-in-data-abort-handler.patch +++ b/target/linux/bcm27xx/patches-6.18/0079-dwc-otg-FIQ-Fix-bad-mode-in-data-abort-handler.patch @@ -15,8 +15,6 @@ Signed-off-by: Floris Bos arch/arm/mach-bcm/board_bcm2835.c | 69 +++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) -diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c -index 73ec2427fbcf..9b6c921106b5 100644 --- a/arch/arm/mach-bcm/board_bcm2835.c +++ b/arch/arm/mach-bcm/board_bcm2835.c @@ -6,6 +6,7 @@ @@ -108,7 +106,7 @@ index 73ec2427fbcf..9b6c921106b5 100644 static const char * const bcm2835_compat[] = { #ifdef CONFIG_ARCH_MULTI_V6 "brcm,bcm2835", -@@ -37,6 +105,7 @@ static const char * const bcm2835_compat[] = { +@@ -37,6 +105,7 @@ static const char * const bcm2835_compat }; DT_MACHINE_START(BCM2835, "BCM2835") @@ -116,6 +114,3 @@ index 73ec2427fbcf..9b6c921106b5 100644 .init_machine = bcm2835_init, .dt_compat = bcm2835_compat, .smp = smp_ops(bcm2836_smp_ops), --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0080-ARM-Activate-FIQs-to-avoid-__irq_startup-warnings.patch b/target/linux/bcm27xx/patches-6.18/0080-ARM-Activate-FIQs-to-avoid-__irq_startup-warnings.patch index 1610d0ea45f..fd91fa4b6b7 100644 --- a/target/linux/bcm27xx/patches-6.18/0080-ARM-Activate-FIQs-to-avoid-__irq_startup-warnings.patch +++ b/target/linux/bcm27xx/patches-6.18/0080-ARM-Activate-FIQs-to-avoid-__irq_startup-warnings.patch @@ -14,8 +14,6 @@ Signed-off-by: Phil Elwell arch/arm/kernel/fiq.c | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/arch/arm/kernel/fiq.c b/arch/arm/kernel/fiq.c -index d2c8e5313539..bb320f08ad2f 100644 --- a/arch/arm/kernel/fiq.c +++ b/arch/arm/kernel/fiq.c @@ -57,6 +57,8 @@ @@ -36,6 +34,3 @@ index d2c8e5313539..bb320f08ad2f 100644 enable_irq(fiq + fiq_start); } --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0081-i2c-gpio-Also-set-bus-numbers-from-reg-property.patch b/target/linux/bcm27xx/patches-6.18/0081-i2c-gpio-Also-set-bus-numbers-from-reg-property.patch index 4d1e8137852..b6e459ace0a 100644 --- a/target/linux/bcm27xx/patches-6.18/0081-i2c-gpio-Also-set-bus-numbers-from-reg-property.patch +++ b/target/linux/bcm27xx/patches-6.18/0081-i2c-gpio-Also-set-bus-numbers-from-reg-property.patch @@ -20,11 +20,9 @@ Signed-off-by: Phil Elwell drivers/i2c/busses/i2c-gpio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c -index f4355b17bfbf..d83b19a37fd6 100644 --- a/drivers/i2c/busses/i2c-gpio.c +++ b/drivers/i2c/busses/i2c-gpio.c -@@ -428,7 +428,9 @@ static int i2c_gpio_probe(struct platform_device *pdev) +@@ -428,7 +428,9 @@ static int i2c_gpio_probe(struct platfor adap->dev.parent = dev; device_set_node(&adap->dev, fwnode); @@ -35,6 +33,3 @@ index f4355b17bfbf..d83b19a37fd6 100644 ret = i2c_bit_add_numbered_bus(adap); if (ret) return ret; --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0082-added-capture_clear-option-to-pps-gpio-via-dtoverlay.patch b/target/linux/bcm27xx/patches-6.18/0082-added-capture_clear-option-to-pps-gpio-via-dtoverlay.patch index 466c0234c95..fe879f85ef6 100644 --- a/target/linux/bcm27xx/patches-6.18/0082-added-capture_clear-option-to-pps-gpio-via-dtoverlay.patch +++ b/target/linux/bcm27xx/patches-6.18/0082-added-capture_clear-option-to-pps-gpio-via-dtoverlay.patch @@ -7,11 +7,9 @@ Subject: [PATCH] added capture_clear option to pps-gpio via dtoverlay (#2433) drivers/pps/clients/pps-gpio.c | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/drivers/pps/clients/pps-gpio.c b/drivers/pps/clients/pps-gpio.c -index 935da68610c7..65d17781ddb7 100644 --- a/drivers/pps/clients/pps-gpio.c +++ b/drivers/pps/clients/pps-gpio.c -@@ -117,6 +117,9 @@ static int pps_gpio_setup(struct device *dev) +@@ -117,6 +117,9 @@ static int pps_gpio_setup(struct device data->assert_falling_edge = device_property_read_bool(dev, "assert-falling-edge"); @@ -21,6 +19,3 @@ index 935da68610c7..65d17781ddb7 100644 data->echo_pin = devm_gpiod_get_optional(dev, "echo", GPIOD_OUT_LOW); if (IS_ERR(data->echo_pin)) return dev_err_probe(dev, PTR_ERR(data->echo_pin), --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0083-hid-Reduce-default-mouse-polling-interval-to-60Hz.patch b/target/linux/bcm27xx/patches-6.18/0083-hid-Reduce-default-mouse-polling-interval-to-60Hz.patch index 83d292b477c..3be7a1a11fc 100644 --- a/target/linux/bcm27xx/patches-6.18/0083-hid-Reduce-default-mouse-polling-interval-to-60Hz.patch +++ b/target/linux/bcm27xx/patches-6.18/0083-hid-Reduce-default-mouse-polling-interval-to-60Hz.patch @@ -14,8 +14,6 @@ Signed-off-by: Jonathan Bell drivers/hid/usbhid/hid-core.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c -index 758eb21430cd..7e59ae6faf7f 100644 --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c @@ -47,7 +47,7 @@ @@ -27,7 +25,7 @@ index 758eb21430cd..7e59ae6faf7f 100644 module_param_named(mousepoll, hid_mousepoll_interval, uint, 0644); MODULE_PARM_DESC(mousepoll, "Polling interval of mice"); -@@ -1132,7 +1132,9 @@ static int usbhid_start(struct hid_device *hid) +@@ -1133,7 +1133,9 @@ static int usbhid_start(struct hid_devic */ switch (hid->collection->usage) { case HID_GD_MOUSE: @@ -38,7 +36,7 @@ index 758eb21430cd..7e59ae6faf7f 100644 interval = hid_mousepoll_interval; break; case HID_GD_JOYSTICK: -@@ -1144,6 +1146,7 @@ static int usbhid_start(struct hid_device *hid) +@@ -1145,6 +1147,7 @@ static int usbhid_start(struct hid_devic interval = hid_kbpoll_interval; break; } @@ -46,6 +44,3 @@ index 758eb21430cd..7e59ae6faf7f 100644 ret = -ENOMEM; if (usb_endpoint_dir_in(endpoint)) { --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0084-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch b/target/linux/bcm27xx/patches-6.18/0084-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch index c72181cdb36..08994e7632f 100644 --- a/target/linux/bcm27xx/patches-6.18/0084-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch +++ b/target/linux/bcm27xx/patches-6.18/0084-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch @@ -11,8 +11,6 @@ Signed-off-by: Phil Elwell drivers/firmware/raspberrypi.c | 40 +++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) -diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c -index 3ce22dac1786..01e356de79eb 100644 --- a/drivers/firmware/raspberrypi.c +++ b/drivers/firmware/raspberrypi.c @@ -14,6 +14,7 @@ @@ -23,7 +21,7 @@ index 3ce22dac1786..01e356de79eb 100644 #include #include -@@ -182,6 +183,26 @@ int rpi_firmware_property(struct rpi_firmware *fw, +@@ -182,6 +183,26 @@ int rpi_firmware_property(struct rpi_fir } EXPORT_SYMBOL_GPL(rpi_firmware_property); @@ -50,7 +48,7 @@ index 3ce22dac1786..01e356de79eb 100644 static void rpi_firmware_print_firmware_revision(struct rpi_firmware *fw) { -@@ -413,15 +434,32 @@ static struct platform_driver rpi_firmware_driver = { +@@ -413,15 +434,32 @@ static struct platform_driver rpi_firmwa .remove = rpi_firmware_remove, }; @@ -84,6 +82,3 @@ index 3ce22dac1786..01e356de79eb 100644 } module_exit(rpi_firmware_exit); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0085-irqchip-irq-bcm2835-Calc.-FIQ_START-at-boot-time.patch b/target/linux/bcm27xx/patches-6.18/0085-irqchip-irq-bcm2835-Calc.-FIQ_START-at-boot-time.patch index 5c8603420e4..b51eeda5084 100644 --- a/target/linux/bcm27xx/patches-6.18/0085-irqchip-irq-bcm2835-Calc.-FIQ_START-at-boot-time.patch +++ b/target/linux/bcm27xx/patches-6.18/0085-irqchip-irq-bcm2835-Calc.-FIQ_START-at-boot-time.patch @@ -26,8 +26,6 @@ Signed-off-by: Phil Elwell drivers/irqchip/irq-bcm2835.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/drivers/irqchip/irq-bcm2835.c b/drivers/irqchip/irq-bcm2835.c -index 176c487505af..a9a4ec9cdc94 100644 --- a/drivers/irqchip/irq-bcm2835.c +++ b/drivers/irqchip/irq-bcm2835.c @@ -75,8 +75,6 @@ @@ -39,7 +37,7 @@ index 176c487505af..a9a4ec9cdc94 100644 static const int reg_pending[] __initconst = { 0x00, 0x04, 0x08 }; static const int reg_enable[] __initconst = { 0x18, 0x10, 0x14 }; -@@ -205,7 +203,7 @@ static int __init armctrl_of_init(struct device_node *node, +@@ -205,7 +203,7 @@ static int __init armctrl_of_init(struct bool is_2836) { void __iomem *base; @@ -48,7 +46,7 @@ index 176c487505af..a9a4ec9cdc94 100644 u32 reg; base = of_iomap(node, 0); -@@ -245,6 +243,8 @@ static int __init armctrl_of_init(struct device_node *node, +@@ -245,6 +243,8 @@ static int __init armctrl_of_init(struct pr_err(FW_BUG "Bootloader left fiq enabled\n"); } @@ -57,7 +55,7 @@ index 176c487505af..a9a4ec9cdc94 100644 if (is_2836) { int parent_irq = irq_of_parse_and_map(node, 0); -@@ -275,7 +275,7 @@ static int __init armctrl_of_init(struct device_node *node, +@@ -275,7 +275,7 @@ static int __init armctrl_of_init(struct } } #ifndef CONFIG_ARM64 @@ -66,6 +64,3 @@ index 176c487505af..a9a4ec9cdc94 100644 #endif return 0; --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0086-cxd2880-CXD2880_SPI_DRV-should-select-DVB_CXD2880-wi.patch b/target/linux/bcm27xx/patches-6.18/0086-cxd2880-CXD2880_SPI_DRV-should-select-DVB_CXD2880-wi.patch index 1257b2b0877..0a377c720d2 100644 --- a/target/linux/bcm27xx/patches-6.18/0086-cxd2880-CXD2880_SPI_DRV-should-select-DVB_CXD2880-wi.patch +++ b/target/linux/bcm27xx/patches-6.18/0086-cxd2880-CXD2880_SPI_DRV-should-select-DVB_CXD2880-wi.patch @@ -8,8 +8,6 @@ Subject: [PATCH] cxd2880: CXD2880_SPI_DRV should select DVB_CXD2880 with drivers/media/spi/Kconfig | 1 + 1 file changed, 1 insertion(+) -diff --git a/drivers/media/spi/Kconfig b/drivers/media/spi/Kconfig -index 4656afae5bb4..328ea94d14f9 100644 --- a/drivers/media/spi/Kconfig +++ b/drivers/media/spi/Kconfig @@ -9,6 +9,7 @@ menu "Media SPI Adapters" @@ -20,6 +18,3 @@ index 4656afae5bb4..328ea94d14f9 100644 default m if !MEDIA_SUBDRV_AUTOSELECT help Choose if you would like to have SPI interface support for Sony CXD2880. --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0087-firmware-raspberrypi-Report-the-fw-variant-during-pr.patch b/target/linux/bcm27xx/patches-6.18/0087-firmware-raspberrypi-Report-the-fw-variant-during-pr.patch index c7726a3c81c..c0c1f2b0c93 100644 --- a/target/linux/bcm27xx/patches-6.18/0087-firmware-raspberrypi-Report-the-fw-variant-during-pr.patch +++ b/target/linux/bcm27xx/patches-6.18/0087-firmware-raspberrypi-Report-the-fw-variant-during-pr.patch @@ -23,11 +23,9 @@ Signed-off-by: Dave Stevenson drivers/firmware/raspberrypi.c | 40 +++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) -diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c -index 01e356de79eb..be4d1d45a993 100644 --- a/drivers/firmware/raspberrypi.c +++ b/drivers/firmware/raspberrypi.c -@@ -208,6 +208,15 @@ rpi_firmware_print_firmware_revision(struct rpi_firmware *fw) +@@ -208,6 +208,15 @@ rpi_firmware_print_firmware_revision(str { time64_t date_and_time; u32 packet; @@ -43,7 +41,7 @@ index 01e356de79eb..be4d1d45a993 100644 int ret = rpi_firmware_property(fw, RPI_FIRMWARE_GET_FIRMWARE_REVISION, &packet, sizeof(packet)); -@@ -217,7 +226,35 @@ rpi_firmware_print_firmware_revision(struct rpi_firmware *fw) +@@ -217,7 +226,35 @@ rpi_firmware_print_firmware_revision(str /* This is not compatible with y2038 */ date_and_time = packet; @@ -80,7 +78,7 @@ index 01e356de79eb..be4d1d45a993 100644 } static void -@@ -327,6 +364,7 @@ static int rpi_firmware_probe(struct platform_device *pdev) +@@ -327,6 +364,7 @@ static int rpi_firmware_probe(struct pla g_pdev = pdev; rpi_firmware_print_firmware_revision(fw); @@ -88,6 +86,3 @@ index 01e356de79eb..be4d1d45a993 100644 rpi_register_hwmon_driver(dev, fw); rpi_register_clk_driver(dev); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0088-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch b/target/linux/bcm27xx/patches-6.18/0088-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch index df56e4a50eb..841ae369b13 100644 --- a/target/linux/bcm27xx/patches-6.18/0088-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch +++ b/target/linux/bcm27xx/patches-6.18/0088-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch @@ -19,11 +19,9 @@ Signed-off-by: Dave Stevenson drivers/net/usb/lan78xx.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) -diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c -index 858a442d6996..5c1d742cd718 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -596,6 +596,15 @@ static int lan78xx_alloc_tx_resources(struct lan78xx_net *dev) +@@ -596,6 +596,15 @@ static int lan78xx_alloc_tx_resources(st dev->n_tx_urbs, dev->tx_urb_size, dev); } @@ -39,7 +37,7 @@ index 858a442d6996..5c1d742cd718 100644 static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data) { u32 *buf; -@@ -3758,8 +3767,14 @@ static int lan78xx_bind(struct lan78xx_net *dev, struct usb_interface *intf) +@@ -3758,8 +3767,14 @@ static int lan78xx_bind(struct lan78xx_n if (DEFAULT_RX_CSUM_ENABLE) dev->net->features |= NETIF_F_RXCSUM; @@ -56,6 +54,3 @@ index 858a442d6996..5c1d742cd718 100644 if (DEFAULT_VLAN_RX_OFFLOAD) dev->net->features |= NETIF_F_HW_VLAN_CTAG_RX; --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0089-net-lan78xx-Support-auto-downshift-to-100Mb-s.patch b/target/linux/bcm27xx/patches-6.18/0089-net-lan78xx-Support-auto-downshift-to-100Mb-s.patch index 6f8d3815c32..26641723be8 100644 --- a/target/linux/bcm27xx/patches-6.18/0089-net-lan78xx-Support-auto-downshift-to-100Mb-s.patch +++ b/target/linux/bcm27xx/patches-6.18/0089-net-lan78xx-Support-auto-downshift-to-100Mb-s.patch @@ -17,8 +17,6 @@ Signed-off-by: Phil Elwell include/linux/microchipphy.h | 8 ++++++ 3 files changed, 38 insertions(+) -diff --git a/Documentation/devicetree/bindings/net/microchip,lan78xx.txt b/Documentation/devicetree/bindings/net/microchip,lan78xx.txt -index 11a679530ae6..104768b85bbc 100644 --- a/Documentation/devicetree/bindings/net/microchip,lan78xx.txt +++ b/Documentation/devicetree/bindings/net/microchip,lan78xx.txt @@ -14,6 +14,9 @@ Optional properties of the embedded PHY: @@ -31,11 +29,9 @@ index 11a679530ae6..104768b85bbc 100644 Example: -diff --git a/drivers/net/phy/microchip.c b/drivers/net/phy/microchip.c -index dc8634e7bcbe..53f6f7c89237 100644 --- a/drivers/net/phy/microchip.c +++ b/drivers/net/phy/microchip.c -@@ -198,6 +198,7 @@ static int lan88xx_probe(struct phy_device *phydev) +@@ -198,6 +198,7 @@ static int lan88xx_probe(struct phy_devi struct device *dev = &phydev->mdio.dev; struct lan88xx_priv *priv; u32 led_modes[4]; @@ -43,7 +39,7 @@ index dc8634e7bcbe..53f6f7c89237 100644 int len; priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); -@@ -227,6 +228,32 @@ static int lan88xx_probe(struct phy_device *phydev) +@@ -227,6 +228,32 @@ static int lan88xx_probe(struct phy_devi return -EINVAL; } @@ -76,8 +72,6 @@ index dc8634e7bcbe..53f6f7c89237 100644 /* these values can be used to identify internal PHY */ priv->chip_id = phy_read_mmd(phydev, 3, LAN88XX_MMD3_CHIP_ID); priv->chip_rev = phy_read_mmd(phydev, 3, LAN88XX_MMD3_CHIP_REV); -diff --git a/include/linux/microchipphy.h b/include/linux/microchipphy.h -index 517288da19fd..626c450d71f4 100644 --- a/include/linux/microchipphy.h +++ b/include/linux/microchipphy.h @@ -61,6 +61,14 @@ @@ -95,6 +89,3 @@ index 517288da19fd..626c450d71f4 100644 /* DSP registers */ #define PHY_ARDENNES_MMD_DEV_3_PHY_CFG (0x806A) #define PHY_ARDENNES_MMD_DEV_3_PHY_CFG_ZD_DLY_EN_ (0x2000) --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0090-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch b/target/linux/bcm27xx/patches-6.18/0090-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch index df71ccfd744..53be3985da0 100644 --- a/target/linux/bcm27xx/patches-6.18/0090-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch +++ b/target/linux/bcm27xx/patches-6.18/0090-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch @@ -14,8 +14,6 @@ See: https://github.com/raspberrypi/linux/issues/2447 drivers/net/usb/lan78xx.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) -diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c -index 5c1d742cd718..05f6e51d5027 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -605,6 +605,11 @@ static bool enable_tso; @@ -30,7 +28,7 @@ index 5c1d742cd718..05f6e51d5027 100644 static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data) { u32 *buf; -@@ -4737,7 +4742,13 @@ static int lan78xx_probe(struct usb_interface *intf, +@@ -4737,7 +4742,13 @@ static int lan78xx_probe(struct usb_inte if (ret < 0) goto out4; @@ -45,6 +43,3 @@ index 5c1d742cd718..05f6e51d5027 100644 maxp = usb_maxpacket(dev->udev, dev->pipe_intr); dev->urb_intr = usb_alloc_urb(0, GFP_KERNEL); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0091-Patching-lan78xx-for-SOF_TIMESTAMPING_TX_SOFTWARE-su.patch b/target/linux/bcm27xx/patches-6.18/0091-Patching-lan78xx-for-SOF_TIMESTAMPING_TX_SOFTWARE-su.patch index 8f0fa7b8d67..5e57c94c15c 100644 --- a/target/linux/bcm27xx/patches-6.18/0091-Patching-lan78xx-for-SOF_TIMESTAMPING_TX_SOFTWARE-su.patch +++ b/target/linux/bcm27xx/patches-6.18/0091-Patching-lan78xx-for-SOF_TIMESTAMPING_TX_SOFTWARE-su.patch @@ -7,11 +7,9 @@ Subject: [PATCH] Patching lan78xx for SOF_TIMESTAMPING_TX_SOFTWARE support drivers/net/usb/lan78xx.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c -index 05f6e51d5027..21b99bfc9725 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -1932,6 +1932,7 @@ static const struct ethtool_ops lan78xx_ethtool_ops = { +@@ -1932,6 +1932,7 @@ static const struct ethtool_ops lan78xx_ .set_link_ksettings = lan78xx_set_link_ksettings, .get_regs_len = lan78xx_get_regs_len, .get_regs = lan78xx_get_regs, @@ -19,6 +17,3 @@ index 05f6e51d5027..21b99bfc9725 100644 }; static int lan78xx_init_mac_address(struct lan78xx_net *dev) --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0092-media-adv7180-Default-to-the-first-valid-input.patch b/target/linux/bcm27xx/patches-6.18/0092-media-adv7180-Default-to-the-first-valid-input.patch index 72bb10384c6..946bc9a85e3 100644 --- a/target/linux/bcm27xx/patches-6.18/0092-media-adv7180-Default-to-the-first-valid-input.patch +++ b/target/linux/bcm27xx/patches-6.18/0092-media-adv7180-Default-to-the-first-valid-input.patch @@ -14,11 +14,9 @@ Signed-off-by: Dave Stevenson drivers/media/i2c/adv7180.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) -diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c -index 5cbc973df684..6a6a676eb3d6 100644 --- a/drivers/media/i2c/adv7180.c +++ b/drivers/media/i2c/adv7180.c -@@ -859,6 +859,9 @@ static int init_device(struct adv7180_state *state) +@@ -859,6 +859,9 @@ static int init_device(struct adv7180_st return ret; adv7180_set_field_mode(state); @@ -28,7 +26,7 @@ index 5cbc973df684..6a6a676eb3d6 100644 __v4l2_ctrl_handler_setup(&state->ctrl_hdl); -@@ -1415,6 +1418,7 @@ static int adv7180_probe(struct i2c_client *client) +@@ -1415,6 +1418,7 @@ static int adv7180_probe(struct i2c_clie struct device_node *np = client->dev.of_node; struct adv7180_state *state; struct v4l2_subdev *sd; @@ -36,7 +34,7 @@ index 5cbc973df684..6a6a676eb3d6 100644 int ret; /* Check if the adapter supports the needed features */ -@@ -1470,6 +1474,14 @@ static int adv7180_probe(struct i2c_client *client) +@@ -1470,6 +1474,14 @@ static int adv7180_probe(struct i2c_clie state->curr_norm = V4L2_STD_NTSC; state->input = 0; @@ -51,6 +49,3 @@ index 5cbc973df684..6a6a676eb3d6 100644 sd = &state->sd; v4l2_i2c_subdev_init(sd, client, &adv7180_ops); sd->internal_ops = &adv7180_internal_ops; --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0093-media-adv7180-Add-YPrPb-support-for-ADV7282M.patch b/target/linux/bcm27xx/patches-6.18/0093-media-adv7180-Add-YPrPb-support-for-ADV7282M.patch index 239f74614b1..f80263b48bc 100644 --- a/target/linux/bcm27xx/patches-6.18/0093-media-adv7180-Add-YPrPb-support-for-ADV7282M.patch +++ b/target/linux/bcm27xx/patches-6.18/0093-media-adv7180-Add-YPrPb-support-for-ADV7282M.patch @@ -12,11 +12,9 @@ Signed-off-by: Dave Stevenson drivers/media/i2c/adv7180.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c -index 6a6a676eb3d6..101ab60ed665 100644 --- a/drivers/media/i2c/adv7180.c +++ b/drivers/media/i2c/adv7180.c -@@ -1405,6 +1405,7 @@ static const struct adv7180_chip_info adv7282_m_info = { +@@ -1405,6 +1405,7 @@ static const struct adv7180_chip_info ad BIT(ADV7182_INPUT_SVIDEO_AIN1_AIN2) | BIT(ADV7182_INPUT_SVIDEO_AIN3_AIN4) | BIT(ADV7182_INPUT_SVIDEO_AIN7_AIN8) | @@ -24,6 +22,3 @@ index 6a6a676eb3d6..101ab60ed665 100644 BIT(ADV7182_INPUT_DIFF_CVBS_AIN1_AIN2) | BIT(ADV7182_INPUT_DIFF_CVBS_AIN3_AIN4) | BIT(ADV7182_INPUT_DIFF_CVBS_AIN7_AIN8), --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0094-media-videodev2-Add-helper-defines-for-printing-FOUR.patch b/target/linux/bcm27xx/patches-6.18/0094-media-videodev2-Add-helper-defines-for-printing-FOUR.patch index 41fc7948f6f..a9c89649b96 100644 --- a/target/linux/bcm27xx/patches-6.18/0094-media-videodev2-Add-helper-defines-for-printing-FOUR.patch +++ b/target/linux/bcm27xx/patches-6.18/0094-media-videodev2-Add-helper-defines-for-printing-FOUR.patch @@ -11,8 +11,6 @@ Signed-off-by: Dave Stevenson include/uapi/linux/videodev2.h | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h -index becd08fdbddb..30f9ba7f4816 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -82,6 +82,11 @@ @@ -27,6 +25,3 @@ index becd08fdbddb..30f9ba7f4816 100644 /* * E N U M S */ --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0095-dt-bindings-Document-BCM283x-CSI2-CCP2-receiver.patch b/target/linux/bcm27xx/patches-6.18/0095-dt-bindings-Document-BCM283x-CSI2-CCP2-receiver.patch index 36bd29c081a..8789a0cff63 100644 --- a/target/linux/bcm27xx/patches-6.18/0095-dt-bindings-Document-BCM283x-CSI2-CCP2-receiver.patch +++ b/target/linux/bcm27xx/patches-6.18/0095-dt-bindings-Document-BCM283x-CSI2-CCP2-receiver.patch @@ -20,9 +20,6 @@ Signed-off-by: Naushir Patuck 1 file changed, 85 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/bcm2835-unicam.txt -diff --git a/Documentation/devicetree/bindings/media/bcm2835-unicam.txt b/Documentation/devicetree/bindings/media/bcm2835-unicam.txt -new file mode 100644 -index 000000000000..164d0377dcd2 --- /dev/null +++ b/Documentation/devicetree/bindings/media/bcm2835-unicam.txt @@ -0,0 +1,85 @@ @@ -111,6 +108,3 @@ index 000000000000..164d0377dcd2 + }; + }; + }; --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0096-staging-mmal-vchiq-Avoid-use-of-bool-in-structures.patch b/target/linux/bcm27xx/patches-6.18/0096-staging-mmal-vchiq-Avoid-use-of-bool-in-structures.patch index dcaa503c94c..b682cbfe9c5 100644 --- a/target/linux/bcm27xx/patches-6.18/0096-staging-mmal-vchiq-Avoid-use-of-bool-in-structures.patch +++ b/target/linux/bcm27xx/patches-6.18/0096-staging-mmal-vchiq-Avoid-use-of-bool-in-structures.patch @@ -11,11 +11,9 @@ Signed-off-by: Dave Stevenson drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c -index c2b5a37915f2..0a62ba4a6189 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c -@@ -1775,7 +1775,7 @@ int vchiq_mmal_component_enable(struct vchiq_mmal_instance *instance, +@@ -1775,7 +1775,7 @@ int vchiq_mmal_component_enable(struct v ret = enable_component(instance, component); if (ret == 0) @@ -24,6 +22,3 @@ index c2b5a37915f2..0a62ba4a6189 100644 mutex_unlock(&instance->vchiq_mutex); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0097-staging-mmal-vchiq-Add-support-for-event-callbacks.patch b/target/linux/bcm27xx/patches-6.18/0097-staging-mmal-vchiq-Add-support-for-event-callbacks.patch index 3432ff24aa1..bde57ae6bb7 100644 --- a/target/linux/bcm27xx/patches-6.18/0097-staging-mmal-vchiq-Add-support-for-event-callbacks.patch +++ b/target/linux/bcm27xx/patches-6.18/0097-staging-mmal-vchiq-Add-support-for-event-callbacks.patch @@ -18,8 +18,6 @@ Signed-off-by: Dave Stevenson .../vc04_services/vchiq-mmal/mmal-vchiq.h | 4 + 4 files changed, 196 insertions(+), 14 deletions(-) -diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h -index b33129403a30..0443be8198ea 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h @@ -50,6 +50,7 @@ struct mmal_buffer { @@ -30,11 +28,9 @@ index b33129403a30..0443be8198ea 100644 unsigned long length; u32 mmal_flags; s64 dts; -diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h -index 1889494425eb..7cccd5ee9a9e 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h -@@ -346,6 +346,41 @@ struct mmal_msg_port_parameter_get_reply { +@@ -346,6 +346,41 @@ struct mmal_msg_port_parameter_get_reply /* event messages */ #define MMAL_WORKER_EVENT_SPACE 256 @@ -76,8 +72,6 @@ index 1889494425eb..7cccd5ee9a9e 100644 struct mmal_msg_event_to_host { u32 client_component; /* component context */ -diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c -index 0a62ba4a6189..1b96dd21a3f3 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c @@ -144,6 +144,8 @@ struct mmal_msg_context { @@ -89,7 +83,7 @@ index 0a62ba4a6189..1b96dd21a3f3 100644 int status; /* context status */ -@@ -231,18 +233,6 @@ release_msg_context(struct mmal_msg_context *msg_context) +@@ -231,18 +233,6 @@ release_msg_context(struct mmal_msg_cont kfree(msg_context); } @@ -108,7 +102,7 @@ index 0a62ba4a6189..1b96dd21a3f3 100644 /* workqueue scheduled callback * * we do this because it is important we do not call any other vchiq -@@ -264,13 +254,18 @@ static void buffer_work_cb(struct work_struct *work) +@@ -264,13 +254,18 @@ static void buffer_work_cb(struct work_s buffer->mmal_flags = msg_context->u.bulk.mmal_flags; buffer->dts = msg_context->u.bulk.dts; buffer->pts = msg_context->u.bulk.pts; @@ -128,7 +122,7 @@ index 0a62ba4a6189..1b96dd21a3f3 100644 } /* workqueue scheduled callback to handle receiving buffers -@@ -348,6 +343,7 @@ static int bulk_receive(struct vchiq_mmal_instance *instance, +@@ -348,6 +343,7 @@ static int bulk_receive(struct vchiq_mma msg_context->u.bulk.buffer_used = rd_len; msg_context->u.bulk.dts = msg->u.buffer_from_host.buffer_header.dts; msg_context->u.bulk.pts = msg->u.buffer_from_host.buffer_header.pts; @@ -136,7 +130,7 @@ index 0a62ba4a6189..1b96dd21a3f3 100644 queue_work(msg_context->instance->bulk_wq, &msg_context->u.bulk.buffer_to_host_work); -@@ -450,6 +446,103 @@ buffer_from_host(struct vchiq_mmal_instance *instance, +@@ -450,6 +446,103 @@ buffer_from_host(struct vchiq_mmal_insta return ret; } @@ -240,7 +234,7 @@ index 0a62ba4a6189..1b96dd21a3f3 100644 /* deals with receipt of buffer to host message */ static void buffer_to_host_cb(struct vchiq_mmal_instance *instance, struct mmal_msg *msg, u32 msg_len) -@@ -1332,6 +1425,7 @@ static int port_disable(struct vchiq_mmal_instance *instance, +@@ -1332,6 +1425,7 @@ static int port_disable(struct vchiq_mma mmalbuf->mmal_flags = 0; mmalbuf->dts = MMAL_TIME_UNKNOWN; mmalbuf->pts = MMAL_TIME_UNKNOWN; @@ -248,7 +242,7 @@ index 0a62ba4a6189..1b96dd21a3f3 100644 port->buffer_cb(instance, port, 0, mmalbuf); } -@@ -1633,6 +1727,43 @@ int mmal_vchi_buffer_cleanup(struct mmal_buffer *buf) +@@ -1633,6 +1727,43 @@ int mmal_vchi_buffer_cleanup(struct mmal } EXPORT_SYMBOL_GPL(mmal_vchi_buffer_cleanup); @@ -292,7 +286,7 @@ index 0a62ba4a6189..1b96dd21a3f3 100644 /* Initialise a mmal component and its ports * */ -@@ -1682,6 +1813,7 @@ int vchiq_mmal_component_init(struct vchiq_mmal_instance *instance, +@@ -1682,6 +1813,7 @@ int vchiq_mmal_component_init(struct vch ret = port_info_get(instance, &component->control); if (ret < 0) goto release_component; @@ -300,7 +294,7 @@ index 0a62ba4a6189..1b96dd21a3f3 100644 for (idx = 0; idx < component->inputs; idx++) { component->input[idx].type = MMAL_PORT_TYPE_INPUT; -@@ -1692,6 +1824,7 @@ int vchiq_mmal_component_init(struct vchiq_mmal_instance *instance, +@@ -1692,6 +1824,7 @@ int vchiq_mmal_component_init(struct vch ret = port_info_get(instance, &component->input[idx]); if (ret < 0) goto release_component; @@ -308,7 +302,7 @@ index 0a62ba4a6189..1b96dd21a3f3 100644 } for (idx = 0; idx < component->outputs; idx++) { -@@ -1703,6 +1836,7 @@ int vchiq_mmal_component_init(struct vchiq_mmal_instance *instance, +@@ -1703,6 +1836,7 @@ int vchiq_mmal_component_init(struct vch ret = port_info_get(instance, &component->output[idx]); if (ret < 0) goto release_component; @@ -316,7 +310,7 @@ index 0a62ba4a6189..1b96dd21a3f3 100644 } for (idx = 0; idx < component->clocks; idx++) { -@@ -1714,6 +1848,7 @@ int vchiq_mmal_component_init(struct vchiq_mmal_instance *instance, +@@ -1714,6 +1848,7 @@ int vchiq_mmal_component_init(struct vch ret = port_info_get(instance, &component->clock[idx]); if (ret < 0) goto release_component; @@ -324,7 +318,7 @@ index 0a62ba4a6189..1b96dd21a3f3 100644 } *component_out = component; -@@ -1739,7 +1874,7 @@ EXPORT_SYMBOL_GPL(vchiq_mmal_component_init); +@@ -1739,7 +1874,7 @@ EXPORT_SYMBOL_GPL(vchiq_mmal_component_i int vchiq_mmal_component_finalise(struct vchiq_mmal_instance *instance, struct vchiq_mmal_component *component) { @@ -333,7 +327,7 @@ index 0a62ba4a6189..1b96dd21a3f3 100644 if (mutex_lock_interruptible(&instance->vchiq_mutex)) return -EINTR; -@@ -1751,6 +1886,13 @@ int vchiq_mmal_component_finalise(struct vchiq_mmal_instance *instance, +@@ -1751,6 +1886,13 @@ int vchiq_mmal_component_finalise(struct component->in_use = false; @@ -347,8 +341,6 @@ index 0a62ba4a6189..1b96dd21a3f3 100644 mutex_unlock(&instance->vchiq_mutex); return ret; -diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h -index 8c3959f6f97f..190a0f42bd6b 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h @@ -79,6 +79,10 @@ struct vchiq_mmal_port { @@ -362,6 +354,3 @@ index 8c3959f6f97f..190a0f42bd6b 100644 }; struct vchiq_mmal_component { --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0098-staging-vc04_services-Support-sending-data-to-MMAL-p.patch b/target/linux/bcm27xx/patches-6.18/0098-staging-vc04_services-Support-sending-data-to-MMAL-p.patch index b28c0531982..4976ab45fd0 100644 --- a/target/linux/bcm27xx/patches-6.18/0098-staging-vc04_services-Support-sending-data-to-MMAL-p.patch +++ b/target/linux/bcm27xx/patches-6.18/0098-staging-vc04_services-Support-sending-data-to-MMAL-p.patch @@ -12,11 +12,9 @@ Signed-off-by: Dave Stevenson .../vc04_services/vchiq-mmal/mmal-vchiq.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) -diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c -index 1b96dd21a3f3..7bee3fb08f02 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c -@@ -420,11 +420,19 @@ buffer_from_host(struct vchiq_mmal_instance *instance, +@@ -420,11 +420,19 @@ buffer_from_host(struct vchiq_mmal_insta m.u.buffer_from_host.buffer_header.data = (u32)(unsigned long)buf->buffer; m.u.buffer_from_host.buffer_header.alloc_size = buf->buffer_size; @@ -41,6 +39,3 @@ index 1b96dd21a3f3..7bee3fb08f02 100644 /* clear buffer type specific data */ memset(&m.u.buffer_from_host.buffer_header_type_specific, 0, --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0099-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch b/target/linux/bcm27xx/patches-6.18/0099-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch index 71a2caf88d2..5a5f9edbec2 100644 --- a/target/linux/bcm27xx/patches-6.18/0099-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch +++ b/target/linux/bcm27xx/patches-6.18/0099-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch @@ -17,11 +17,9 @@ Signed-off-by: Dave Stevenson include/media/videobuf2-core.h | 15 +++++++++++++ 2 files changed, 33 insertions(+), 3 deletions(-) -diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c -index 2df566f409b6..f316864d99fc 100644 --- a/drivers/media/common/videobuf2/videobuf2-core.c +++ b/drivers/media/common/videobuf2/videobuf2-core.c -@@ -2431,11 +2431,11 @@ static int __find_plane_by_offset(struct vb2_queue *q, unsigned long offset, +@@ -2431,11 +2431,11 @@ static int __find_plane_by_offset(struct return 0; } @@ -36,7 +34,7 @@ index 2df566f409b6..f316864d99fc 100644 struct dma_buf *dbuf; if (q->memory != VB2_MEMORY_MMAP) { -@@ -2480,6 +2480,21 @@ int vb2_core_expbuf(struct vb2_queue *q, int *fd, unsigned int type, +@@ -2480,6 +2480,21 @@ int vb2_core_expbuf(struct vb2_queue *q, return -EINVAL; } @@ -58,15 +56,12 @@ index 2df566f409b6..f316864d99fc 100644 ret = dma_buf_fd(dbuf, flags & ~O_ACCMODE); if (ret < 0) { dprintk(q, 3, "buffer %d, plane %d failed to export (%d)\n", -diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h -index 9b02aeba4108..c75b4f14581a 100644 --- a/include/media/videobuf2-core.h +++ b/include/media/videobuf2-core.h -@@ -967,6 +967,21 @@ int vb2_core_streamon(struct vb2_queue *q, unsigned int type); - */ +@@ -968,6 +968,21 @@ int vb2_core_streamon(struct vb2_queue * int vb2_core_streamoff(struct vb2_queue *q, unsigned int type); -+/** + /** + * vb2_core_expbuf_dmabuf() - Export a buffer as a dma_buf structure + * @q: videobuf2 queue + * @type: buffer type @@ -81,9 +76,7 @@ index 9b02aeba4108..c75b4f14581a 100644 + struct vb2_buffer *vb, unsigned int plane, + unsigned int flags, struct dma_buf **dmabuf); + - /** ++/** * vb2_core_expbuf() - Export a buffer as a file descriptor. * @q: pointer to &struct vb2_queue with videobuf2 queue. --- -2.54.0 - + * @fd: pointer to the file descriptor associated with DMABUF diff --git a/target/linux/bcm27xx/patches-6.18/0100-staging-mmal-vchiq-Fix-client_component-for-64-bit-k.patch b/target/linux/bcm27xx/patches-6.18/0100-staging-mmal-vchiq-Fix-client_component-for-64-bit-k.patch index 7b25f2e6428..ef039e25fbf 100644 --- a/target/linux/bcm27xx/patches-6.18/0100-staging-mmal-vchiq-Fix-client_component-for-64-bit-k.patch +++ b/target/linux/bcm27xx/patches-6.18/0100-staging-mmal-vchiq-Fix-client_component-for-64-bit-k.patch @@ -18,11 +18,9 @@ Signed-off-by: Dave Stevenson drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c -index 7bee3fb08f02..e7b69260aea3 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c -@@ -458,9 +458,9 @@ buffer_from_host(struct vchiq_mmal_instance *instance, +@@ -458,9 +458,9 @@ buffer_from_host(struct vchiq_mmal_insta static void event_to_host_cb(struct vchiq_mmal_instance *instance, struct mmal_msg *msg, u32 msg_len) { @@ -34,6 +32,3 @@ index 7bee3fb08f02..e7b69260aea3 100644 struct vchiq_mmal_port *port = NULL; struct mmal_msg_context *msg_context; u32 port_num = msg->u.event_to_host.port_num; --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0101-staging-mmal_vchiq-Add-in-the-Bayer-encoding-formats.patch b/target/linux/bcm27xx/patches-6.18/0101-staging-mmal_vchiq-Add-in-the-Bayer-encoding-formats.patch index 36005daf2ce..f3f98d2ac7c 100644 --- a/target/linux/bcm27xx/patches-6.18/0101-staging-mmal_vchiq-Add-in-the-Bayer-encoding-formats.patch +++ b/target/linux/bcm27xx/patches-6.18/0101-staging-mmal_vchiq-Add-in-the-Bayer-encoding-formats.patch @@ -12,8 +12,6 @@ Signed-off-by: Dave Stevenson .../vc04_services/vchiq-mmal/mmal-encodings.h | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) -diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h -index e15ae7b24f73..feca1c3d8878 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h @@ -69,6 +69,33 @@ @@ -50,6 +48,3 @@ index e15ae7b24f73..feca1c3d8878 100644 /** An EGL image handle */ #define MMAL_ENCODING_EGL_IMAGE MMAL_FOURCC('E', 'G', 'L', 'I') --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0102-staging-mmal-vchiq-Update-mmal_parameters.h-with-rec.patch b/target/linux/bcm27xx/patches-6.18/0102-staging-mmal-vchiq-Update-mmal_parameters.h-with-rec.patch index c2b3c7bd7b7..25719bbc409 100644 --- a/target/linux/bcm27xx/patches-6.18/0102-staging-mmal-vchiq-Update-mmal_parameters.h-with-rec.patch +++ b/target/linux/bcm27xx/patches-6.18/0102-staging-mmal-vchiq-Update-mmal_parameters.h-with-rec.patch @@ -13,8 +13,6 @@ Signed-off-by: Dave Stevenson .../vchiq-mmal/mmal-parameters.h | 32 ++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) -diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h -index a0cdd28101f2..33f4179d7712 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h @@ -577,7 +577,37 @@ enum mmal_parameter_video_type { @@ -56,6 +54,3 @@ index a0cdd28101f2..33f4179d7712 100644 }; /** Valid mirror modes */ --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0103-staging-mmal-vchiq-Free-the-event-context-for-contro.patch b/target/linux/bcm27xx/patches-6.18/0103-staging-mmal-vchiq-Free-the-event-context-for-contro.patch index dbef293b523..57353f45de5 100644 --- a/target/linux/bcm27xx/patches-6.18/0103-staging-mmal-vchiq-Free-the-event-context-for-contro.patch +++ b/target/linux/bcm27xx/patches-6.18/0103-staging-mmal-vchiq-Free-the-event-context-for-contro.patch @@ -14,11 +14,9 @@ Signed-off-by: Dave Stevenson drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c -index e7b69260aea3..6ed493308746 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c -@@ -1901,6 +1901,8 @@ int vchiq_mmal_component_finalise(struct vchiq_mmal_instance *instance, +@@ -1901,6 +1901,8 @@ int vchiq_mmal_component_finalise(struct for (idx = 0; idx < component->clocks; idx++) free_event_context(&component->clock[idx]); @@ -27,6 +25,3 @@ index e7b69260aea3..6ed493308746 100644 mutex_unlock(&instance->vchiq_mutex); return ret; --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0104-staging-mmal-vchiq-Fix-memory-leak-in-error-path.patch b/target/linux/bcm27xx/patches-6.18/0104-staging-mmal-vchiq-Fix-memory-leak-in-error-path.patch index f4fedd77dfa..21d0b2054c5 100644 --- a/target/linux/bcm27xx/patches-6.18/0104-staging-mmal-vchiq-Fix-memory-leak-in-error-path.patch +++ b/target/linux/bcm27xx/patches-6.18/0104-staging-mmal-vchiq-Fix-memory-leak-in-error-path.patch @@ -12,11 +12,9 @@ Signed-off-by: Dave Stevenson .../vc04_services/vchiq-mmal/mmal-vchiq.c | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) -diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c -index 6ed493308746..465b00b33cff 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c -@@ -1767,9 +1767,26 @@ static void free_event_context(struct vchiq_mmal_port *port) +@@ -1767,9 +1767,26 @@ static void free_event_context(struct vc { struct mmal_msg_context *ctx = port->event_context; @@ -43,7 +41,7 @@ index 6ed493308746..465b00b33cff 100644 } /* Initialise a mmal component and its ports -@@ -1867,6 +1884,7 @@ int vchiq_mmal_component_init(struct vchiq_mmal_instance *instance, +@@ -1867,6 +1884,7 @@ int vchiq_mmal_component_init(struct vch release_component: destroy_component(instance, component); @@ -51,7 +49,7 @@ index 6ed493308746..465b00b33cff 100644 unlock: if (component) component->in_use = false; -@@ -1882,7 +1900,7 @@ EXPORT_SYMBOL_GPL(vchiq_mmal_component_init); +@@ -1882,7 +1900,7 @@ EXPORT_SYMBOL_GPL(vchiq_mmal_component_i int vchiq_mmal_component_finalise(struct vchiq_mmal_instance *instance, struct vchiq_mmal_component *component) { @@ -60,7 +58,7 @@ index 6ed493308746..465b00b33cff 100644 if (mutex_lock_interruptible(&instance->vchiq_mutex)) return -EINTR; -@@ -1894,14 +1912,7 @@ int vchiq_mmal_component_finalise(struct vchiq_mmal_instance *instance, +@@ -1894,14 +1912,7 @@ int vchiq_mmal_component_finalise(struct component->in_use = false; @@ -76,6 +74,3 @@ index 6ed493308746..465b00b33cff 100644 mutex_unlock(&instance->vchiq_mutex); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0105-w1-w1-gpio-Make-GPIO-an-output-for-strong-pullup.patch b/target/linux/bcm27xx/patches-6.18/0105-w1-w1-gpio-Make-GPIO-an-output-for-strong-pullup.patch index a5ff4600410..0da67bf7b33 100644 --- a/target/linux/bcm27xx/patches-6.18/0105-w1-w1-gpio-Make-GPIO-an-output-for-strong-pullup.patch +++ b/target/linux/bcm27xx/patches-6.18/0105-w1-w1-gpio-Make-GPIO-an-output-for-strong-pullup.patch @@ -34,11 +34,9 @@ Signed-off-by: Jonathan Bell include/linux/w1.h | 5 +++++ 3 files changed, 34 insertions(+), 13 deletions(-) -diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c -index a579f95be8f1..b03085c50afa 100644 --- a/drivers/w1/masters/w1-gpio.c +++ b/drivers/w1/masters/w1-gpio.c -@@ -35,7 +35,7 @@ static u8 w1_gpio_set_pullup(void *data, int delay) +@@ -35,7 +35,7 @@ static u8 w1_gpio_set_pullup(void *data, * This will OVERRIDE open drain emulation and force-pull * the line high for some time. */ @@ -47,7 +45,7 @@ index a579f95be8f1..b03085c50afa 100644 msleep(ddata->pullup_duration); /* * This will simply set the line as input since we are doing -@@ -89,6 +89,9 @@ static int w1_gpio_probe(struct platform_device *pdev) +@@ -89,6 +89,9 @@ static int w1_gpio_probe(struct platform if (!master) return -ENOMEM; @@ -57,8 +55,6 @@ index a579f95be8f1..b03085c50afa 100644 ddata->gpiod = devm_gpiod_get_index(dev, NULL, 0, gflags); if (IS_ERR(ddata->gpiod)) return dev_err_probe(dev, PTR_ERR(ddata->gpiod), "gpio_request (pin) failed\n"); -diff --git a/drivers/w1/w1_io.c b/drivers/w1/w1_io.c -index db3c9522a8a2..b495624984bd 100644 --- a/drivers/w1/w1_io.c +++ b/drivers/w1/w1_io.c @@ -6,6 +6,7 @@ @@ -93,7 +89,7 @@ index db3c9522a8a2..b495624984bd 100644 } static void w1_write_bit(struct w1_master *dev, int bit); -@@ -77,14 +90,14 @@ static void w1_write_bit(struct w1_master *dev, int bit) +@@ -77,14 +90,14 @@ static void w1_write_bit(struct w1_maste if (bit) { dev->bus_master->write_bit(dev->bus_master->data, 0); @@ -112,7 +108,7 @@ index db3c9522a8a2..b495624984bd 100644 } if(w1_disable_irqs) local_irq_restore(flags); -@@ -164,14 +177,14 @@ static u8 w1_read_bit(struct w1_master *dev) +@@ -164,14 +177,14 @@ static u8 w1_read_bit(struct w1_master * /* sample timing is critical here */ local_irq_save(flags); dev->bus_master->write_bit(dev->bus_master->data, 0); @@ -150,11 +146,9 @@ index db3c9522a8a2..b495624984bd 100644 msleep(1); } -diff --git a/include/linux/w1.h b/include/linux/w1.h -index 064805bfae3f..6bcbafb6ea4f 100644 --- a/include/linux/w1.h +++ b/include/linux/w1.h -@@ -122,6 +122,9 @@ typedef void (*w1_slave_found_callback)(struct w1_master *, u64); +@@ -122,6 +122,9 @@ typedef void (*w1_slave_found_callback)( * @dev_id: Optional device id string, which w1 slaves could use for * creating names, which then give a connection to the w1 master * @@ -173,6 +167,3 @@ index 064805bfae3f..6bcbafb6ea4f 100644 }; /** --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0106-arm-bcm2835-Fix-FIQ-early-ioremap.patch b/target/linux/bcm27xx/patches-6.18/0106-arm-bcm2835-Fix-FIQ-early-ioremap.patch index 69c244a7e9a..73bc19bd8b8 100644 --- a/target/linux/bcm27xx/patches-6.18/0106-arm-bcm2835-Fix-FIQ-early-ioremap.patch +++ b/target/linux/bcm27xx/patches-6.18/0106-arm-bcm2835-Fix-FIQ-early-ioremap.patch @@ -15,8 +15,6 @@ Signed-off-by: Phil Elwell arch/arm/mach-bcm/board_bcm2835.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) -diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c -index 9b6c921106b5..9bd9842da59f 100644 --- a/arch/arm/mach-bcm/board_bcm2835.c +++ b/arch/arm/mach-bcm/board_bcm2835.c @@ -5,17 +5,20 @@ @@ -42,7 +40,7 @@ index 9b6c921106b5..9bd9842da59f 100644 static void __init bcm2835_init(void) { -@@ -74,20 +77,26 @@ static int __init bcm2835_map_usb(unsigned long node, const char *uname, +@@ -74,20 +77,26 @@ static int __init bcm2835_map_usb(unsign static void __init bcm2835_map_io(void) { @@ -73,6 +71,3 @@ index 9b6c921106b5..9bd9842da59f 100644 /* Now search for bcm2708-usb node in device tree */ of_scan_flat_dt(bcm2835_map_usb, &p2b_offset); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0107-arm-bcm2835-DMA-can-only-address-1GB.patch b/target/linux/bcm27xx/patches-6.18/0107-arm-bcm2835-DMA-can-only-address-1GB.patch index 5dbb02ff1a8..39f4bce2586 100644 --- a/target/linux/bcm27xx/patches-6.18/0107-arm-bcm2835-DMA-can-only-address-1GB.patch +++ b/target/linux/bcm27xx/patches-6.18/0107-arm-bcm2835-DMA-can-only-address-1GB.patch @@ -11,11 +11,9 @@ Signed-off-by: Phil Elwell arch/arm/mach-bcm/board_bcm2835.c | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c -index 9bd9842da59f..7d59a9364175 100644 --- a/arch/arm/mach-bcm/board_bcm2835.c +++ b/arch/arm/mach-bcm/board_bcm2835.c -@@ -114,6 +114,9 @@ static const char * const bcm2835_compat[] = { +@@ -114,6 +114,9 @@ static const char * const bcm2835_compat }; DT_MACHINE_START(BCM2835, "BCM2835") @@ -25,6 +23,3 @@ index 9bd9842da59f..7d59a9364175 100644 .map_io = bcm2835_map_io, .init_machine = bcm2835_init, .dt_compat = bcm2835_compat, --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0108-hwrng-iproc-rng200-Add-BCM2838-support.patch b/target/linux/bcm27xx/patches-6.18/0108-hwrng-iproc-rng200-Add-BCM2838-support.patch index 958d1e588bd..f37a24b463f 100644 --- a/target/linux/bcm27xx/patches-6.18/0108-hwrng-iproc-rng200-Add-BCM2838-support.patch +++ b/target/linux/bcm27xx/patches-6.18/0108-hwrng-iproc-rng200-Add-BCM2838-support.patch @@ -20,8 +20,6 @@ Signed-off-by: Phil Elwell drivers/char/hw_random/iproc-rng200.c | 79 ++++++++++++++++++++++++++- 2 files changed, 77 insertions(+), 4 deletions(-) -diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig -index 492a2a61a65b..dbc993fb9e01 100644 --- a/drivers/char/hw_random/Kconfig +++ b/drivers/char/hw_random/Kconfig @@ -131,7 +131,7 @@ config HW_RANDOM_IPROC_RNG200 @@ -33,8 +31,6 @@ index 492a2a61a65b..dbc993fb9e01 100644 To compile this driver as a module, choose M here: the module will be called iproc-rng200 -diff --git a/drivers/char/hw_random/iproc-rng200.c b/drivers/char/hw_random/iproc-rng200.c -index 440fe28bddc0..33bc28f429f6 100644 --- a/drivers/char/hw_random/iproc-rng200.c +++ b/drivers/char/hw_random/iproc-rng200.c @@ -13,6 +13,7 @@ @@ -77,7 +73,7 @@ index 440fe28bddc0..33bc28f429f6 100644 struct iproc_rng200_dev { struct hwrng rng; -@@ -157,6 +166,64 @@ static int iproc_rng200_init(struct hwrng *rng) +@@ -157,6 +166,64 @@ static int iproc_rng200_init(struct hwrn return 0; } @@ -142,7 +138,7 @@ index 440fe28bddc0..33bc28f429f6 100644 static void iproc_rng200_cleanup(struct hwrng *rng) { struct iproc_rng200_dev *priv = to_rng_priv(rng); -@@ -183,11 +250,17 @@ static int iproc_rng200_probe(struct platform_device *pdev) +@@ -183,11 +250,17 @@ static int iproc_rng200_probe(struct pla dev_set_drvdata(dev, priv); @@ -163,6 +159,3 @@ index 440fe28bddc0..33bc28f429f6 100644 /* Register driver */ ret = devm_hwrng_register(dev, &priv->rng); if (ret) { --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0109-bcmgenet-constrain-max-DMA-burst-length.patch b/target/linux/bcm27xx/patches-6.18/0109-bcmgenet-constrain-max-DMA-burst-length.patch index eeba5eeebbc..9f52260e6f0 100644 --- a/target/linux/bcm27xx/patches-6.18/0109-bcmgenet-constrain-max-DMA-burst-length.patch +++ b/target/linux/bcm27xx/patches-6.18/0109-bcmgenet-constrain-max-DMA-burst-length.patch @@ -7,8 +7,6 @@ Subject: [PATCH] bcmgenet: constrain max DMA burst length drivers/net/ethernet/broadcom/genet/bcmgenet.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.h b/drivers/net/ethernet/broadcom/genet/bcmgenet.h -index 9e4110c7fdf6..bf6a7eda0f86 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.h +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.h @@ -34,7 +34,7 @@ @@ -20,6 +18,3 @@ index 9e4110c7fdf6..bf6a7eda0f86 100644 /* misc. configuration */ #define MAX_NUM_OF_FS_RULES 16 --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0110-bcmgenet-Better-coalescing-parameter-defaults.patch b/target/linux/bcm27xx/patches-6.18/0110-bcmgenet-Better-coalescing-parameter-defaults.patch index dd100c731c5..d0d394c14d8 100644 --- a/target/linux/bcm27xx/patches-6.18/0110-bcmgenet-Better-coalescing-parameter-defaults.patch +++ b/target/linux/bcm27xx/patches-6.18/0110-bcmgenet-Better-coalescing-parameter-defaults.patch @@ -16,11 +16,9 @@ Signed-off-by: Phil Elwell drivers/net/ethernet/broadcom/genet/bcmgenet.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -index e142939d87cb..3b8a062004b7 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -@@ -2721,7 +2721,7 @@ static void bcmgenet_init_tx_ring(struct bcmgenet_priv *priv, +@@ -2722,7 +2722,7 @@ static void bcmgenet_init_tx_ring(struct bcmgenet_tdma_ring_writel(priv, index, 0, TDMA_PROD_INDEX); bcmgenet_tdma_ring_writel(priv, index, 0, TDMA_CONS_INDEX); @@ -29,7 +27,7 @@ index e142939d87cb..3b8a062004b7 100644 /* Disable rate control for now */ bcmgenet_tdma_ring_writel(priv, index, flow_period_val, TDMA_FLOW_PERIOD); -@@ -4082,8 +4082,10 @@ static int bcmgenet_probe(struct platform_device *pdev) +@@ -4079,8 +4079,10 @@ static int bcmgenet_probe(struct platfor netif_set_real_num_rx_queues(priv->dev, priv->hw_params->rx_queues + 1); /* Set default coalescing parameters */ @@ -41,6 +39,3 @@ index e142939d87cb..3b8a062004b7 100644 /* Initialize u64 stats seq counter for 32bit machines */ for (i = 0; i <= priv->hw_params->rx_queues; i++) --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0111-net-genet-enable-link-energy-detect-powerdown-for-ex.patch b/target/linux/bcm27xx/patches-6.18/0111-net-genet-enable-link-energy-detect-powerdown-for-ex.patch index 72896dcb260..00fea777cd7 100644 --- a/target/linux/bcm27xx/patches-6.18/0111-net-genet-enable-link-energy-detect-powerdown-for-ex.patch +++ b/target/linux/bcm27xx/patches-6.18/0111-net-genet-enable-link-energy-detect-powerdown-for-ex.patch @@ -18,11 +18,9 @@ Signed-off-by: Jonathan Bell drivers/net/ethernet/broadcom/genet/bcmmii.c | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/ethernet/broadcom/genet/bcmmii.c -index 33e3eec31cc9..e0b04f6f81ba 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmmii.c +++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c -@@ -314,6 +314,8 @@ int bcmgenet_mii_probe(struct net_device *dev) +@@ -314,6 +314,8 @@ int bcmgenet_mii_probe(struct net_device /* Communicate the integrated PHY revision */ if (priv->internal_phy) phy_flags = priv->gphy_rev; @@ -31,6 +29,3 @@ index 33e3eec31cc9..e0b04f6f81ba 100644 /* This is an ugly quirk but we have not been correctly interpreting * the phy_interface values and we have done that across different --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0112-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch b/target/linux/bcm27xx/patches-6.18/0112-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch index 288e9bc0e10..0ddf376ee48 100644 --- a/target/linux/bcm27xx/patches-6.18/0112-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch +++ b/target/linux/bcm27xx/patches-6.18/0112-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch @@ -25,11 +25,9 @@ Signed-off-by: Jonathan Bell include/linux/usb/hcd.h | 7 +++++++ 4 files changed, 34 insertions(+) -diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c -index 9dd79769cad1..21fa337edb46 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c -@@ -1964,6 +1964,16 @@ int usb_hcd_alloc_bandwidth(struct usb_device *udev, +@@ -1962,6 +1962,16 @@ reset: return ret; } @@ -46,11 +44,9 @@ index 9dd79769cad1..21fa337edb46 100644 /* Disables the endpoint: synchronizes with the hcd to make sure all * endpoint state is gone from hardware. usb_hcd_flush_endpoint() must * have been called previously. Use for set_configuration, set_interface, -diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c -index d25022abdbdc..20d0f1a93586 100644 --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c -@@ -1325,6 +1325,21 @@ static void remove_intf_ep_devs(struct usb_interface *intf) +@@ -1325,6 +1325,21 @@ static void remove_intf_ep_devs(struct u intf->ep_devs_created = 0; } @@ -72,11 +68,9 @@ index d25022abdbdc..20d0f1a93586 100644 /** * usb_disable_endpoint -- Disable an endpoint by address * @dev: the device whose endpoint is being disabled -diff --git a/include/linux/usb.h b/include/linux/usb.h -index 2511f1e5b114..5edf769f9100 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h -@@ -1918,6 +1918,8 @@ extern int usb_clear_halt(struct usb_device *dev, int pipe); +@@ -1919,6 +1919,8 @@ extern int usb_clear_halt(struct usb_dev extern int usb_reset_configuration(struct usb_device *dev); extern int usb_set_interface(struct usb_device *dev, int ifnum, int alternate); extern void usb_reset_endpoint(struct usb_device *dev, unsigned int epaddr); @@ -85,8 +79,6 @@ index 2511f1e5b114..5edf769f9100 100644 /* this request isn't really synchronous, but it belongs with the others */ extern int usb_driver_set_configuration(struct usb_device *udev, int config); -diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h -index ac95e7c89df5..8fd38368cb31 100644 --- a/include/linux/usb/hcd.h +++ b/include/linux/usb/hcd.h @@ -372,6 +372,11 @@ struct hc_driver { @@ -101,7 +93,7 @@ index ac95e7c89df5..8fd38368cb31 100644 /* Set the hardware-chosen device address */ int (*address_device)(struct usb_hcd *, struct usb_device *udev, unsigned int timeout_ms); -@@ -437,6 +442,8 @@ extern void usb_hcd_unmap_urb_setup_for_dma(struct usb_hcd *, struct urb *); +@@ -437,6 +442,8 @@ extern void usb_hcd_unmap_urb_setup_for_ extern void usb_hcd_unmap_urb_for_dma(struct usb_hcd *, struct urb *); extern void usb_hcd_flush_endpoint(struct usb_device *udev, struct usb_host_endpoint *ep); @@ -110,6 +102,3 @@ index ac95e7c89df5..8fd38368cb31 100644 extern void usb_hcd_disable_endpoint(struct usb_device *udev, struct usb_host_endpoint *ep); extern void usb_hcd_reset_endpoint(struct usb_device *udev, --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0113-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch b/target/linux/bcm27xx/patches-6.18/0113-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch index cf0cf9778ac..f37fe39f69d 100644 --- a/target/linux/bcm27xx/patches-6.18/0113-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch +++ b/target/linux/bcm27xx/patches-6.18/0113-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch @@ -12,15 +12,12 @@ Signed-off-by: Jonathan Bell drivers/usb/host/xhci.c | 104 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) -diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c -index d84dded5333f..7acb1c78931f 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -1608,6 +1608,109 @@ static int xhci_check_ep0_maxpacket(struct xhci_hcd *xhci, struct xhci_virt_devi - return ret; +@@ -1609,6 +1609,109 @@ static int xhci_check_ep0_maxpacket(stru } -+/* + /* + * RPI: Fixup endpoint intervals when requested + * - Check interval versus the (cached) endpoint context + * - set the endpoint interval to the new value @@ -123,10 +120,11 @@ index d84dded5333f..7acb1c78931f 100644 + mutex_unlock(&xhci->mutex); +} + - /* ++/* * non-error returns are a promise to giveback() the urb later * we drop ownership so next owner (or urb unlink) can get it -@@ -5592,6 +5695,7 @@ static const struct hc_driver xhci_hc_driver = { + */ +@@ -5591,6 +5694,7 @@ static const struct hc_driver xhci_hc_dr .endpoint_reset = xhci_endpoint_reset, .check_bandwidth = xhci_check_bandwidth, .reset_bandwidth = xhci_reset_bandwidth, @@ -134,6 +132,3 @@ index d84dded5333f..7acb1c78931f 100644 .address_device = xhci_address_device, .enable_device = xhci_enable_device, .update_hub_device = xhci_update_hub_device, --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0114-usb-xhci-workaround-for-bogus-SET_DEQ_PENDING-endpoi.patch b/target/linux/bcm27xx/patches-6.18/0114-usb-xhci-workaround-for-bogus-SET_DEQ_PENDING-endpoi.patch index ba78a4a3de5..e476932ed04 100644 --- a/target/linux/bcm27xx/patches-6.18/0114-usb-xhci-workaround-for-bogus-SET_DEQ_PENDING-endpoi.patch +++ b/target/linux/bcm27xx/patches-6.18/0114-usb-xhci-workaround-for-bogus-SET_DEQ_PENDING-endpoi.patch @@ -24,11 +24,9 @@ Signed-off-by: Jonathan Bell drivers/usb/host/xhci-ring.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c -index 2bb7569c9505..44291e7b7781 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c -@@ -754,9 +754,9 @@ static int xhci_move_dequeue_past_td(struct xhci_hcd *xhci, +@@ -754,9 +754,9 @@ static int xhci_move_dequeue_past_td(str } if ((ep->ep_state & SET_DEQ_PENDING)) { @@ -41,6 +39,3 @@ index 2bb7569c9505..44291e7b7781 100644 } /* This function gets called from contexts where it cannot sleep */ --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0115-usb-xhci-drop-and-add-the-endpoint-context-in-xhci_f.patch b/target/linux/bcm27xx/patches-6.18/0115-usb-xhci-drop-and-add-the-endpoint-context-in-xhci_f.patch index f0b5557efa7..be64a98464a 100644 --- a/target/linux/bcm27xx/patches-6.18/0115-usb-xhci-drop-and-add-the-endpoint-context-in-xhci_f.patch +++ b/target/linux/bcm27xx/patches-6.18/0115-usb-xhci-drop-and-add-the-endpoint-context-in-xhci_f.patch @@ -17,11 +17,9 @@ Signed-off-by: Jonathan Bell drivers/usb/host/xhci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c -index 7acb1c78931f..3c89f4affc1c 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -1698,7 +1698,7 @@ static void xhci_fixup_endpoint(struct usb_hcd *hcd, struct usb_device *udev, +@@ -1698,7 +1698,7 @@ static void xhci_fixup_endpoint(struct u return; } ctrl_ctx->add_flags = xhci_get_endpoint_flag_from_index(ep_index); @@ -30,6 +28,3 @@ index 7acb1c78931f..3c89f4affc1c 100644 spin_unlock_irqrestore(&xhci->lock, flags); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0116-ARM-bcm-Backport-BCM2711-support-from-upstream.patch b/target/linux/bcm27xx/patches-6.18/0116-ARM-bcm-Backport-BCM2711-support-from-upstream.patch index 6f00c48dac5..8f55793a837 100644 --- a/target/linux/bcm27xx/patches-6.18/0116-ARM-bcm-Backport-BCM2711-support-from-upstream.patch +++ b/target/linux/bcm27xx/patches-6.18/0116-ARM-bcm-Backport-BCM2711-support-from-upstream.patch @@ -22,11 +22,9 @@ Signed-off-by: Stefan Wahren arch/arm/mach-bcm/board_bcm2835.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) -diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c -index 7d59a9364175..869f22ef562a 100644 --- a/arch/arm/mach-bcm/board_bcm2835.c +++ b/arch/arm/mach-bcm/board_bcm2835.c -@@ -109,16 +109,31 @@ static const char * const bcm2835_compat[] = { +@@ -109,16 +109,31 @@ static const char * const bcm2835_compat #ifdef CONFIG_ARCH_MULTI_V7 "brcm,bcm2836", "brcm,bcm2837", @@ -59,6 +57,3 @@ index 7d59a9364175..869f22ef562a 100644 + .dt_compat = bcm2711_compat, .smp = smp_ops(bcm2836_smp_ops), MACHINE_END --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0117-i2c-bcm2835-Set-clock-stretch-timeout-to-35ms.patch b/target/linux/bcm27xx/patches-6.18/0117-i2c-bcm2835-Set-clock-stretch-timeout-to-35ms.patch index 8543f797c31..4369bc1431f 100644 --- a/target/linux/bcm27xx/patches-6.18/0117-i2c-bcm2835-Set-clock-stretch-timeout-to-35ms.patch +++ b/target/linux/bcm27xx/patches-6.18/0117-i2c-bcm2835-Set-clock-stretch-timeout-to-35ms.patch @@ -53,8 +53,6 @@ Signed-off-by: Dave Stevenson drivers/i2c/busses/i2c-bcm2835.c | 34 +++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) -diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c -index e56349228c14..cccb03eceafe 100644 --- a/drivers/i2c/busses/i2c-bcm2835.c +++ b/drivers/i2c/busses/i2c-bcm2835.c @@ -60,6 +60,10 @@ static unsigned int debug; @@ -68,7 +66,7 @@ index e56349228c14..cccb03eceafe 100644 #define BCM2835_DEBUG_MAX 512 struct bcm2835_debug { struct i2c_msg *msg; -@@ -193,6 +197,7 @@ static int clk_bcm2835_i2c_set_rate(struct clk_hw *hw, unsigned long rate, +@@ -193,6 +197,7 @@ static int clk_bcm2835_i2c_set_rate(stru { struct clk_bcm2835_i2c *div = to_clk_bcm2835_i2c(hw); u32 redl, fedl; @@ -76,7 +74,7 @@ index e56349228c14..cccb03eceafe 100644 u32 divider = clk_bcm2835_i2c_calc_divider(rate, parent_rate); if (divider == -EINVAL) -@@ -216,6 +221,17 @@ static int clk_bcm2835_i2c_set_rate(struct clk_hw *hw, unsigned long rate, +@@ -216,6 +221,17 @@ static int clk_bcm2835_i2c_set_rate(stru bcm2835_i2c_writel(div->i2c_dev, BCM2835_I2C_DEL, (fedl << BCM2835_I2C_FEDL_SHIFT) | (redl << BCM2835_I2C_REDL_SHIFT)); @@ -94,7 +92,7 @@ index e56349228c14..cccb03eceafe 100644 return 0; } -@@ -369,10 +385,8 @@ static irqreturn_t bcm2835_i2c_isr(int this_irq, void *data) +@@ -369,10 +385,8 @@ static irqreturn_t bcm2835_i2c_isr(int t bcm2835_debug_add(i2c_dev, val); err = val & (BCM2835_I2C_S_CLKT | BCM2835_I2C_S_ERR); @@ -106,7 +104,7 @@ index e56349228c14..cccb03eceafe 100644 if (val & BCM2835_I2C_S_DONE) { if (!i2c_dev->curr_msg) { -@@ -384,8 +398,6 @@ static irqreturn_t bcm2835_i2c_isr(int this_irq, void *data) +@@ -384,8 +398,6 @@ static irqreturn_t bcm2835_i2c_isr(int t if ((val & BCM2835_I2C_S_RXD) || i2c_dev->msg_buf_remaining) i2c_dev->msg_err = BCM2835_I2C_S_LEN; @@ -115,7 +113,7 @@ index e56349228c14..cccb03eceafe 100644 goto complete; } -@@ -431,6 +443,7 @@ static int bcm2835_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], +@@ -431,6 +443,7 @@ static int bcm2835_i2c_xfer(struct i2c_a { struct bcm2835_i2c_dev *i2c_dev = i2c_get_adapdata(adap); unsigned long time_left; @@ -123,7 +121,7 @@ index e56349228c14..cccb03eceafe 100644 int i; if (debug) -@@ -440,15 +453,19 @@ static int bcm2835_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], +@@ -440,15 +453,19 @@ static int bcm2835_i2c_xfer(struct i2c_a for (i = 0; i < num; i++) bcm2835_debug_print_msg(i2c_dev, &msgs[i], i + 1, num, __func__); @@ -144,7 +142,7 @@ index e56349228c14..cccb03eceafe 100644 reinit_completion(&i2c_dev->completion); bcm2835_i2c_start_transfer(i2c_dev); -@@ -458,6 +475,9 @@ static int bcm2835_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], +@@ -458,6 +475,9 @@ static int bcm2835_i2c_xfer(struct i2c_a bcm2835_i2c_finish_transfer(i2c_dev); @@ -154,7 +152,7 @@ index e56349228c14..cccb03eceafe 100644 if (debug > 1 || (debug && (!time_left || i2c_dev->msg_err))) bcm2835_debug_print(i2c_dev); i2c_dev->debug_num_msgs = 0; -@@ -483,7 +503,7 @@ static int bcm2835_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], +@@ -483,7 +503,7 @@ static int bcm2835_i2c_xfer(struct i2c_a static u32 bcm2835_i2c_func(struct i2c_adapter *adap) { @@ -163,6 +161,3 @@ index e56349228c14..cccb03eceafe 100644 } static const struct i2c_algorithm bcm2835_i2c_algo = { --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0118-drm-v3d-Clock-V3D-down-when-not-in-use.patch b/target/linux/bcm27xx/patches-6.18/0118-drm-v3d-Clock-V3D-down-when-not-in-use.patch index 93cf1922753..84593fe0822 100644 --- a/target/linux/bcm27xx/patches-6.18/0118-drm-v3d-Clock-V3D-down-when-not-in-use.patch +++ b/target/linux/bcm27xx/patches-6.18/0118-drm-v3d-Clock-V3D-down-when-not-in-use.patch @@ -77,8 +77,6 @@ Reviewed-by: Maíra Canal drivers/gpu/drm/v3d/v3d_submit.c | 80 ++++++++++++++++++++++++++++++-- 4 files changed, 122 insertions(+), 3 deletions(-) -diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c -index f4da7a94e401..a996301f36b9 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.c +++ b/drivers/gpu/drm/v3d/v3d_drv.c @@ -25,6 +25,9 @@ @@ -91,7 +89,7 @@ index f4da7a94e401..a996301f36b9 100644 #include #include "v3d_drv.h" -@@ -326,6 +329,8 @@ map_regs(struct v3d_dev *v3d, void __iomem **regs, const char *name) +@@ -334,6 +337,8 @@ map_regs(struct v3d_dev *v3d, void __iom static int v3d_platform_drm_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -100,7 +98,7 @@ index f4da7a94e401..a996301f36b9 100644 struct drm_device *drm; struct v3d_dev *v3d; enum v3d_gen gen; -@@ -413,6 +418,34 @@ static int v3d_platform_drm_probe(struct platform_device *pdev) +@@ -421,6 +426,34 @@ static int v3d_platform_drm_probe(struct } } @@ -135,7 +133,7 @@ index f4da7a94e401..a996301f36b9 100644 if (v3d->ver < V3D_GEN_41) { ret = map_regs(v3d, &v3d->gca_regs, "gca"); if (ret) -@@ -442,6 +475,8 @@ static int v3d_platform_drm_probe(struct platform_device *pdev) +@@ -450,6 +483,8 @@ static int v3d_platform_drm_probe(struct ret = v3d_sysfs_init(dev); if (ret) goto drm_unregister; @@ -144,8 +142,6 @@ index f4da7a94e401..a996301f36b9 100644 return 0; -diff --git a/drivers/gpu/drm/v3d/v3d_drv.h b/drivers/gpu/drm/v3d/v3d_drv.h -index 1884686985b8..e881bdb9bb17 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.h +++ b/drivers/gpu/drm/v3d/v3d_drv.h @@ -134,6 +134,12 @@ struct v3d_dev { @@ -161,13 +157,11 @@ index 1884686985b8..e881bdb9bb17 100644 struct reset_control *reset; /* Virtual and DMA addresses of the single shared page table. */ -@@ -638,3 +644,4 @@ int v3d_perfmon_set_global_ioctl(struct drm_device *dev, void *data, +@@ -638,3 +644,4 @@ int v3d_perfmon_set_global_ioctl(struct /* v3d_sysfs.c */ int v3d_sysfs_init(struct device *dev); void v3d_sysfs_destroy(struct device *dev); +void v3d_submit_init(struct drm_device *dev); -diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c -index bb110d35f749..62fcd8c9cbc4 100644 --- a/drivers/gpu/drm/v3d/v3d_gem.c +++ b/drivers/gpu/drm/v3d/v3d_gem.c @@ -4,6 +4,7 @@ @@ -178,7 +172,7 @@ index bb110d35f749..62fcd8c9cbc4 100644 #include #include #include -@@ -290,6 +291,8 @@ v3d_gem_init(struct drm_device *dev) +@@ -298,6 +299,8 @@ v3d_gem_init(struct drm_device *dev) if (ret) return ret; @@ -187,8 +181,6 @@ index bb110d35f749..62fcd8c9cbc4 100644 /* Note: We don't allocate address 0. Various bits of HW * treat 0 as special, such as the occlusion query counters * where 0 means "disabled". -diff --git a/drivers/gpu/drm/v3d/v3d_submit.c b/drivers/gpu/drm/v3d/v3d_submit.c -index f3652e90683c..e6ca93125666 100644 --- a/drivers/gpu/drm/v3d/v3d_submit.c +++ b/drivers/gpu/drm/v3d/v3d_submit.c @@ -5,11 +5,52 @@ @@ -257,7 +249,7 @@ index f3652e90683c..e6ca93125666 100644 int i; if (job->bo) { -@@ -99,12 +141,31 @@ v3d_job_free(struct kref *ref) +@@ -99,6 +141,9 @@ v3d_job_free(struct kref *ref) dma_fence_put(job->irq_fence); dma_fence_put(job->done_fence); @@ -267,10 +259,10 @@ index f3652e90683c..e6ca93125666 100644 if (job->perfmon) v3d_perfmon_put(job->perfmon); - kfree(job); +@@ -106,6 +151,22 @@ v3d_job_free(struct kref *ref) } -+static void + static void +v3d_job_free(struct kref *ref) +{ + struct v3d_job *job = container_of(ref, struct v3d_job, refcount); @@ -286,10 +278,11 @@ index f3652e90683c..e6ca93125666 100644 + v3d_job_free_common(job, false); +} + - static void ++static void v3d_render_job_free(struct kref *ref) { -@@ -199,6 +260,8 @@ v3d_job_init(struct v3d_dev *v3d, struct drm_file *file_priv, + struct v3d_render_job *job = container_of(ref, struct v3d_render_job, +@@ -217,6 +278,8 @@ v3d_job_init(struct v3d_dev *v3d, struct if (ret && ret != -ENOENT) goto fail_deps; } @@ -298,16 +291,7 @@ index f3652e90683c..e6ca93125666 100644 kref_init(&job->refcount); -@@ -1316,7 +1379,7 @@ v3d_submit_cpu_ioctl(struct drm_device *dev, void *data, - trace_v3d_submit_cpu_ioctl(&v3d->drm, cpu_job->job_type); - - ret = v3d_job_init(v3d, file_priv, &cpu_job->base, -- v3d_job_free, 0, &se, V3D_CPU); -+ v3d_cpu_job_free, 0, &se, V3D_CPU); - if (ret) { - v3d_job_deallocate((void *)&cpu_job); - goto fail; -@@ -1404,3 +1467,14 @@ v3d_submit_cpu_ioctl(struct drm_device *dev, void *data, +@@ -1425,3 +1488,14 @@ fail: return ret; } @@ -323,6 +307,3 @@ index f3652e90683c..e6ca93125666 100644 + v3d_clock_up_put(v3d); +} \ No newline at end of file --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0119-drm-v3d-Suppress-all-but-the-first-MMU-error.patch b/target/linux/bcm27xx/patches-6.18/0119-drm-v3d-Suppress-all-but-the-first-MMU-error.patch index 9ca9ed1cc88..c21976f1702 100644 --- a/target/linux/bcm27xx/patches-6.18/0119-drm-v3d-Suppress-all-but-the-first-MMU-error.patch +++ b/target/linux/bcm27xx/patches-6.18/0119-drm-v3d-Suppress-all-but-the-first-MMU-error.patch @@ -11,8 +11,6 @@ Signed-off-by: Phil Elwell drivers/gpu/drm/v3d/v3d_irq.c | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/drivers/gpu/drm/v3d/v3d_irq.c b/drivers/gpu/drm/v3d/v3d_irq.c -index 31ecc5b4ba5a..427320a879ab 100644 --- a/drivers/gpu/drm/v3d/v3d_irq.c +++ b/drivers/gpu/drm/v3d/v3d_irq.c @@ -197,6 +197,7 @@ v3d_hub_irq(int irq, void *arg) @@ -39,6 +37,3 @@ index 31ecc5b4ba5a..427320a879ab 100644 status = IRQ_HANDLED; } --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0120-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch b/target/linux/bcm27xx/patches-6.18/0120-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch index a9b8b4d6505..98560c3016a 100644 --- a/target/linux/bcm27xx/patches-6.18/0120-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch +++ b/target/linux/bcm27xx/patches-6.18/0120-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch @@ -20,11 +20,9 @@ Signed-off-by: Jonathan Bell drivers/hid/hid-quirks.c | 2 ++ 2 files changed, 8 insertions(+) -diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h -index d9d354f1b884..866360f9129a 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h -@@ -259,6 +259,9 @@ +@@ -262,6 +262,9 @@ #define USB_VENDOR_ID_BAANTO 0x2453 #define USB_DEVICE_ID_BAANTO_MT_190W2 0x0100 @@ -34,7 +32,7 @@ index d9d354f1b884..866360f9129a 100644 #define USB_VENDOR_ID_BELKIN 0x050d #define USB_DEVICE_ID_FLIP_KVM 0x3201 -@@ -1498,6 +1501,9 @@ +@@ -1502,6 +1505,9 @@ #define USB_VENDOR_ID_XIAOMI 0x2717 #define USB_DEVICE_ID_MI_SILENT_MOUSE 0x5014 @@ -44,11 +42,9 @@ index d9d354f1b884..866360f9129a 100644 #define USB_VENDOR_ID_XIN_MO 0x16c0 #define USB_DEVICE_ID_XIN_MO_DUAL_ARCADE 0x05e1 #define USB_DEVICE_ID_THT_2P_ARCADE 0x75e1 -diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c -index 3217e436c052..53fb1297f781 100644 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c -@@ -44,6 +44,7 @@ static const struct hid_device_id hid_quirks[] = { +@@ -45,6 +45,7 @@ static const struct hid_device_id hid_qu { HID_USB_DEVICE(USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_CS682), HID_QUIRK_NOGET }, { HID_USB_DEVICE(USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_CS692), HID_QUIRK_NOGET }, { HID_USB_DEVICE(USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_UC100KM), HID_QUIRK_NOGET }, @@ -56,7 +52,7 @@ index 3217e436c052..53fb1297f781 100644 { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_MULTI_TOUCH), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE2), HID_QUIRK_ALWAYS_POLL }, -@@ -216,6 +217,7 @@ static const struct hid_device_id hid_quirks[] = { +@@ -218,6 +219,7 @@ static const struct hid_device_id hid_qu { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_XIN_MO_DUAL_ARCADE), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_GROUP_AUDIO), HID_QUIRK_NOGET }, @@ -64,6 +60,3 @@ index 3217e436c052..53fb1297f781 100644 { 0 } }; --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0121-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch b/target/linux/bcm27xx/patches-6.18/0121-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch index 7301121e7bb..3f338b886ba 100644 --- a/target/linux/bcm27xx/patches-6.18/0121-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch +++ b/target/linux/bcm27xx/patches-6.18/0121-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch @@ -25,8 +25,6 @@ Signed-off-by: Phil Elwell drivers/net/ethernet/broadcom/genet/bcmgenet.c | 8 ++++++++ 1 file changed, 8 insertions(+) -diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -index 3b8a062004b7..226af052bf53 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -65,6 +65,9 @@ @@ -39,7 +37,7 @@ index 3b8a062004b7..226af052bf53 100644 static inline void bcmgenet_writel(u32 value, void __iomem *offset) { -@@ -2559,6 +2562,11 @@ static void reset_umac(struct bcmgenet_priv *priv) +@@ -2560,6 +2563,11 @@ static void reset_umac(struct bcmgenet_p bcmgenet_rbuf_ctrl_set(priv, 0); udelay(10); @@ -51,6 +49,3 @@ index 3b8a062004b7..226af052bf53 100644 /* issue soft reset and disable MAC while updating its registers */ spin_lock_bh(&priv->reg_lock); bcmgenet_umac_writel(priv, CMD_SW_RESET, UMAC_CMD); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0122-arch-arm-Add-model-string-to-cpuinfo.patch b/target/linux/bcm27xx/patches-6.18/0122-arch-arm-Add-model-string-to-cpuinfo.patch index e55d8b1dc76..5576d41110e 100644 --- a/target/linux/bcm27xx/patches-6.18/0122-arch-arm-Add-model-string-to-cpuinfo.patch +++ b/target/linux/bcm27xx/patches-6.18/0122-arch-arm-Add-model-string-to-cpuinfo.patch @@ -8,11 +8,9 @@ Signed-off-by: Phil Elwell arch/arm/kernel/setup.c | 10 ++++++++++ 1 file changed, 10 insertions(+) -diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c -index 0bfd66c7ada0..44cacf03b05d 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c -@@ -1260,6 +1260,8 @@ static int c_show(struct seq_file *m, void *v) +@@ -1260,6 +1260,8 @@ static int c_show(struct seq_file *m, vo { int i, j; u32 cpuid; @@ -21,7 +19,7 @@ index 0bfd66c7ada0..44cacf03b05d 100644 for_each_online_cpu(i) { /* -@@ -1319,6 +1321,14 @@ static int c_show(struct seq_file *m, void *v) +@@ -1319,6 +1321,14 @@ static int c_show(struct seq_file *m, vo seq_printf(m, "Revision\t: %04x\n", system_rev); seq_printf(m, "Serial\t\t: %s\n", system_serial); @@ -36,6 +34,3 @@ index 0bfd66c7ada0..44cacf03b05d 100644 return 0; } --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0123-arch-arm64-Add-Revision-Serial-Model-to-cpuinfo.patch b/target/linux/bcm27xx/patches-6.18/0123-arch-arm64-Add-Revision-Serial-Model-to-cpuinfo.patch index 0aad9c7367a..505f4f8d725 100644 --- a/target/linux/bcm27xx/patches-6.18/0123-arch-arm64-Add-Revision-Serial-Model-to-cpuinfo.patch +++ b/target/linux/bcm27xx/patches-6.18/0123-arch-arm64-Add-Revision-Serial-Model-to-cpuinfo.patch @@ -8,8 +8,6 @@ Signed-off-by: Phil Elwell arch/arm64/kernel/cpuinfo.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) -diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c -index c44e6d94f5de..cd19c2b8353a 100644 --- a/arch/arm64/kernel/cpuinfo.c +++ b/arch/arm64/kernel/cpuinfo.c @@ -17,6 +17,8 @@ @@ -21,7 +19,7 @@ index c44e6d94f5de..cd19c2b8353a 100644 #include #include #include -@@ -272,6 +274,31 @@ static int c_show(struct seq_file *m, void *v) +@@ -272,6 +274,31 @@ static int c_show(struct seq_file *m, vo seq_printf(m, "CPU part\t: 0x%03x\n", MIDR_PARTNUM(midr)); seq_printf(m, "CPU revision\t: %d\n\n", MIDR_REVISION(midr)); @@ -53,6 +51,3 @@ index c44e6d94f5de..cd19c2b8353a 100644 return 0; } --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0124-media-i2c-imx477-Support-for-the-Sony-IMX477-sensor.patch b/target/linux/bcm27xx/patches-6.18/0124-media-i2c-imx477-Support-for-the-Sony-IMX477-sensor.patch index db9a6861037..5a6b227a444 100644 --- a/target/linux/bcm27xx/patches-6.18/0124-media-i2c-imx477-Support-for-the-Sony-IMX477-sensor.patch +++ b/target/linux/bcm27xx/patches-6.18/0124-media-i2c-imx477-Support-for-the-Sony-IMX477-sensor.patch @@ -494,9 +494,6 @@ Signed-off-by: Naushir Patuck create mode 100644 Documentation/devicetree/bindings/media/i2c/imx477.yaml create mode 100644 drivers/media/i2c/imx477.c -diff --git a/Documentation/devicetree/bindings/media/i2c/imx477.yaml b/Documentation/devicetree/bindings/media/i2c/imx477.yaml -new file mode 100644 -index 000000000000..0994e13e67f6 --- /dev/null +++ b/Documentation/devicetree/bindings/media/i2c/imx477.yaml @@ -0,0 +1,113 @@ @@ -613,11 +610,9 @@ index 000000000000..0994e13e67f6 + }; + +... -diff --git a/MAINTAINERS b/MAINTAINERS -index e8f06145fb54..db9e382bc3d1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -24015,6 +24015,14 @@ T: git git://linuxtv.org/media.git +@@ -24024,6 +24024,14 @@ T: git git://linuxtv.org/media.git F: Documentation/devicetree/bindings/media/i2c/sony,imx415.yaml F: drivers/media/i2c/imx415.c @@ -632,8 +627,6 @@ index e8f06145fb54..db9e382bc3d1 100644 SONY MEMORYSTICK SUBSYSTEM M: Maxim Levitsky M: Alex Dubov -diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig -index cdd7ba5da0d5..75a758c65859 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -277,6 +277,20 @@ config VIDEO_IMX415 @@ -657,8 +650,6 @@ index cdd7ba5da0d5..75a758c65859 100644 config VIDEO_MAX9271_LIB tristate -diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile -index 57cdd8dc96f6..a5f7bdca5536 100644 --- a/drivers/media/i2c/Makefile +++ b/drivers/media/i2c/Makefile @@ -60,6 +60,7 @@ obj-$(CONFIG_VIDEO_IMX335) += imx335.o @@ -669,9 +660,6 @@ index 57cdd8dc96f6..a5f7bdca5536 100644 obj-$(CONFIG_VIDEO_IR_I2C) += ir-kbd-i2c.o obj-$(CONFIG_VIDEO_ISL7998X) += isl7998x.o obj-$(CONFIG_VIDEO_KS0127) += ks0127.o -diff --git a/drivers/media/i2c/imx477.c b/drivers/media/i2c/imx477.c -new file mode 100644 -index 000000000000..fac4090d27a1 --- /dev/null +++ b/drivers/media/i2c/imx477.c @@ -0,0 +1,2279 @@ @@ -2954,6 +2942,3 @@ index 000000000000..fac4090d27a1 +MODULE_AUTHOR("Naushir Patuck "); +MODULE_DESCRIPTION("Sony IMX477 sensor driver"); +MODULE_LICENSE("GPL v2"); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0125-drivers-media-imx296-Disable-2x2-binned-mode.patch b/target/linux/bcm27xx/patches-6.18/0125-drivers-media-imx296-Disable-2x2-binned-mode.patch index 7bff85f7f0d..218f9d7bb2e 100644 --- a/target/linux/bcm27xx/patches-6.18/0125-drivers-media-imx296-Disable-2x2-binned-mode.patch +++ b/target/linux/bcm27xx/patches-6.18/0125-drivers-media-imx296-Disable-2x2-binned-mode.patch @@ -11,11 +11,9 @@ Signed-off-by: Naushir Patuck drivers/media/i2c/imx296.c | 34 +++++++--------------------------- 1 file changed, 7 insertions(+), 27 deletions(-) -diff --git a/drivers/media/i2c/imx296.c b/drivers/media/i2c/imx296.c -index 69636db11a2b..4d0f10cb9983 100644 --- a/drivers/media/i2c/imx296.c +++ b/drivers/media/i2c/imx296.c -@@ -663,7 +663,11 @@ static int imx296_enum_frame_size(struct v4l2_subdev *sd, +@@ -663,7 +663,11 @@ static int imx296_enum_frame_size(struct format = v4l2_subdev_state_get_format(state, fse->pad); @@ -28,7 +26,7 @@ index 69636db11a2b..4d0f10cb9983 100644 return -EINVAL; fse->min_width = IMX296_PIXEL_ARRAY_WIDTH / (fse->index + 1); -@@ -685,32 +689,8 @@ static int imx296_set_format(struct v4l2_subdev *sd, +@@ -685,32 +689,8 @@ static int imx296_set_format(struct v4l2 crop = v4l2_subdev_state_get_crop(state, fmt->pad); format = v4l2_subdev_state_get_format(state, fmt->pad); @@ -63,6 +61,3 @@ index 69636db11a2b..4d0f10cb9983 100644 format->code = sensor->mono ? MEDIA_BUS_FMT_Y10_1X10 : MEDIA_BUS_FMT_SBGGR10_1X10; --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0126-drivers-media-imx296-Updated-imx296-driver-for-exter.patch b/target/linux/bcm27xx/patches-6.18/0126-drivers-media-imx296-Updated-imx296-driver-for-exter.patch index 23ff6e7ebc6..9c7e7225b9b 100644 --- a/target/linux/bcm27xx/patches-6.18/0126-drivers-media-imx296-Updated-imx296-driver-for-exter.patch +++ b/target/linux/bcm27xx/patches-6.18/0126-drivers-media-imx296-Updated-imx296-driver-for-exter.patch @@ -12,8 +12,6 @@ Signed-off-by: Ben Benson drivers/media/i2c/imx296.c | 10 ++++++++++ 1 file changed, 10 insertions(+) -diff --git a/drivers/media/i2c/imx296.c b/drivers/media/i2c/imx296.c -index 4d0f10cb9983..43f6c2e8bf4a 100644 --- a/drivers/media/i2c/imx296.c +++ b/drivers/media/i2c/imx296.c @@ -20,6 +20,10 @@ @@ -27,7 +25,7 @@ index 4d0f10cb9983..43f6c2e8bf4a 100644 #define IMX296_PIXEL_ARRAY_WIDTH 1456 #define IMX296_PIXEL_ARRAY_HEIGHT 1088 -@@ -578,6 +582,12 @@ static int imx296_stream_on(struct imx296 *sensor) +@@ -578,6 +582,12 @@ static int imx296_stream_on(struct imx29 imx296_write(sensor, IMX296_CTRL00, 0, &ret); usleep_range(2000, 5000); @@ -40,6 +38,3 @@ index 4d0f10cb9983..43f6c2e8bf4a 100644 imx296_write(sensor, IMX296_CTRL0A, 0, &ret); return ret; --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0127-drivers-media-i2c-imx296-Configure-tigger_mode-every.patch b/target/linux/bcm27xx/patches-6.18/0127-drivers-media-i2c-imx296-Configure-tigger_mode-every.patch index 40417c7d6d1..c1f239666e5 100644 --- a/target/linux/bcm27xx/patches-6.18/0127-drivers-media-i2c-imx296-Configure-tigger_mode-every.patch +++ b/target/linux/bcm27xx/patches-6.18/0127-drivers-media-i2c-imx296-Configure-tigger_mode-every.patch @@ -13,11 +13,9 @@ Signed-off-by: Nick Hollinghurst drivers/media/i2c/imx296.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) -diff --git a/drivers/media/i2c/imx296.c b/drivers/media/i2c/imx296.c -index 43f6c2e8bf4a..75cb1ef70c3a 100644 --- a/drivers/media/i2c/imx296.c +++ b/drivers/media/i2c/imx296.c -@@ -583,10 +583,11 @@ static int imx296_stream_on(struct imx296 *sensor) +@@ -583,10 +583,11 @@ static int imx296_stream_on(struct imx29 imx296_write(sensor, IMX296_CTRL00, 0, &ret); usleep_range(2000, 5000); @@ -33,6 +31,3 @@ index 43f6c2e8bf4a..75cb1ef70c3a 100644 imx296_write(sensor, IMX296_CTRL0A, 0, &ret); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0128-media-i2c-imx296-Updated-register-setting-to-fix-Fas.patch b/target/linux/bcm27xx/patches-6.18/0128-media-i2c-imx296-Updated-register-setting-to-fix-Fas.patch index 2b76b20b2db..88d9d3e6a44 100644 --- a/target/linux/bcm27xx/patches-6.18/0128-media-i2c-imx296-Updated-register-setting-to-fix-Fas.patch +++ b/target/linux/bcm27xx/patches-6.18/0128-media-i2c-imx296-Updated-register-setting-to-fix-Fas.patch @@ -12,8 +12,6 @@ Signed-off-by: Nick Hollinghurst drivers/media/i2c/imx296.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/media/i2c/imx296.c b/drivers/media/i2c/imx296.c -index 75cb1ef70c3a..add2a36e20aa 100644 --- a/drivers/media/i2c/imx296.c +++ b/drivers/media/i2c/imx296.c @@ -472,7 +472,7 @@ static const struct { @@ -25,6 +23,3 @@ index 75cb1ef70c3a..add2a36e20aa 100644 { IMX296_REG_8BIT(0x30df), 0x00 }, { IMX296_REG_8BIT(0x3165), 0x00 }, { IMX296_REG_8BIT(0x3169), 0x10 }, --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0129-media-i2c-imx296-Get-sensor-crop-working.patch b/target/linux/bcm27xx/patches-6.18/0129-media-i2c-imx296-Get-sensor-crop-working.patch index 4c4e3d4248e..c7357241dd9 100644 --- a/target/linux/bcm27xx/patches-6.18/0129-media-i2c-imx296-Get-sensor-crop-working.patch +++ b/target/linux/bcm27xx/patches-6.18/0129-media-i2c-imx296-Get-sensor-crop-working.patch @@ -11,11 +11,9 @@ Signed-off-by: Naushir Patuck drivers/media/i2c/imx296.c | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/drivers/media/i2c/imx296.c b/drivers/media/i2c/imx296.c -index add2a36e20aa..917d0c250832 100644 --- a/drivers/media/i2c/imx296.c +++ b/drivers/media/i2c/imx296.c -@@ -175,6 +175,7 @@ MODULE_PARM_DESC(trigger_mode, "Set trigger mode: 0=default, 1=XTRIG"); +@@ -175,6 +175,7 @@ MODULE_PARM_DESC(trigger_mode, "Set trig #define IMX296_CKREQSEL IMX296_REG_8BIT(0x4101) #define IMX296_CKREQSEL_HS BIT(2) #define IMX296_GTTABLENUM IMX296_REG_8BIT(0x4114) @@ -23,7 +21,7 @@ index add2a36e20aa..917d0c250832 100644 #define IMX296_CTRL418C IMX296_REG_8BIT(0x418c) struct imx296_clk_params { -@@ -530,8 +531,11 @@ static int imx296_setup(struct imx296 *sensor, struct v4l2_subdev_state *state) +@@ -530,8 +531,11 @@ static int imx296_setup(struct imx296 *s imx296_write(sensor, IMX296_FID0_ROIPV1, crop->top, &ret); imx296_write(sensor, IMX296_FID0_ROIWH1, crop->width, &ret); imx296_write(sensor, IMX296_FID0_ROIWV1, crop->height, &ret); @@ -35,6 +33,3 @@ index add2a36e20aa..917d0c250832 100644 } imx296_write(sensor, IMX296_CTRL0D, --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0130-media-i2c-imx296-Add-helper-for-hblank-control.patch b/target/linux/bcm27xx/patches-6.18/0130-media-i2c-imx296-Add-helper-for-hblank-control.patch index 195c5d24a25..ec2181e1d19 100644 --- a/target/linux/bcm27xx/patches-6.18/0130-media-i2c-imx296-Add-helper-for-hblank-control.patch +++ b/target/linux/bcm27xx/patches-6.18/0130-media-i2c-imx296-Add-helper-for-hblank-control.patch @@ -12,11 +12,9 @@ Signed-off-by: Naushir Patuck drivers/media/i2c/imx296.c | 44 ++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 14 deletions(-) -diff --git a/drivers/media/i2c/imx296.c b/drivers/media/i2c/imx296.c -index 917d0c250832..abbd5a36a01b 100644 --- a/drivers/media/i2c/imx296.c +++ b/drivers/media/i2c/imx296.c -@@ -388,10 +388,36 @@ static const struct v4l2_ctrl_ops imx296_ctrl_ops = { +@@ -388,10 +388,36 @@ static const struct v4l2_ctrl_ops imx296 .s_ctrl = imx296_s_ctrl, }; @@ -54,7 +52,7 @@ index 917d0c250832..abbd5a36a01b 100644 int ret; ret = v4l2_fwnode_device_parse(sensor->dev, &props); -@@ -406,19 +432,7 @@ static int imx296_ctrls_init(struct imx296 *sensor) +@@ -406,19 +432,7 @@ static int imx296_ctrls_init(struct imx2 V4L2_CID_ANALOGUE_GAIN, IMX296_GAIN_MIN, IMX296_GAIN_MAX, 1, IMX296_GAIN_MIN); @@ -75,7 +73,7 @@ index 917d0c250832..abbd5a36a01b 100644 sensor->vblank = v4l2_ctrl_new_std(&sensor->ctrls, &imx296_ctrl_ops, V4L2_CID_VBLANK, 30, -@@ -707,6 +721,8 @@ static int imx296_set_format(struct v4l2_subdev *sd, +@@ -707,6 +721,8 @@ static int imx296_set_format(struct v4l2 format->width = crop->width; format->height = crop->height; @@ -84,6 +82,3 @@ index 917d0c250832..abbd5a36a01b 100644 format->code = sensor->mono ? MEDIA_BUS_FMT_Y10_1X10 : MEDIA_BUS_FMT_SBGGR10_1X10; format->field = V4L2_FIELD_NONE; --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0131-media-i2c-imx296-Set-a-1-frame-gain-delay.patch b/target/linux/bcm27xx/patches-6.18/0131-media-i2c-imx296-Set-a-1-frame-gain-delay.patch index aeac209b42c..76421fb8d9a 100644 --- a/target/linux/bcm27xx/patches-6.18/0131-media-i2c-imx296-Set-a-1-frame-gain-delay.patch +++ b/target/linux/bcm27xx/patches-6.18/0131-media-i2c-imx296-Set-a-1-frame-gain-delay.patch @@ -12,11 +12,9 @@ Signed-off-by: Naushir Patuck drivers/media/i2c/imx296.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/media/i2c/imx296.c b/drivers/media/i2c/imx296.c -index abbd5a36a01b..bdda343fa61a 100644 --- a/drivers/media/i2c/imx296.c +++ b/drivers/media/i2c/imx296.c -@@ -588,7 +588,7 @@ static int imx296_setup(struct imx296 *sensor, struct v4l2_subdev_state *state) +@@ -588,7 +588,7 @@ static int imx296_setup(struct imx296 *s imx296_write(sensor, IMX296_CTRL418C, sensor->clk_params->ctrl418c, &ret); @@ -25,6 +23,3 @@ index abbd5a36a01b..bdda343fa61a 100644 imx296_write(sensor, IMX296_BLKLEVEL, 0x03c, &ret); return ret; --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0132-media-i2c-imx296-Add-horizontal-vertical-flip-suppor.patch b/target/linux/bcm27xx/patches-6.18/0132-media-i2c-imx296-Add-horizontal-vertical-flip-suppor.patch index 6fc9e0f6f48..7eb716eb2e4 100644 --- a/target/linux/bcm27xx/patches-6.18/0132-media-i2c-imx296-Add-horizontal-vertical-flip-suppor.patch +++ b/target/linux/bcm27xx/patches-6.18/0132-media-i2c-imx296-Add-horizontal-vertical-flip-suppor.patch @@ -18,8 +18,6 @@ Signed-off-by: Naushir Patuck drivers/media/i2c/imx296.c | 65 +++++++++++++++++++++++++++++++++++--- 1 file changed, 60 insertions(+), 5 deletions(-) -diff --git a/drivers/media/i2c/imx296.c b/drivers/media/i2c/imx296.c -index bdda343fa61a..4330b7015c5c 100644 --- a/drivers/media/i2c/imx296.c +++ b/drivers/media/i2c/imx296.c @@ -212,6 +212,8 @@ struct imx296 { @@ -31,7 +29,7 @@ index bdda343fa61a..4330b7015c5c 100644 }; static inline struct imx296 *to_imx296(struct v4l2_subdev *sd) -@@ -253,6 +255,36 @@ static int imx296_write(struct imx296 *sensor, u32 addr, u32 value, int *err) +@@ -253,6 +255,36 @@ static int imx296_write(struct imx296 *s return ret; } @@ -68,7 +66,7 @@ index bdda343fa61a..4330b7015c5c 100644 static int imx296_power_on(struct imx296 *sensor) { int ret; -@@ -347,6 +379,13 @@ static int imx296_s_ctrl(struct v4l2_ctrl *ctrl) +@@ -347,6 +379,13 @@ static int imx296_s_ctrl(struct v4l2_ctr &ret); break; @@ -82,7 +80,7 @@ index bdda343fa61a..4330b7015c5c 100644 case V4L2_CID_TEST_PATTERN: if (ctrl->val) { imx296_write(sensor, IMX296_PGHPOS, 8, &ret); -@@ -432,6 +471,16 @@ static int imx296_ctrls_init(struct imx296 *sensor) +@@ -432,6 +471,16 @@ static int imx296_ctrls_init(struct imx2 V4L2_CID_ANALOGUE_GAIN, IMX296_GAIN_MIN, IMX296_GAIN_MAX, 1, IMX296_GAIN_MIN); @@ -99,7 +97,7 @@ index bdda343fa61a..4330b7015c5c 100644 imx296_setup_hblank(sensor, IMX296_PIXEL_ARRAY_WIDTH); sensor->vblank = v4l2_ctrl_new_std(&sensor->ctrls, &imx296_ctrl_ops, -@@ -609,6 +658,10 @@ static int imx296_stream_on(struct imx296 *sensor) +@@ -609,6 +658,10 @@ static int imx296_stream_on(struct imx29 imx296_write(sensor, IMX296_CTRL0A, 0, &ret); @@ -110,7 +108,7 @@ index bdda343fa61a..4330b7015c5c 100644 return ret; } -@@ -619,6 +672,9 @@ static int imx296_stream_off(struct imx296 *sensor) +@@ -619,6 +672,9 @@ static int imx296_stream_off(struct imx2 imx296_write(sensor, IMX296_CTRL0A, IMX296_CTRL0A_XMSTA, &ret); imx296_write(sensor, IMX296_CTRL00, IMX296_CTRL00_STANDBY, &ret); @@ -120,7 +118,7 @@ index bdda343fa61a..4330b7015c5c 100644 return ret; } -@@ -678,8 +734,7 @@ static int imx296_enum_mbus_code(struct v4l2_subdev *sd, +@@ -678,8 +734,7 @@ static int imx296_enum_mbus_code(struct if (code->index != 0) return -EINVAL; @@ -130,7 +128,7 @@ index bdda343fa61a..4330b7015c5c 100644 return 0; } -@@ -689,6 +744,7 @@ static int imx296_enum_frame_size(struct v4l2_subdev *sd, +@@ -689,6 +744,7 @@ static int imx296_enum_frame_size(struct struct v4l2_subdev_frame_size_enum *fse) { const struct v4l2_mbus_framefmt *format; @@ -138,7 +136,7 @@ index bdda343fa61a..4330b7015c5c 100644 format = v4l2_subdev_state_get_format(state, fse->pad); -@@ -696,7 +752,7 @@ static int imx296_enum_frame_size(struct v4l2_subdev *sd, +@@ -696,7 +752,7 @@ static int imx296_enum_frame_size(struct * Binning does not seem to work on either mono or colour sensor * variants. Disable enumerating the binned frame size for now. */ @@ -147,7 +145,7 @@ index bdda343fa61a..4330b7015c5c 100644 return -EINVAL; fse->min_width = IMX296_PIXEL_ARRAY_WIDTH / (fse->index + 1); -@@ -723,8 +779,7 @@ static int imx296_set_format(struct v4l2_subdev *sd, +@@ -723,8 +779,7 @@ static int imx296_set_format(struct v4l2 imx296_setup_hblank(sensor, format->width); @@ -157,6 +155,3 @@ index bdda343fa61a..4330b7015c5c 100644 format->field = V4L2_FIELD_NONE; format->colorspace = V4L2_COLORSPACE_RAW; format->ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT; --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0133-media-i2c-imx296-Adjust-cropping-limits.patch b/target/linux/bcm27xx/patches-6.18/0133-media-i2c-imx296-Adjust-cropping-limits.patch index 207c73faeac..1d1ac85651b 100644 --- a/target/linux/bcm27xx/patches-6.18/0133-media-i2c-imx296-Adjust-cropping-limits.patch +++ b/target/linux/bcm27xx/patches-6.18/0133-media-i2c-imx296-Adjust-cropping-limits.patch @@ -12,11 +12,9 @@ Signed-off-by: Naushir Patuck drivers/media/i2c/imx296.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/drivers/media/i2c/imx296.c b/drivers/media/i2c/imx296.c -index 4330b7015c5c..0c2b45fe1dfe 100644 --- a/drivers/media/i2c/imx296.c +++ b/drivers/media/i2c/imx296.c -@@ -154,9 +154,9 @@ MODULE_PARM_DESC(trigger_mode, "Set trigger mode: 0=default, 1=XTRIG"); +@@ -154,9 +154,9 @@ MODULE_PARM_DESC(trigger_mode, "Set trig #define IMX296_FID0_ROIPH1 IMX296_REG_16BIT(0x3310) #define IMX296_FID0_ROIPV1 IMX296_REG_16BIT(0x3312) #define IMX296_FID0_ROIWH1 IMX296_REG_16BIT(0x3314) @@ -28,6 +26,3 @@ index 4330b7015c5c..0c2b45fe1dfe 100644 #define IMX296_CM_HSST_STARTTMG IMX296_REG_16BIT(0x4018) #define IMX296_CM_HSST_ENDTMG IMX296_REG_16BIT(0x401a) --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0134-media-i2c-imx296-Add-OF-option-for-vsync-sink-for-XT.patch b/target/linux/bcm27xx/patches-6.18/0134-media-i2c-imx296-Add-OF-option-for-vsync-sink-for-XT.patch index 072d35ac057..181a2c84d87 100644 --- a/target/linux/bcm27xx/patches-6.18/0134-media-i2c-imx296-Add-OF-option-for-vsync-sink-for-XT.patch +++ b/target/linux/bcm27xx/patches-6.18/0134-media-i2c-imx296-Add-OF-option-for-vsync-sink-for-XT.patch @@ -11,8 +11,6 @@ Signed-off-by: Dave Stevenson drivers/media/i2c/imx296.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) -diff --git a/drivers/media/i2c/imx296.c b/drivers/media/i2c/imx296.c -index 0c2b45fe1dfe..3ced3af3897f 100644 --- a/drivers/media/i2c/imx296.c +++ b/drivers/media/i2c/imx296.c @@ -205,6 +205,7 @@ struct imx296 { @@ -23,7 +21,7 @@ index 0c2b45fe1dfe..3ced3af3897f 100644 struct v4l2_subdev subdev; struct media_pad pad; -@@ -645,16 +646,17 @@ static int imx296_setup(struct imx296 *sensor, struct v4l2_subdev_state *state) +@@ -645,16 +646,17 @@ static int imx296_setup(struct imx296 *s static int imx296_stream_on(struct imx296 *sensor) { @@ -44,7 +42,7 @@ index 0c2b45fe1dfe..3ced3af3897f 100644 imx296_write(sensor, IMX296_CTRL0A, 0, &ret); -@@ -1078,6 +1080,7 @@ static int imx296_probe(struct i2c_client *client) +@@ -1078,6 +1080,7 @@ static int imx296_probe(struct i2c_clien unsigned long clk_rate; struct imx296 *sensor; unsigned int i; @@ -52,7 +50,7 @@ index 0c2b45fe1dfe..3ced3af3897f 100644 int ret; if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) { -@@ -1144,6 +1147,10 @@ static int imx296_probe(struct i2c_client *client) +@@ -1144,6 +1147,10 @@ static int imx296_probe(struct i2c_clien if (ret < 0) goto err_power; @@ -63,6 +61,3 @@ index 0c2b45fe1dfe..3ced3af3897f 100644 /* Initialize the V4L2 subdev. */ ret = imx296_subdev_init(sensor); if (ret < 0) --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0135-media-i2c-imx519-Support-for-the-Sony-IMX519-sensor.patch b/target/linux/bcm27xx/patches-6.18/0135-media-i2c-imx519-Support-for-the-Sony-IMX519-sensor.patch index caec700892a..fb51e1d4a40 100644 --- a/target/linux/bcm27xx/patches-6.18/0135-media-i2c-imx519-Support-for-the-Sony-IMX519-sensor.patch +++ b/target/linux/bcm27xx/patches-6.18/0135-media-i2c-imx519-Support-for-the-Sony-IMX519-sensor.patch @@ -75,9 +75,6 @@ media: i2c: imx519: Squash fixes create mode 100644 Documentation/devicetree/bindings/media/i2c/imx519.yaml create mode 100644 drivers/media/i2c/imx519.c -diff --git a/Documentation/devicetree/bindings/media/i2c/imx519.yaml b/Documentation/devicetree/bindings/media/i2c/imx519.yaml -new file mode 100644 -index 000000000000..717230a21764 --- /dev/null +++ b/Documentation/devicetree/bindings/media/i2c/imx519.yaml @@ -0,0 +1,113 @@ @@ -194,11 +191,9 @@ index 000000000000..717230a21764 + }; + +... -diff --git a/MAINTAINERS b/MAINTAINERS -index db9e382bc3d1..5ca7658d8382 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -24023,6 +24023,14 @@ T: git git://linuxtv.org/media_tree.git +@@ -24032,6 +24032,14 @@ T: git git://linuxtv.org/media_tree.git F: Documentation/devicetree/bindings/media/i2c/imx477.yaml F: drivers/media/i2c/imx477.c @@ -213,8 +208,6 @@ index db9e382bc3d1..5ca7658d8382 100644 SONY MEMORYSTICK SUBSYSTEM M: Maxim Levitsky M: Alex Dubov -diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig -index 75a758c65859..ddb0f43580c2 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -291,6 +291,17 @@ config VIDEO_IMX477 @@ -235,8 +228,6 @@ index 75a758c65859..ddb0f43580c2 100644 config VIDEO_MAX9271_LIB tristate -diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile -index a5f7bdca5536..ce4ac706f0b7 100644 --- a/drivers/media/i2c/Makefile +++ b/drivers/media/i2c/Makefile @@ -61,6 +61,7 @@ obj-$(CONFIG_VIDEO_IMX355) += imx355.o @@ -247,9 +238,6 @@ index a5f7bdca5536..ce4ac706f0b7 100644 obj-$(CONFIG_VIDEO_IR_I2C) += ir-kbd-i2c.o obj-$(CONFIG_VIDEO_ISL7998X) += isl7998x.o obj-$(CONFIG_VIDEO_KS0127) += ks0127.o -diff --git a/drivers/media/i2c/imx519.c b/drivers/media/i2c/imx519.c -new file mode 100644 -index 000000000000..5fe002ec3b26 --- /dev/null +++ b/drivers/media/i2c/imx519.c @@ -0,0 +1,2146 @@ @@ -2399,6 +2387,3 @@ index 000000000000..5fe002ec3b26 +MODULE_AUTHOR("Lee Jackson "); +MODULE_DESCRIPTION("Sony IMX519 sensor driver"); +MODULE_LICENSE("GPL v2"); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0136-Documentation-devicetree-Add-documentation-for-imx37.patch b/target/linux/bcm27xx/patches-6.18/0136-Documentation-devicetree-Add-documentation-for-imx37.patch index 064621c317b..f1a46f40bd3 100644 --- a/target/linux/bcm27xx/patches-6.18/0136-Documentation-devicetree-Add-documentation-for-imx37.patch +++ b/target/linux/bcm27xx/patches-6.18/0136-Documentation-devicetree-Add-documentation-for-imx37.patch @@ -14,9 +14,6 @@ Signed-off-by: David Plowman 2 files changed, 114 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/i2c/imx378.yaml -diff --git a/Documentation/devicetree/bindings/media/i2c/imx378.yaml b/Documentation/devicetree/bindings/media/i2c/imx378.yaml -new file mode 100644 -index 000000000000..f832b4bfab93 --- /dev/null +++ b/Documentation/devicetree/bindings/media/i2c/imx378.yaml @@ -0,0 +1,113 @@ @@ -133,11 +130,9 @@ index 000000000000..f832b4bfab93 + }; + +... -diff --git a/MAINTAINERS b/MAINTAINERS -index 5ca7658d8382..291a8a6710a1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -24020,6 +24020,7 @@ M: Raspberry Pi Kernel Maintenance +@@ -24029,6 +24029,7 @@ M: Raspberry Pi Kernel Maintenance include/uapi/linux/v4l2-controls.h | 1 + 1 file changed, 1 insertion(+) -diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h -index 2d30107e047e..3ba7408ee7aa 100644 --- a/include/uapi/linux/v4l2-controls.h +++ b/include/uapi/linux/v4l2-controls.h @@ -1031,6 +1031,7 @@ enum v4l2_auto_n_preset_white_balance { @@ -23,6 +21,3 @@ index 2d30107e047e..3ba7408ee7aa 100644 }; #define V4L2_CID_WIDE_DYNAMIC_RANGE (V4L2_CID_CAMERA_CLASS_BASE+21) --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0138-staging-bcm2835-camera-Add-greyworld-AWB-mode.patch b/target/linux/bcm27xx/patches-6.18/0138-staging-bcm2835-camera-Add-greyworld-AWB-mode.patch index 0cf6e018eb6..5a87fd04478 100644 --- a/target/linux/bcm27xx/patches-6.18/0138-staging-bcm2835-camera-Add-greyworld-AWB-mode.patch +++ b/target/linux/bcm27xx/patches-6.18/0138-staging-bcm2835-camera-Add-greyworld-AWB-mode.patch @@ -12,11 +12,9 @@ Signed-off-by: Dave Stevenson .../staging/vc04_services/vchiq-mmal/mmal-parameters.h | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) -diff --git a/drivers/staging/vc04_services/bcm2835-camera/controls.c b/drivers/staging/vc04_services/bcm2835-camera/controls.c -index e670226f1edf..d800d54d8042 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/controls.c +++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c -@@ -468,6 +468,10 @@ static int ctrl_set_awb_mode(struct bcm2835_mmal_dev *dev, +@@ -468,6 +468,10 @@ static int ctrl_set_awb_mode(struct bcm2 case V4L2_WHITE_BALANCE_SHADE: u32_value = MMAL_PARAM_AWBMODE_SHADE; break; @@ -27,7 +25,7 @@ index e670226f1edf..d800d54d8042 100644 } return vchiq_mmal_port_parameter_set(dev->instance, control, -@@ -1044,8 +1048,8 @@ static const struct bcm2835_mmal_v4l2_ctrl v4l2_ctrls[V4L2_CTRL_COUNT] = { +@@ -1044,8 +1048,8 @@ static const struct bcm2835_mmal_v4l2_ct { .id = V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE, .type = MMAL_CONTROL_TYPE_STD_MENU, @@ -38,8 +36,6 @@ index e670226f1edf..d800d54d8042 100644 .def = V4L2_WHITE_BALANCE_AUTO, .step = 0, .imenu = NULL, -diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h -index 33f4179d7712..045eba62e9de 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h @@ -310,6 +310,7 @@ enum mmal_parameter_awbmode { @@ -50,6 +46,3 @@ index 33f4179d7712..045eba62e9de 100644 }; enum mmal_parameter_imagefx { --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0139-media-v4l2-Add-Greyworld-AWB-control-name.patch b/target/linux/bcm27xx/patches-6.18/0139-media-v4l2-Add-Greyworld-AWB-control-name.patch index 5135a93eb72..284ea02bc1c 100644 --- a/target/linux/bcm27xx/patches-6.18/0139-media-v4l2-Add-Greyworld-AWB-control-name.patch +++ b/target/linux/bcm27xx/patches-6.18/0139-media-v4l2-Add-Greyworld-AWB-control-name.patch @@ -12,11 +12,9 @@ Signed-off-by: John Cox drivers/media/v4l2-core/v4l2-ctrls-defs.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/drivers/media/v4l2-core/v4l2-ctrls-defs.c b/drivers/media/v4l2-core/v4l2-ctrls-defs.c -index ad41f65374e2..032246aa5428 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls-defs.c +++ b/drivers/media/v4l2-core/v4l2-ctrls-defs.c -@@ -228,6 +228,7 @@ const char * const *v4l2_ctrl_get_menu(u32 id) +@@ -228,6 +228,7 @@ const char * const *v4l2_ctrl_get_menu(u "Flash", "Cloudy", "Shade", @@ -24,6 +22,3 @@ index ad41f65374e2..032246aa5428 100644 NULL, }; static const char * const camera_iso_sensitivity_auto[] = { --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0140-dt-bindings-Add-binding-for-the-Infineon-IRS1125-sen.patch b/target/linux/bcm27xx/patches-6.18/0140-dt-bindings-Add-binding-for-the-Infineon-IRS1125-sen.patch index 8ce8e1f1ee3..e86afb1a66e 100644 --- a/target/linux/bcm27xx/patches-6.18/0140-dt-bindings-Add-binding-for-the-Infineon-IRS1125-sen.patch +++ b/target/linux/bcm27xx/patches-6.18/0140-dt-bindings-Add-binding-for-the-Infineon-IRS1125-sen.patch @@ -12,9 +12,6 @@ Signed-off-by: Markus Proeller 1 file changed, 48 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/i2c/irs1125.txt -diff --git a/Documentation/devicetree/bindings/media/i2c/irs1125.txt b/Documentation/devicetree/bindings/media/i2c/irs1125.txt -new file mode 100644 -index 000000000000..25a48028c957 --- /dev/null +++ b/Documentation/devicetree/bindings/media/i2c/irs1125.txt @@ -0,0 +1,48 @@ @@ -66,6 +63,3 @@ index 000000000000..25a48028c957 + }; + }; + }; --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0141-media-i2c-Add-a-driver-for-the-Infineon-IRS1125-dept.patch b/target/linux/bcm27xx/patches-6.18/0141-media-i2c-Add-a-driver-for-the-Infineon-IRS1125-dept.patch index d1794ba3c4e..fd92c910f03 100644 --- a/target/linux/bcm27xx/patches-6.18/0141-media-i2c-Add-a-driver-for-the-Infineon-IRS1125-dept.patch +++ b/target/linux/bcm27xx/patches-6.18/0141-media-i2c-Add-a-driver-for-the-Infineon-IRS1125-dept.patch @@ -162,8 +162,6 @@ Signed-off-by: Phil Elwell create mode 100644 drivers/media/i2c/irs1125.c create mode 100644 drivers/media/i2c/irs1125.h -diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig -index ddb0f43580c2..391c7089b71a 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -1426,6 +1426,18 @@ config VIDEO_TW9910 @@ -185,8 +183,6 @@ index ddb0f43580c2..391c7089b71a 100644 config VIDEO_VPX3220 tristate "vpx3220a, vpx3216b & vpx3214c video decoders" depends on VIDEO_DEV && I2C -diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile -index ce4ac706f0b7..4c1c76e6f3a9 100644 --- a/drivers/media/i2c/Makefile +++ b/drivers/media/i2c/Makefile @@ -63,6 +63,7 @@ obj-$(CONFIG_VIDEO_IMX415) += imx415.o @@ -197,9 +193,6 @@ index ce4ac706f0b7..4c1c76e6f3a9 100644 obj-$(CONFIG_VIDEO_ISL7998X) += isl7998x.o obj-$(CONFIG_VIDEO_KS0127) += ks0127.o obj-$(CONFIG_VIDEO_LM3560) += lm3560.o -diff --git a/drivers/media/i2c/irs1125.c b/drivers/media/i2c/irs1125.c -new file mode 100644 -index 000000000000..f69b4c5a9827 --- /dev/null +++ b/drivers/media/i2c/irs1125.c @@ -0,0 +1,1197 @@ @@ -1400,9 +1393,6 @@ index 000000000000..f69b4c5a9827 +MODULE_DESCRIPTION("Infineon irs1125 sensor driver"); +MODULE_LICENSE("GPL v2"); + -diff --git a/drivers/media/i2c/irs1125.h b/drivers/media/i2c/irs1125.h -new file mode 100644 -index 000000000000..96d676123d5e --- /dev/null +++ b/drivers/media/i2c/irs1125.h @@ -0,0 +1,95 @@ @@ -1501,6 +1491,3 @@ index 000000000000..96d676123d5e + +#endif /* IRS1125 */ + --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0142-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch b/target/linux/bcm27xx/patches-6.18/0142-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch index c26c23a904b..389a158d056 100644 --- a/target/linux/bcm27xx/patches-6.18/0142-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch +++ b/target/linux/bcm27xx/patches-6.18/0142-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch @@ -11,8 +11,6 @@ Signed-off-by: Dave Stevenson drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c -index 721b15b7e13b..7593cc0ddbe0 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -63,6 +63,7 @@ @@ -23,7 +21,7 @@ index 721b15b7e13b..7593cc0ddbe0 100644 static const struct vchiq_platform_info bcm2835_info = { .cache_line_size = 32, -@@ -1415,6 +1416,7 @@ static int vchiq_probe(struct platform_device *pdev) +@@ -1415,6 +1416,7 @@ static int vchiq_probe(struct platform_d vchiq_debugfs_init(&mgmt->state); @@ -31,7 +29,7 @@ index 721b15b7e13b..7593cc0ddbe0 100644 bcm2835_audio = vchiq_device_register(&pdev->dev, "bcm2835-audio"); bcm2835_camera = vchiq_device_register(&pdev->dev, "bcm2835-camera"); -@@ -1427,6 +1429,7 @@ static void vchiq_remove(struct platform_device *pdev) +@@ -1427,6 +1429,7 @@ static void vchiq_remove(struct platform vchiq_device_unregister(bcm2835_audio); vchiq_device_unregister(bcm2835_camera); @@ -39,6 +37,3 @@ index 721b15b7e13b..7593cc0ddbe0 100644 vchiq_debugfs_deinit(); vchiq_deregister_chrdev(); vchiq_platform_uninit(mgmt); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0143-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch b/target/linux/bcm27xx/patches-6.18/0143-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch index 5a134090c58..0fd20b101e7 100644 --- a/target/linux/bcm27xx/patches-6.18/0143-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch +++ b/target/linux/bcm27xx/patches-6.18/0143-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch @@ -12,8 +12,6 @@ Signed-off-by: Dave Stevenson drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c -index 7593cc0ddbe0..63c0f8f03134 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -63,6 +63,7 @@ @@ -24,7 +22,7 @@ index 7593cc0ddbe0..63c0f8f03134 100644 static struct vchiq_device *vcsm_cma; static const struct vchiq_platform_info bcm2835_info = { -@@ -1417,6 +1418,7 @@ static int vchiq_probe(struct platform_device *pdev) +@@ -1417,6 +1418,7 @@ static int vchiq_probe(struct platform_d vchiq_debugfs_init(&mgmt->state); vcsm_cma = vchiq_device_register(&pdev->dev, "vcsm-cma"); @@ -32,7 +30,7 @@ index 7593cc0ddbe0..63c0f8f03134 100644 bcm2835_audio = vchiq_device_register(&pdev->dev, "bcm2835-audio"); bcm2835_camera = vchiq_device_register(&pdev->dev, "bcm2835-camera"); -@@ -1429,6 +1431,7 @@ static void vchiq_remove(struct platform_device *pdev) +@@ -1429,6 +1431,7 @@ static void vchiq_remove(struct platform vchiq_device_unregister(bcm2835_audio); vchiq_device_unregister(bcm2835_camera); @@ -40,6 +38,3 @@ index 7593cc0ddbe0..63c0f8f03134 100644 vchiq_device_unregister(vcsm_cma); vchiq_debugfs_deinit(); vchiq_deregister_chrdev(); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0144-net-phy-broadcom-Allow-ethernet-LED-mode-to-be-set-v.patch b/target/linux/bcm27xx/patches-6.18/0144-net-phy-broadcom-Allow-ethernet-LED-mode-to-be-set-v.patch index cd5c1ef9201..1e588ec9539 100644 --- a/target/linux/bcm27xx/patches-6.18/0144-net-phy-broadcom-Allow-ethernet-LED-mode-to-be-set-v.patch +++ b/target/linux/bcm27xx/patches-6.18/0144-net-phy-broadcom-Allow-ethernet-LED-mode-to-be-set-v.patch @@ -32,11 +32,9 @@ Signed-off-by: Phil Elwell drivers/net/phy/broadcom.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) -diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c -index cb306f9e80cc..6dd13ad68b56 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c -@@ -458,6 +458,9 @@ static int bcm54811_config_init(struct phy_device *phydev) +@@ -458,6 +458,9 @@ static int bcm54811_config_init(struct p static int bcm54xx_config_init(struct phy_device *phydev) { int reg, err, val; @@ -46,7 +44,7 @@ index cb306f9e80cc..6dd13ad68b56 100644 reg = phy_read(phydev, MII_BCM54XX_ECR); if (reg < 0) -@@ -516,10 +519,10 @@ static int bcm54xx_config_init(struct phy_device *phydev) +@@ -516,10 +519,10 @@ static int bcm54xx_config_init(struct ph bcm54xx_phydsp_config(phydev); @@ -59,7 +57,7 @@ index cb306f9e80cc..6dd13ad68b56 100644 * Don't do this for devices on an SFP module, since some of these * use the LED outputs to control the SFP LOS signal, and changing * these settings will cause LOS to malfunction. -@@ -528,10 +531,15 @@ static int bcm54xx_config_init(struct phy_device *phydev) +@@ -528,10 +531,15 @@ static int bcm54xx_config_init(struct ph val = BCM54XX_SHD_LEDS1_LED1(BCM_LED_SRC_MULTICOLOR1) | BCM54XX_SHD_LEDS1_LED3(BCM_LED_SRC_MULTICOLOR1); bcm_phy_write_shadow(phydev, BCM54XX_SHD_LEDS1, val); @@ -77,6 +75,3 @@ index cb306f9e80cc..6dd13ad68b56 100644 bcm_phy_write_exp(phydev, BCM_EXP_MULTICOLOR, val); } --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0145-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch b/target/linux/bcm27xx/patches-6.18/0145-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch index 01f9ab9726b..2da9863f0e8 100644 --- a/target/linux/bcm27xx/patches-6.18/0145-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch +++ b/target/linux/bcm27xx/patches-6.18/0145-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch @@ -14,11 +14,9 @@ Signed-off-by: Jonathan Bell include/linux/brcmphy.h | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) -diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c -index 6dd13ad68b56..863d9316b3f9 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c -@@ -293,6 +293,7 @@ static void bcm54xx_adjust_rxrefclk(struct phy_device *phydev) +@@ -293,6 +293,7 @@ static void bcm54xx_adjust_rxrefclk(stru phy_id_compare_model(phydev->drv->phy_id, PHY_ID_BCM50610) || phy_id_compare_model(phydev->drv->phy_id, PHY_ID_BCM50610M) || phy_id_compare_model(phydev->drv->phy_id, PHY_ID_BCM54210E) || @@ -26,7 +24,7 @@ index 6dd13ad68b56..863d9316b3f9 100644 phy_id_compare_model(phydev->drv->phy_id, PHY_ID_BCM54810) || phy_id_compare_model(phydev->drv->phy_id, PHY_ID_BCM54811))) return; -@@ -1486,7 +1487,7 @@ static struct phy_driver broadcom_drivers[] = { +@@ -1486,7 +1487,7 @@ static struct phy_driver broadcom_driver .handle_interrupt = bcm_phy_handle_interrupt, .link_change_notify = bcm54xx_link_change_notify, }, { @@ -35,19 +33,19 @@ index 6dd13ad68b56..863d9316b3f9 100644 .name = "Broadcom BCM54210E", /* PHY_GBIT_FEATURES */ .flags = PHY_ALWAYS_CALL_SUSPEND, -@@ -1503,6 +1504,12 @@ static struct phy_driver broadcom_drivers[] = { - .get_wol = bcm54xx_phy_get_wol, +@@ -1504,6 +1505,12 @@ static struct phy_driver broadcom_driver .set_wol = bcm54xx_phy_set_wol, .led_brightness_set = bcm_phy_led_brightness_set, -+}, { + }, { + PHY_ID_MATCH_EXACT(PHY_ID_BCM54213PE), + .name = "Broadcom BCM54213PE", + /* PHY_GBIT_FEATURES */ + .config_init = bcm54xx_config_init, + .config_intr = bcm_phy_config_intr, - }, { ++}, { PHY_ID_MATCH_MODEL(PHY_ID_BCM5461), .name = "Broadcom BCM5461", + /* PHY_GBIT_FEATURES */ @@ -1752,7 +1759,8 @@ module_phy_driver(broadcom_drivers); static const struct mdio_device_id __maybe_unused broadcom_tbl[] = { { PHY_ID_MATCH_MODEL(PHY_ID_BCM5411) }, @@ -58,8 +56,6 @@ index 6dd13ad68b56..863d9316b3f9 100644 { PHY_ID_MATCH_MODEL(PHY_ID_BCM5461) }, { PHY_ID_MATCH_MODEL(PHY_ID_BCM54612E) }, { PHY_ID_MATCH_MODEL(PHY_ID_BCM54616S) }, -diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h -index 115a964f3006..97e6a716740b 100644 --- a/include/linux/brcmphy.h +++ b/include/linux/brcmphy.h @@ -24,6 +24,7 @@ @@ -70,6 +66,3 @@ index 115a964f3006..97e6a716740b 100644 #define PHY_ID_BCM5464 0x002060b0 #define PHY_ID_BCM5461 0x002060c0 #define PHY_ID_BCM54612E 0x03625e60 --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0146-phy-broadcom-Add-bcm54213pe-configuration.patch b/target/linux/bcm27xx/patches-6.18/0146-phy-broadcom-Add-bcm54213pe-configuration.patch index 421928d0ef2..8a5e22bf1c6 100644 --- a/target/linux/bcm27xx/patches-6.18/0146-phy-broadcom-Add-bcm54213pe-configuration.patch +++ b/target/linux/bcm27xx/patches-6.18/0146-phy-broadcom-Add-bcm54213pe-configuration.patch @@ -8,11 +8,9 @@ Signed-off-by: Phil Elwell drivers/net/phy/broadcom.c | 8 ++++++++ 1 file changed, 8 insertions(+) -diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c -index 863d9316b3f9..422e7b8119fb 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c -@@ -123,6 +123,11 @@ static int bcm54210e_config_init(struct phy_device *phydev) +@@ -123,6 +123,11 @@ static int bcm54210e_config_init(struct return 0; } @@ -24,7 +22,7 @@ index 863d9316b3f9..422e7b8119fb 100644 static int bcm54612e_config_init(struct phy_device *phydev) { int reg; -@@ -499,6 +504,9 @@ static int bcm54xx_config_init(struct phy_device *phydev) +@@ -499,6 +504,9 @@ static int bcm54xx_config_init(struct ph case PHY_ID_BCM54612E: err = bcm54612e_config_init(phydev); break; @@ -34,6 +32,3 @@ index 863d9316b3f9..422e7b8119fb 100644 case PHY_ID_BCM54616S: err = bcm54616s_config_init(phydev); break; --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0147-net-phy-broadcom-optionally-enable-link-down-powersa.patch b/target/linux/bcm27xx/patches-6.18/0147-net-phy-broadcom-optionally-enable-link-down-powersa.patch index 82fcb49af6e..5137118ade2 100644 --- a/target/linux/bcm27xx/patches-6.18/0147-net-phy-broadcom-optionally-enable-link-down-powersa.patch +++ b/target/linux/bcm27xx/patches-6.18/0147-net-phy-broadcom-optionally-enable-link-down-powersa.patch @@ -12,11 +12,9 @@ Signed-off-by: Jonathan Bell drivers/net/phy/broadcom.c | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c -index 422e7b8119fb..8e660aae5ba6 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c -@@ -491,6 +491,9 @@ static int bcm54xx_config_init(struct phy_device *phydev) +@@ -491,6 +491,9 @@ static int bcm54xx_config_init(struct ph (phydev->dev_flags & PHY_BRCM_CLEAR_RGMII_MODE)) bcm_phy_write_shadow(phydev, BCM54XX_SHD_RGMII_MODE, 0); @@ -26,6 +24,3 @@ index 422e7b8119fb..8e660aae5ba6 100644 bcm54xx_adjust_rxrefclk(phydev); switch (phydev->drv->phy_id & PHY_ID_MATCH_MODEL_MASK) { --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0148-net-phy-Populate-phy-driver-block-for-BCM54213PE.patch b/target/linux/bcm27xx/patches-6.18/0148-net-phy-Populate-phy-driver-block-for-BCM54213PE.patch index f6ff63309ae..dc0e36d892b 100644 --- a/target/linux/bcm27xx/patches-6.18/0148-net-phy-Populate-phy-driver-block-for-BCM54213PE.patch +++ b/target/linux/bcm27xx/patches-6.18/0148-net-phy-Populate-phy-driver-block-for-BCM54213PE.patch @@ -14,11 +14,9 @@ Signed-off-by: Jonathan Lemon drivers/net/phy/broadcom.c | 6 ++++++ 1 file changed, 6 insertions(+) -diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c -index 8e660aae5ba6..1146098bf54b 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c -@@ -1519,8 +1519,14 @@ static struct phy_driver broadcom_drivers[] = { +@@ -1519,8 +1519,14 @@ static struct phy_driver broadcom_driver PHY_ID_MATCH_EXACT(PHY_ID_BCM54213PE), .name = "Broadcom BCM54213PE", /* PHY_GBIT_FEATURES */ @@ -33,6 +31,3 @@ index 8e660aae5ba6..1146098bf54b 100644 }, { PHY_ID_MATCH_MODEL(PHY_ID_BCM5461), .name = "Broadcom BCM5461", --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0149-net-phy-BCM54210PE-does-not-support-PTP.patch b/target/linux/bcm27xx/patches-6.18/0149-net-phy-BCM54210PE-does-not-support-PTP.patch index 6b990572587..ae915b795af 100644 --- a/target/linux/bcm27xx/patches-6.18/0149-net-phy-BCM54210PE-does-not-support-PTP.patch +++ b/target/linux/bcm27xx/patches-6.18/0149-net-phy-BCM54210PE-does-not-support-PTP.patch @@ -21,11 +21,9 @@ Signed-off-by: Phil Elwell drivers/net/phy/bcm-phy-ptp.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) -diff --git a/drivers/net/phy/bcm-phy-ptp.c b/drivers/net/phy/bcm-phy-ptp.c -index d3501f8487d9..fcb004fcba3d 100644 --- a/drivers/net/phy/bcm-phy-ptp.c +++ b/drivers/net/phy/bcm-phy-ptp.c -@@ -912,6 +912,18 @@ struct bcm_ptp_private *bcm_ptp_probe(struct phy_device *phydev) +@@ -912,6 +912,18 @@ struct bcm_ptp_private *bcm_ptp_probe(st switch (BRCM_PHY_MODEL(phydev)) { case PHY_ID_BCM54210E: break; @@ -44,6 +42,3 @@ index d3501f8487d9..fcb004fcba3d 100644 default: return NULL; } --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0150-net-phy-broadcom-Handle-irqs-on-BCM54213PE.patch b/target/linux/bcm27xx/patches-6.18/0150-net-phy-broadcom-Handle-irqs-on-BCM54213PE.patch index 8124ad26a51..c73ce928eb7 100644 --- a/target/linux/bcm27xx/patches-6.18/0150-net-phy-broadcom-Handle-irqs-on-BCM54213PE.patch +++ b/target/linux/bcm27xx/patches-6.18/0150-net-phy-broadcom-Handle-irqs-on-BCM54213PE.patch @@ -21,11 +21,9 @@ Signed-off-by: Nicolai Buchwitz drivers/net/phy/broadcom.c | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c -index 1146098bf54b..149c30c5b163 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c -@@ -1525,6 +1525,8 @@ static struct phy_driver broadcom_drivers[] = { +@@ -1525,6 +1525,8 @@ static struct phy_driver broadcom_driver .probe = bcm54xx_phy_probe, .config_init = bcm54xx_config_init, .config_intr = bcm_phy_config_intr, @@ -34,6 +32,3 @@ index 1146098bf54b..149c30c5b163 100644 .suspend = bcm54xx_suspend, .resume = bcm54xx_resume, }, { --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0151-net-phy-broadcom-Preserve-LED4-settings.patch b/target/linux/bcm27xx/patches-6.18/0151-net-phy-broadcom-Preserve-LED4-settings.patch index 0c17f44d103..8d4538cc9dd 100644 --- a/target/linux/bcm27xx/patches-6.18/0151-net-phy-broadcom-Preserve-LED4-settings.patch +++ b/target/linux/bcm27xx/patches-6.18/0151-net-phy-broadcom-Preserve-LED4-settings.patch @@ -16,11 +16,9 @@ Signed-off-by: Nicolai Buchwitz drivers/net/phy/broadcom.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) -diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c -index 149c30c5b163..9ca9e78453b7 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c -@@ -544,10 +544,14 @@ static int bcm54xx_config_init(struct phy_device *phydev) +@@ -544,10 +544,14 @@ static int bcm54xx_config_init(struct ph BCM54XX_SHD_LEDS1_LED3(BCM_LED_SRC_MULTICOLOR1); bcm_phy_write_shadow(phydev, BCM54XX_SHD_LEDS1, val); /* BCM54210PE controls two extra LEDs with the next register. @@ -38,6 +36,3 @@ index 149c30c5b163..9ca9e78453b7 100644 val = BCM_LED_MULTICOLOR_IN_PHASE | BCM54XX_SHD_LEDS1_LED1(led_modes[0]) | --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0152-net-phy-broadcom-Remove-conflicting-ECR-global-inter.patch b/target/linux/bcm27xx/patches-6.18/0152-net-phy-broadcom-Remove-conflicting-ECR-global-inter.patch index acdcaa715cd..09dfd3b2993 100644 --- a/target/linux/bcm27xx/patches-6.18/0152-net-phy-broadcom-Remove-conflicting-ECR-global-inter.patch +++ b/target/linux/bcm27xx/patches-6.18/0152-net-phy-broadcom-Remove-conflicting-ECR-global-inter.patch @@ -19,11 +19,9 @@ Signed-off-by: Nicolai Buchwitz drivers/net/phy/broadcom.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) -diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c -index 9ca9e78453b7..dba8a2b0c22e 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c -@@ -472,13 +472,9 @@ static int bcm54xx_config_init(struct phy_device *phydev) +@@ -472,13 +472,9 @@ static int bcm54xx_config_init(struct ph if (reg < 0) return reg; @@ -40,6 +38,3 @@ index 9ca9e78453b7..dba8a2b0c22e 100644 reg = ~(MII_BCM54XX_INT_DUPLEX | MII_BCM54XX_INT_SPEED | MII_BCM54XX_INT_LINK); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0153-net-phy-broadcom-Add-led-swap-property-support.patch b/target/linux/bcm27xx/patches-6.18/0153-net-phy-broadcom-Add-led-swap-property-support.patch index d59f177eb05..2bd7c70a166 100644 --- a/target/linux/bcm27xx/patches-6.18/0153-net-phy-broadcom-Add-led-swap-property-support.patch +++ b/target/linux/bcm27xx/patches-6.18/0153-net-phy-broadcom-Add-led-swap-property-support.patch @@ -12,11 +12,9 @@ Signed-off-by: Phil Elwell drivers/net/phy/broadcom.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c -index dba8a2b0c22e..428ff5a01b08 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c -@@ -536,6 +536,7 @@ static int bcm54xx_config_init(struct phy_device *phydev) +@@ -536,6 +536,7 @@ static int bcm54xx_config_init(struct ph * these settings will cause LOS to malfunction. */ if (!phy_on_sfp(phydev)) { @@ -24,7 +22,7 @@ index dba8a2b0c22e..428ff5a01b08 100644 val = BCM54XX_SHD_LEDS1_LED1(BCM_LED_SRC_MULTICOLOR1) | BCM54XX_SHD_LEDS1_LED3(BCM_LED_SRC_MULTICOLOR1); bcm_phy_write_shadow(phydev, BCM54XX_SHD_LEDS1, val); -@@ -550,8 +551,8 @@ static int bcm54xx_config_init(struct phy_device *phydev) +@@ -550,8 +551,8 @@ static int bcm54xx_config_init(struct ph bcm_phy_write_shadow(phydev, BCM54XX_SHD_LEDS2, reg); val = BCM_LED_MULTICOLOR_IN_PHASE | @@ -35,6 +33,3 @@ index dba8a2b0c22e..428ff5a01b08 100644 bcm_phy_write_exp(phydev, BCM_EXP_MULTICOLOR, val); } --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0154-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch b/target/linux/bcm27xx/patches-6.18/0154-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch index ed9f182b5ec..1268e25de06 100644 --- a/target/linux/bcm27xx/patches-6.18/0154-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch +++ b/target/linux/bcm27xx/patches-6.18/0154-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch @@ -60,8 +60,6 @@ Signed-off-by: Phil Elwell .../interface/vchiq_arm/vchiq_core.h | 4 + 4 files changed, 91 insertions(+), 19 deletions(-) -diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c -index 63c0f8f03134..374a0254da0c 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -19,6 +19,7 @@ @@ -72,7 +70,7 @@ index 63c0f8f03134..374a0254da0c 100644 #include #include #include -@@ -74,6 +75,11 @@ static const struct vchiq_platform_info bcm2836_info = { +@@ -74,6 +75,11 @@ static const struct vchiq_platform_info .cache_line_size = 64, }; @@ -84,7 +82,7 @@ index 63c0f8f03134..374a0254da0c 100644 struct vchiq_arm_state { /* Keepalive-related data */ struct task_struct *ka_thread; -@@ -186,6 +192,7 @@ EXPORT_SYMBOL(vchiq_add_connected_callback); +@@ -186,6 +192,7 @@ EXPORT_SYMBOL(vchiq_add_connected_callba static int vchiq_platform_init(struct platform_device *pdev, struct vchiq_state *state) { struct device *dev = &pdev->dev; @@ -92,7 +90,7 @@ index 63c0f8f03134..374a0254da0c 100644 struct vchiq_drv_mgmt *drv_mgmt = platform_get_drvdata(pdev); struct rpi_firmware *fw = drv_mgmt->fw; struct vchiq_slot_zero *vchiq_slot_zero; -@@ -206,6 +213,24 @@ static int vchiq_platform_init(struct platform_device *pdev, struct vchiq_state +@@ -206,6 +213,24 @@ static int vchiq_platform_init(struct pl drv_mgmt->fragments_size = 2 * drv_mgmt->info->cache_line_size; @@ -117,7 +115,7 @@ index 63c0f8f03134..374a0254da0c 100644 /* Allocate space for the channels in coherent memory */ slot_mem_size = PAGE_ALIGN(TOTAL_SLOTS * VCHIQ_SLOT_SIZE); frag_mem_size = PAGE_ALIGN(drv_mgmt->fragments_size * MAX_FRAGMENTS); -@@ -273,6 +298,8 @@ static int vchiq_platform_init(struct platform_device *pdev, struct vchiq_state +@@ -273,6 +298,8 @@ static int vchiq_platform_init(struct pl return -ENXIO; } @@ -126,7 +124,7 @@ index 63c0f8f03134..374a0254da0c 100644 dev_dbg(&pdev->dev, "arm: vchiq_init - done (slots %p, phys %pad)\n", vchiq_slot_zero, &slot_phys); -@@ -1363,6 +1390,7 @@ void vchiq_platform_conn_state_changed(struct vchiq_state *state, +@@ -1363,6 +1390,7 @@ void vchiq_platform_conn_state_changed(s static const struct of_device_id vchiq_of_match[] = { { .compatible = "brcm,bcm2835-vchiq", .data = &bcm2835_info }, { .compatible = "brcm,bcm2836-vchiq", .data = &bcm2836_info }, @@ -134,8 +132,6 @@ index 63c0f8f03134..374a0254da0c 100644 {}, }; MODULE_DEVICE_TABLE(of, vchiq_of_match); -diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h -index e32b02f99024..60d0c422a464 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h @@ -32,6 +32,7 @@ enum USE_TYPE_E { @@ -146,11 +142,9 @@ index e32b02f99024..60d0c422a464 100644 }; struct vchiq_drv_mgmt { -diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c -index e2cac0898b8f..c0ffbaf2ea98 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c -@@ -192,6 +192,9 @@ static const char *const conn_state_names[] = { +@@ -192,6 +192,9 @@ static const char *const conn_state_name "RESUME_TIMEOUT" }; @@ -177,7 +171,7 @@ index e2cac0898b8f..c0ffbaf2ea98 100644 pagelistinfo->pagelist, pagelistinfo->dma_addr); } -@@ -1638,22 +1641,58 @@ create_pagelist(struct vchiq_instance *instance, struct vchiq_bulk *bulk) +@@ -1638,22 +1641,58 @@ create_pagelist(struct vchiq_instance *i /* Combine adjacent blocks for performance */ k = 0; @@ -252,7 +246,7 @@ index e2cac0898b8f..c0ffbaf2ea98 100644 } /* Partial cache lines (fragments) require special measures */ -@@ -1700,7 +1739,7 @@ free_pagelist(struct vchiq_instance *instance, struct vchiq_pagelist_info *pagel +@@ -1700,7 +1739,7 @@ free_pagelist(struct vchiq_instance *ins * NOTE: dma_unmap_sg must be called before the * cpu can touch any of the data/pages. */ @@ -261,8 +255,6 @@ index e2cac0898b8f..c0ffbaf2ea98 100644 pagelistinfo->num_pages, pagelistinfo->dma_dir); pagelistinfo->scatterlist_mapped = 0; -diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h -index 9b4e766990a4..7f4fef68d415 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h @@ -436,6 +436,10 @@ struct vchiq_pagelist_info { @@ -276,6 +268,3 @@ index 9b4e766990a4..7f4fef68d415 100644 static inline bool vchiq_remote_initialised(const struct vchiq_state *state) { return state->remote && state->remote->initialised; --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0155-staging-vchiq_arm-Usa-a-DMA-pool-for-small-bulks.patch b/target/linux/bcm27xx/patches-6.18/0155-staging-vchiq_arm-Usa-a-DMA-pool-for-small-bulks.patch index 9aee73f7362..8b94a3cd53b 100644 --- a/target/linux/bcm27xx/patches-6.18/0155-staging-vchiq_arm-Usa-a-DMA-pool-for-small-bulks.patch +++ b/target/linux/bcm27xx/patches-6.18/0155-staging-vchiq_arm-Usa-a-DMA-pool-for-small-bulks.patch @@ -20,11 +20,9 @@ Signed-off-by: Oliver Gjoneski .../interface/vchiq_arm/vchiq_core.h | 5 +++++ 3 files changed, 30 insertions(+), 4 deletions(-) -diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c -index 374a0254da0c..2bf64baca2e0 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c -@@ -299,6 +299,13 @@ static int vchiq_platform_init(struct platform_device *pdev, struct vchiq_state +@@ -299,6 +299,13 @@ static int vchiq_platform_init(struct pl } g_dma_dev = dma_dev ?: dev; @@ -38,11 +36,9 @@ index 374a0254da0c..2bf64baca2e0 100644 dev_dbg(&pdev->dev, "arm: vchiq_init - done (slots %p, phys %pad)\n", vchiq_slot_zero, &slot_phys); -diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c -index c0ffbaf2ea98..a9f382430bfb 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c -@@ -194,6 +194,7 @@ static const char *const conn_state_names[] = { +@@ -194,6 +194,7 @@ static const char *const conn_state_name unsigned int g_use_36bit_addrs = 0; struct device *g_dma_dev; @@ -50,7 +46,7 @@ index c0ffbaf2ea98..a9f382430bfb 100644 static void release_message_sync(struct vchiq_state *state, struct vchiq_header *header); -@@ -1469,8 +1470,13 @@ cleanup_pagelistinfo(struct vchiq_instance *instance, struct vchiq_pagelist_info +@@ -1469,8 +1470,13 @@ cleanup_pagelistinfo(struct vchiq_instan if (pagelistinfo->pages_need_release) unpin_user_pages(pagelistinfo->pages, pagelistinfo->num_pages); @@ -66,7 +62,7 @@ index c0ffbaf2ea98..a9f382430bfb 100644 } static inline bool -@@ -1504,6 +1510,7 @@ create_pagelist(struct vchiq_instance *instance, struct vchiq_bulk *bulk) +@@ -1504,6 +1510,7 @@ create_pagelist(struct vchiq_instance *i u32 *addrs; unsigned int num_pages, offset, i, k; int actual_pages; @@ -74,7 +70,7 @@ index c0ffbaf2ea98..a9f382430bfb 100644 size_t pagelist_size; struct scatterlist *scatterlist, *sg; int dma_buffers; -@@ -1539,8 +1546,14 @@ create_pagelist(struct vchiq_instance *instance, struct vchiq_bulk *bulk) +@@ -1539,8 +1546,14 @@ create_pagelist(struct vchiq_instance *i /* Allocate enough storage to hold the page pointers and the page * list */ @@ -91,7 +87,7 @@ index c0ffbaf2ea98..a9f382430bfb 100644 dev_dbg(instance->state->dev, "arm: %p\n", pagelist); -@@ -1561,6 +1574,7 @@ create_pagelist(struct vchiq_instance *instance, struct vchiq_bulk *bulk) +@@ -1561,6 +1574,7 @@ create_pagelist(struct vchiq_instance *i pagelistinfo->pagelist = pagelist; pagelistinfo->pagelist_buffer_size = pagelist_size; pagelistinfo->dma_addr = dma_addr; @@ -99,8 +95,6 @@ index c0ffbaf2ea98..a9f382430bfb 100644 pagelistinfo->dma_dir = (type == PAGELIST_WRITE) ? DMA_TO_DEVICE : DMA_FROM_DEVICE; pagelistinfo->num_pages = num_pages; -diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h -index 7f4fef68d415..50386ccfa6e8 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h @@ -7,6 +7,7 @@ @@ -136,6 +130,3 @@ index 7f4fef68d415..50386ccfa6e8 100644 static inline bool vchiq_remote_initialised(const struct vchiq_state *state) { --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0156-staging-vchiq-Load-bcm2835_isp-driver-from-vchiq.patch b/target/linux/bcm27xx/patches-6.18/0156-staging-vchiq-Load-bcm2835_isp-driver-from-vchiq.patch index 0b8b8aa39b3..6b9fb545568 100644 --- a/target/linux/bcm27xx/patches-6.18/0156-staging-vchiq-Load-bcm2835_isp-driver-from-vchiq.patch +++ b/target/linux/bcm27xx/patches-6.18/0156-staging-vchiq-Load-bcm2835_isp-driver-from-vchiq.patch @@ -11,8 +11,6 @@ Signed-off-by: Naushir Patuck drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c -index 2bf64baca2e0..4dc7ae72922f 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -65,6 +65,7 @@ @@ -23,7 +21,7 @@ index 2bf64baca2e0..4dc7ae72922f 100644 static struct vchiq_device *vcsm_cma; static const struct vchiq_platform_info bcm2835_info = { -@@ -1456,6 +1457,7 @@ static int vchiq_probe(struct platform_device *pdev) +@@ -1456,6 +1457,7 @@ static int vchiq_probe(struct platform_d bcm2835_codec = vchiq_device_register(&pdev->dev, "bcm2835-codec"); bcm2835_audio = vchiq_device_register(&pdev->dev, "bcm2835-audio"); bcm2835_camera = vchiq_device_register(&pdev->dev, "bcm2835-camera"); @@ -31,7 +29,7 @@ index 2bf64baca2e0..4dc7ae72922f 100644 return 0; } -@@ -1464,6 +1466,7 @@ static void vchiq_remove(struct platform_device *pdev) +@@ -1464,6 +1466,7 @@ static void vchiq_remove(struct platform { struct vchiq_drv_mgmt *mgmt = dev_get_drvdata(&pdev->dev); @@ -39,6 +37,3 @@ index 2bf64baca2e0..4dc7ae72922f 100644 vchiq_device_unregister(bcm2835_audio); vchiq_device_unregister(bcm2835_camera); vchiq_device_unregister(bcm2835_codec); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0157-pinctrl-bcm2835-Remove-gpiochip-on-error.patch b/target/linux/bcm27xx/patches-6.18/0157-pinctrl-bcm2835-Remove-gpiochip-on-error.patch index 5ef21137a75..87cec48427c 100644 --- a/target/linux/bcm27xx/patches-6.18/0157-pinctrl-bcm2835-Remove-gpiochip-on-error.patch +++ b/target/linux/bcm27xx/patches-6.18/0157-pinctrl-bcm2835-Remove-gpiochip-on-error.patch @@ -12,11 +12,9 @@ Signed-off-by: Phil Elwell drivers/pinctrl/bcm/pinctrl-bcm2835.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c -index c165674c5b4d..77f84ac4b424 100644 --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c -@@ -1426,7 +1426,7 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev) +@@ -1426,7 +1426,7 @@ static int bcm2835_pinctrl_probe(struct girq->default_type = IRQ_TYPE_NONE; girq->handler = handle_level_irq; @@ -25,6 +23,3 @@ index c165674c5b4d..77f84ac4b424 100644 if (err) { dev_err(dev, "could not add GPIO chip\n"); goto out_remove; --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0158-dt-bindings-pci-Add-DT-docs-for-Brcmstb-PCIe-device.patch b/target/linux/bcm27xx/patches-6.18/0158-dt-bindings-pci-Add-DT-docs-for-Brcmstb-PCIe-device.patch index 0d41ff54fbd..5f7b38684e4 100644 --- a/target/linux/bcm27xx/patches-6.18/0158-dt-bindings-pci-Add-DT-docs-for-Brcmstb-PCIe-device.patch +++ b/target/linux/bcm27xx/patches-6.18/0158-dt-bindings-pci-Add-DT-docs-for-Brcmstb-PCIe-device.patch @@ -13,9 +13,6 @@ Signed-off-by: Jim Quinlan 1 file changed, 59 insertions(+) create mode 100644 Documentation/devicetree/bindings/pci/brcmstb-pcie.txt -diff --git a/Documentation/devicetree/bindings/pci/brcmstb-pcie.txt b/Documentation/devicetree/bindings/pci/brcmstb-pcie.txt -new file mode 100644 -index 000000000000..a1a9ad5e70ca --- /dev/null +++ b/Documentation/devicetree/bindings/pci/brcmstb-pcie.txt @@ -0,0 +1,59 @@ @@ -78,6 +75,3 @@ index 000000000000..a1a9ad5e70ca + max-link-speed = <1>; + linux,pci-domain = <0>; + }; --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0159-bcmgenet-Disable-skip_umac_reset-by-default.patch b/target/linux/bcm27xx/patches-6.18/0159-bcmgenet-Disable-skip_umac_reset-by-default.patch index 73e1ae7e1eb..7d67711f6a3 100644 --- a/target/linux/bcm27xx/patches-6.18/0159-bcmgenet-Disable-skip_umac_reset-by-default.patch +++ b/target/linux/bcm27xx/patches-6.18/0159-bcmgenet-Disable-skip_umac_reset-by-default.patch @@ -10,8 +10,6 @@ Signed-off-by: popcornmix drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -index 226af052bf53..d095968730c5 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -65,7 +65,7 @@ @@ -23,6 +21,3 @@ index 226af052bf53..d095968730c5 100644 module_param(skip_umac_reset, bool, 0444); MODULE_PARM_DESC(skip_umac_reset, "Skip UMAC reset step"); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0160-media-dt-bindings-media-Add-binding-for-the-Raspberr.patch b/target/linux/bcm27xx/patches-6.18/0160-media-dt-bindings-media-Add-binding-for-the-Raspberr.patch index 15f5a2a0446..a7ed8882a13 100644 --- a/target/linux/bcm27xx/patches-6.18/0160-media-dt-bindings-media-Add-binding-for-the-Raspberr.patch +++ b/target/linux/bcm27xx/patches-6.18/0160-media-dt-bindings-media-Add-binding-for-the-Raspberr.patch @@ -13,9 +13,6 @@ Signed-off-by: Dave Stevenson 2 files changed, 79 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/rpivid_hevc.yaml -diff --git a/Documentation/devicetree/bindings/media/rpivid_hevc.yaml b/Documentation/devicetree/bindings/media/rpivid_hevc.yaml -new file mode 100644 -index 000000000000..ce6b81a10303 --- /dev/null +++ b/Documentation/devicetree/bindings/media/rpivid_hevc.yaml @@ -0,0 +1,72 @@ @@ -91,8 +88,6 @@ index 000000000000..ce6b81a10303 + }; + +... -diff --git a/MAINTAINERS b/MAINTAINERS -index 291a8a6710a1..d5ee2cc41752 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4856,6 +4856,13 @@ S: Maintained @@ -109,6 +104,3 @@ index 291a8a6710a1..d5ee2cc41752 100644 BROADCOM BCM47XX MIPS ARCHITECTURE M: Hauke Mehrtens M: Rafał Miłecki --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0161-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch b/target/linux/bcm27xx/patches-6.18/0161-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch index b9369e41811..737d868e4ff 100644 --- a/target/linux/bcm27xx/patches-6.18/0161-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch +++ b/target/linux/bcm27xx/patches-6.18/0161-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch @@ -30,19 +30,17 @@ Signed-off-by: Phil Elwell drivers/spi/spi.c | 9 +++++++++ 1 file changed, 9 insertions(+) -diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c -index 87d829d2a842..be6cf700db32 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c -@@ -3876,6 +3876,7 @@ static int spi_set_cs_timing(struct spi_device *spi) - */ - int spi_setup(struct spi_device *spi) +@@ -3858,6 +3858,7 @@ static int spi_set_cs_timing(struct spi_ + + static int __spi_setup(struct spi_device *spi, bool initial_setup) { + struct spi_controller *ctlr = spi->controller; unsigned bad_bits, ugly_bits; int status; -@@ -3902,6 +3903,14 @@ int spi_setup(struct spi_device *spi) +@@ -3884,6 +3885,14 @@ static int __spi_setup(struct spi_device "setup: MOSI configured to idle low and high at the same time.\n"); return -EINVAL; } @@ -57,6 +55,3 @@ index 87d829d2a842..be6cf700db32 100644 /* * Help drivers fail *cleanly* when they need options * that aren't supported with their current controller. --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0162-media-uapi-v4l2-core-Add-sensor-ancillary-data-V4L2-.patch b/target/linux/bcm27xx/patches-6.18/0162-media-uapi-v4l2-core-Add-sensor-ancillary-data-V4L2-.patch index aaaaabaad0a..31134f96ab1 100644 --- a/target/linux/bcm27xx/patches-6.18/0162-media-uapi-v4l2-core-Add-sensor-ancillary-data-V4L2-.patch +++ b/target/linux/bcm27xx/patches-6.18/0162-media-uapi-v4l2-core-Add-sensor-ancillary-data-V4L2-.patch @@ -18,11 +18,9 @@ Signed-off-by: Naushir Patuck 4 files changed, 35 insertions(+) create mode 100644 Documentation/userspace-api/media/v4l/pixfmt-meta-sensor-data.rst -diff --git a/Documentation/userspace-api/media/v4l/meta-formats.rst b/Documentation/userspace-api/media/v4l/meta-formats.rst -index 0de80328c36b..3212333f04d3 100644 --- a/Documentation/userspace-api/media/v4l/meta-formats.rst +++ b/Documentation/userspace-api/media/v4l/meta-formats.rst -@@ -19,6 +19,7 @@ These formats are used for the :ref:`metadata` interface only. +@@ -19,6 +19,7 @@ These formats are used for the :ref:`met metafmt-pisp-be metafmt-pisp-fe metafmt-rkisp1 @@ -30,9 +28,6 @@ index 0de80328c36b..3212333f04d3 100644 metafmt-uvc metafmt-uvc-msxu-1-5 metafmt-vivid -diff --git a/Documentation/userspace-api/media/v4l/pixfmt-meta-sensor-data.rst b/Documentation/userspace-api/media/v4l/pixfmt-meta-sensor-data.rst -new file mode 100644 -index 000000000000..4a67e204d08a --- /dev/null +++ b/Documentation/userspace-api/media/v4l/pixfmt-meta-sensor-data.rst @@ -0,0 +1,32 @@ @@ -68,11 +63,9 @@ index 000000000000..4a67e204d08a +field in :c:type:`v4l2_subdev_format` is set to 1. Note that this size is fixed +and cannot be modified with a call to :c:type:`VIDIOC_SUBDEV_S_FMT`. + -diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c -index 5e019c10afa3..2ed4b6dc0f47 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c -@@ -1486,6 +1486,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) +@@ -1486,6 +1486,7 @@ static void v4l_fill_fmtdesc(struct v4l2 case V4L2_META_FMT_GENERIC_CSI2_16: descr = "8-bit Generic Meta, 16b CSI-2"; break; case V4L2_META_FMT_GENERIC_CSI2_20: descr = "8-bit Generic Meta, 20b CSI-2"; break; case V4L2_META_FMT_GENERIC_CSI2_24: descr = "8-bit Generic Meta, 24b CSI-2"; break; @@ -80,8 +73,6 @@ index 5e019c10afa3..2ed4b6dc0f47 100644 default: /* Compressed formats */ -diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h -index 30f9ba7f4816..d08abc485dfe 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -874,6 +874,7 @@ struct v4l2_pix_format { @@ -92,6 +83,3 @@ index 30f9ba7f4816..d08abc485dfe 100644 /* Vendor specific - used for RK_ISP1 camera sub-system */ #define V4L2_META_FMT_RK_ISP1_PARAMS v4l2_fourcc('R', 'K', '1', 'P') /* Rockchip ISP1 3A Parameters */ --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0163-media-uapi-Add-MEDIA_BUS_FMT_SENSOR_DATA-media-bus-f.patch b/target/linux/bcm27xx/patches-6.18/0163-media-uapi-Add-MEDIA_BUS_FMT_SENSOR_DATA-media-bus-f.patch index ee2c0ee5569..ded7f9c703d 100644 --- a/target/linux/bcm27xx/patches-6.18/0163-media-uapi-Add-MEDIA_BUS_FMT_SENSOR_DATA-media-bus-f.patch +++ b/target/linux/bcm27xx/patches-6.18/0163-media-uapi-Add-MEDIA_BUS_FMT_SENSOR_DATA-media-bus-f.patch @@ -12,11 +12,9 @@ Signed-off-by: Naushir Patuck include/uapi/linux/media-bus-format.h | 3 ++ 2 files changed, 33 insertions(+) -diff --git a/Documentation/userspace-api/media/v4l/subdev-formats.rst b/Documentation/userspace-api/media/v4l/subdev-formats.rst -index 2a94371448dc..2d9d4e1802d4 100644 --- a/Documentation/userspace-api/media/v4l/subdev-formats.rst +++ b/Documentation/userspace-api/media/v4l/subdev-formats.rst -@@ -8713,3 +8713,33 @@ and finally the bit number in subscript. "x" indicates a padding bit. +@@ -8713,3 +8713,33 @@ and finally the bit number in subscript. - x - x - x @@ -50,8 +48,6 @@ index 2a94371448dc..2d9d4e1802d4 100644 + - Sensor vendor specific ancillary metadata. Some vendors follow a generic + CSI-2/SMIA embedded data format as described in the `CSI-2 specification. + `_ -diff --git a/include/uapi/linux/media-bus-format.h b/include/uapi/linux/media-bus-format.h -index ff62056feed5..b434cb9c2b2c 100644 --- a/include/uapi/linux/media-bus-format.h +++ b/include/uapi/linux/media-bus-format.h @@ -185,4 +185,7 @@ @@ -62,6 +58,3 @@ index ff62056feed5..b434cb9c2b2c 100644 +#define MEDIA_BUS_FMT_SENSOR_DATA 0x7002 + #endif /* __LINUX_MEDIA_BUS_FORMAT_H */ --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0164-media-uapi-v4l2-core-Add-ISP-statistics-output-V4L2-.patch b/target/linux/bcm27xx/patches-6.18/0164-media-uapi-v4l2-core-Add-ISP-statistics-output-V4L2-.patch index 89270e1a3e3..045cbb88469 100644 --- a/target/linux/bcm27xx/patches-6.18/0164-media-uapi-v4l2-core-Add-ISP-statistics-output-V4L2-.patch +++ b/target/linux/bcm27xx/patches-6.18/0164-media-uapi-v4l2-core-Add-ISP-statistics-output-V4L2-.patch @@ -18,11 +18,9 @@ Signed-off-by: Naushir Patuck 4 files changed, 44 insertions(+) create mode 100644 Documentation/userspace-api/media/v4l/pixfmt-meta-bcm2835-isp-stats.rst -diff --git a/Documentation/userspace-api/media/v4l/meta-formats.rst b/Documentation/userspace-api/media/v4l/meta-formats.rst -index 3212333f04d3..c6d7b199be9d 100644 --- a/Documentation/userspace-api/media/v4l/meta-formats.rst +++ b/Documentation/userspace-api/media/v4l/meta-formats.rst -@@ -12,6 +12,7 @@ These formats are used for the :ref:`metadata` interface only. +@@ -12,6 +12,7 @@ These formats are used for the :ref:`met .. toctree:: :maxdepth: 1 @@ -30,9 +28,6 @@ index 3212333f04d3..c6d7b199be9d 100644 metafmt-c3-isp metafmt-d4xx metafmt-generic -diff --git a/Documentation/userspace-api/media/v4l/pixfmt-meta-bcm2835-isp-stats.rst b/Documentation/userspace-api/media/v4l/pixfmt-meta-bcm2835-isp-stats.rst -new file mode 100644 -index 000000000000..f974774c8252 --- /dev/null +++ b/Documentation/userspace-api/media/v4l/pixfmt-meta-bcm2835-isp-stats.rst @@ -0,0 +1,41 @@ @@ -77,11 +72,9 @@ index 000000000000..f974774c8252 + :functions: bcm2835_isp_stats_hist bcm2835_isp_stats_region + bcm2835_isp_stats_focus bcm2835_isp_stats + -diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c -index 2ed4b6dc0f47..9fb5528fa807 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c -@@ -1487,6 +1487,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) +@@ -1487,6 +1487,7 @@ static void v4l_fill_fmtdesc(struct v4l2 case V4L2_META_FMT_GENERIC_CSI2_20: descr = "8-bit Generic Meta, 20b CSI-2"; break; case V4L2_META_FMT_GENERIC_CSI2_24: descr = "8-bit Generic Meta, 24b CSI-2"; break; case V4L2_META_FMT_SENSOR_DATA: descr = "Sensor Ancillary Metadata"; break; @@ -89,8 +82,6 @@ index 2ed4b6dc0f47..9fb5528fa807 100644 default: /* Compressed formats */ -diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h -index d08abc485dfe..c73999fa011b 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -875,6 +875,7 @@ struct v4l2_pix_format { @@ -101,6 +92,3 @@ index d08abc485dfe..c73999fa011b 100644 /* Vendor specific - used for RK_ISP1 camera sub-system */ #define V4L2_META_FMT_RK_ISP1_PARAMS v4l2_fourcc('R', 'K', '1', 'P') /* Rockchip ISP1 3A Parameters */ --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0165-media-uapi-v4l-ctrls-Add-CID-base-for-the-bcm2835-is.patch b/target/linux/bcm27xx/patches-6.18/0165-media-uapi-v4l-ctrls-Add-CID-base-for-the-bcm2835-is.patch index 7f3cdcfecbd..f5f2158a281 100644 --- a/target/linux/bcm27xx/patches-6.18/0165-media-uapi-v4l-ctrls-Add-CID-base-for-the-bcm2835-is.patch +++ b/target/linux/bcm27xx/patches-6.18/0165-media-uapi-v4l-ctrls-Add-CID-base-for-the-bcm2835-is.patch @@ -14,9 +14,6 @@ Signed-off-by: Naushir Patuck 3 files changed, 132 insertions(+) create mode 100644 Documentation/admin-guide/media/bcm2835-isp.rst -diff --git a/Documentation/admin-guide/media/bcm2835-isp.rst b/Documentation/admin-guide/media/bcm2835-isp.rst -new file mode 100644 -index 000000000000..e1c19f78435e --- /dev/null +++ b/Documentation/admin-guide/media/bcm2835-isp.rst @@ -0,0 +1,127 @@ @@ -147,11 +144,9 @@ index 000000000000..e1c19f78435e + bcm2835_isp_black_level bcm2835_isp_geq bcm2835_isp_gamma + bcm2835_isp_denoise bcm2835_isp_sharpen + bcm2835_isp_dpc_mode bcm2835_isp_dpc -diff --git a/Documentation/userspace-api/media/drivers/index.rst b/Documentation/userspace-api/media/drivers/index.rst -index d706cb47b112..65bcd99cb96f 100644 --- a/Documentation/userspace-api/media/drivers/index.rst +++ b/Documentation/userspace-api/media/drivers/index.rst -@@ -32,6 +32,7 @@ For more details see the file COPYING in the source distribution of Linux. +@@ -32,6 +32,7 @@ For more details see the file COPYING in cx2341x-uapi dw100 imx-uapi @@ -159,8 +154,6 @@ index d706cb47b112..65bcd99cb96f 100644 max2175 npcm-video omap3isp-uapi -diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h -index 3ba7408ee7aa..8455190494eb 100644 --- a/include/uapi/linux/v4l2-controls.h +++ b/include/uapi/linux/v4l2-controls.h @@ -228,6 +228,10 @@ enum v4l2_colorfx { @@ -174,6 +167,3 @@ index 3ba7408ee7aa..8455190494eb 100644 /* MPEG-class control IDs */ /* The MPEG controls are applicable to all codec controls * and the 'MPEG' part of the define is historical */ --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0166-staging-vc04_services-mmal-vchiq-Update-parameters-l.patch b/target/linux/bcm27xx/patches-6.18/0166-staging-vc04_services-mmal-vchiq-Update-parameters-l.patch index 2d836aed3a9..f4c32ca08a6 100644 --- a/target/linux/bcm27xx/patches-6.18/0166-staging-vc04_services-mmal-vchiq-Update-parameters-l.patch +++ b/target/linux/bcm27xx/patches-6.18/0166-staging-vc04_services-mmal-vchiq-Update-parameters-l.patch @@ -10,8 +10,6 @@ Signed-off-by: Dave Stevenson drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h | 6 ++++++ 1 file changed, 6 insertions(+) -diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h -index 045eba62e9de..3ede6be20633 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h @@ -609,6 +609,12 @@ enum mmal_parameter_video_type { @@ -27,6 +25,3 @@ index 045eba62e9de..3ede6be20633 100644 }; /** Valid mirror modes */ --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0167-staging-vc04_services-bcm2835-camera-Request-headers.patch b/target/linux/bcm27xx/patches-6.18/0167-staging-vc04_services-bcm2835-camera-Request-headers.patch index 79a6e5198c4..34762ae8f96 100644 --- a/target/linux/bcm27xx/patches-6.18/0167-staging-vc04_services-bcm2835-camera-Request-headers.patch +++ b/target/linux/bcm27xx/patches-6.18/0167-staging-vc04_services-bcm2835-camera-Request-headers.patch @@ -13,11 +13,9 @@ Signed-off-by: Dave Stevenson .../staging/vc04_services/bcm2835-camera/bcm2835-camera.c | 6 ++++++ 1 file changed, 6 insertions(+) -diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c -index fa7ea4ca4c36..9dbb8817960c 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c -@@ -1724,6 +1724,12 @@ static int mmal_init(struct bcm2835_mmal_dev *dev) +@@ -1724,6 +1724,12 @@ static int mmal_init(struct bcm2835_mmal MMAL_PARAMETER_MINIMISE_FRAGMENTATION, &enable, sizeof(enable)); @@ -30,6 +28,3 @@ index fa7ea4ca4c36..9dbb8817960c 100644 } ret = bcm2835_mmal_set_all_camera_controls(dev); if (ret < 0) { --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0168-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch b/target/linux/bcm27xx/patches-6.18/0168-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch index f1bdebdc170..0742c526c8c 100644 --- a/target/linux/bcm27xx/patches-6.18/0168-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch +++ b/target/linux/bcm27xx/patches-6.18/0168-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch @@ -15,8 +15,6 @@ Signed-off-by: Phil Elwell drivers/gpio/gpiolib.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c -index 67f362d53d53..4cd0ac7e075d 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -51,6 +51,8 @@ @@ -28,7 +26,7 @@ index 67f362d53d53..4cd0ac7e075d 100644 /* Device and char device-related information */ static DEFINE_IDA(gpio_ida); static dev_t gpio_devt; -@@ -3018,8 +3020,8 @@ int gpiod_direction_output_nonotify(struct gpio_desc *desc, int value) +@@ -3018,8 +3020,8 @@ int gpiod_direction_output_nonotify(stru value = !!value; /* GPIOs used for enabled IRQs shall not be set as output */ @@ -39,7 +37,7 @@ index 67f362d53d53..4cd0ac7e075d 100644 gpiod_err(desc, "%s: tried to set a GPIO tied to an IRQ as output\n", __func__); -@@ -4058,8 +4060,8 @@ int gpiochip_lock_as_irq(struct gpio_chip *gc, unsigned int offset) +@@ -4058,8 +4060,8 @@ int gpiochip_lock_as_irq(struct gpio_chi } /* To be valid for IRQ the line needs to be input or open drain */ @@ -50,6 +48,3 @@ index 67f362d53d53..4cd0ac7e075d 100644 gpiochip_err(gc, "%s: tried to flag a GPIO set as output for IRQ\n", __func__); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0169-brcmfmac-Prefer-a-ccode-from-OTP-over-nvram-file.patch b/target/linux/bcm27xx/patches-6.18/0169-brcmfmac-Prefer-a-ccode-from-OTP-over-nvram-file.patch index 7db33f569b7..e98382698df 100644 --- a/target/linux/bcm27xx/patches-6.18/0169-brcmfmac-Prefer-a-ccode-from-OTP-over-nvram-file.patch +++ b/target/linux/bcm27xx/patches-6.18/0169-brcmfmac-Prefer-a-ccode-from-OTP-over-nvram-file.patch @@ -12,8 +12,6 @@ Signed-off-by: Phil Elwell .../broadcom/brcm80211/brcmfmac/firmware.c | 21 +++++++++- 2 files changed, 47 insertions(+), 13 deletions(-) -diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c -index bb96b87b2a6e..7c23f953739a 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c @@ -9,6 +9,7 @@ @@ -24,7 +22,7 @@ index bb96b87b2a6e..7c23f953739a 100644 #include #include #include -@@ -8242,31 +8243,45 @@ static void brcmf_cfg80211_reg_notifier(struct wiphy *wiphy, +@@ -8242,31 +8243,45 @@ static void brcmf_cfg80211_reg_notifier( struct brcmf_if *ifp = brcmf_get_ifp(cfg->pub, 0); struct brcmf_pub *drvr = cfg->pub; struct brcmf_fil_country_le ccreq; @@ -82,8 +80,6 @@ index bb96b87b2a6e..7c23f953739a 100644 if (err) return; -diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c -index ef79924fd8f4..0ef3d8dca536 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c @@ -10,6 +10,7 @@ @@ -103,7 +99,7 @@ index ef79924fd8f4..0ef3d8dca536 100644 /** * struct nvram_parser - internal info for parser. * -@@ -566,11 +569,27 @@ static int brcmf_fw_request_nvram_done(const struct firmware *fw, void *ctx) +@@ -566,11 +569,27 @@ static int brcmf_fw_request_nvram_done(c } } @@ -132,6 +128,3 @@ index ef79924fd8f4..0ef3d8dca536 100644 if (free_bcm47xx_nvram) bcm47xx_nvram_release_contents(data); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0170-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch b/target/linux/bcm27xx/patches-6.18/0170-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch index 567ac12297e..742d27f793a 100644 --- a/target/linux/bcm27xx/patches-6.18/0170-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch +++ b/target/linux/bcm27xx/patches-6.18/0170-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch @@ -713,11 +713,9 @@ Signed-off-by: Dave Stevenson create mode 100644 drivers/media/platform/bcm2835/bcm2835-unicam.c create mode 100644 drivers/media/platform/bcm2835/vc4-regs-unicam.h -diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig -index 9287faafdce5..12ce84097caa 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig -@@ -67,6 +67,7 @@ source "drivers/media/platform/amlogic/Kconfig" +@@ -67,6 +67,7 @@ source "drivers/media/platform/amlogic/K source "drivers/media/platform/amphion/Kconfig" source "drivers/media/platform/aspeed/Kconfig" source "drivers/media/platform/atmel/Kconfig" @@ -725,8 +723,6 @@ index 9287faafdce5..12ce84097caa 100644 source "drivers/media/platform/broadcom/Kconfig" source "drivers/media/platform/cadence/Kconfig" source "drivers/media/platform/chips-media/Kconfig" -diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile -index 6fd7db0541c7..243cdbdeddec 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -10,6 +10,7 @@ obj-y += amlogic/ @@ -737,9 +733,6 @@ index 6fd7db0541c7..243cdbdeddec 100644 obj-y += broadcom/ obj-y += cadence/ obj-y += chips-media/ -diff --git a/drivers/media/platform/bcm2835/Kconfig b/drivers/media/platform/bcm2835/Kconfig -new file mode 100644 -index 000000000000..09d20dd52452 --- /dev/null +++ b/drivers/media/platform/bcm2835/Kconfig @@ -0,0 +1,24 @@ @@ -767,9 +760,6 @@ index 000000000000..09d20dd52452 + + To compile this driver as a module, choose M here. The module will be + called bcm2835-unicam. -diff --git a/drivers/media/platform/bcm2835/Makefile b/drivers/media/platform/bcm2835/Makefile -new file mode 100644 -index 000000000000..55a48691f513 --- /dev/null +++ b/drivers/media/platform/bcm2835/Makefile @@ -0,0 +1,4 @@ @@ -777,9 +767,6 @@ index 000000000000..55a48691f513 + +bcm2835-unicam-legacy-y := bcm2835-unicam.o +obj-$(CONFIG_VIDEO_BCM2835_UNICAM_LEGACY) += bcm2835-unicam-legacy.o -diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c -new file mode 100644 -index 000000000000..1ce6721e7650 --- /dev/null +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c @@ -0,0 +1,3522 @@ @@ -4305,9 +4292,6 @@ index 000000000000..1ce6721e7650 +MODULE_DESCRIPTION("BCM2835 Unicam driver"); +MODULE_LICENSE("GPL"); +MODULE_VERSION(UNICAM_VERSION); -diff --git a/drivers/media/platform/bcm2835/vc4-regs-unicam.h b/drivers/media/platform/bcm2835/vc4-regs-unicam.h -new file mode 100644 -index 000000000000..ae059a171d0f --- /dev/null +++ b/drivers/media/platform/bcm2835/vc4-regs-unicam.h @@ -0,0 +1,253 @@ @@ -4564,6 +4548,3 @@ index 000000000000..ae059a171d0f +#define UNICAM_FL1 BIT(9) + +#endif --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0171-media-platform-Move-bcm2835-unicam-compatible-to-dow.patch b/target/linux/bcm27xx/patches-6.18/0171-media-platform-Move-bcm2835-unicam-compatible-to-dow.patch index 6e56bf511ae..4fe5e17ceb7 100644 --- a/target/linux/bcm27xx/patches-6.18/0171-media-platform-Move-bcm2835-unicam-compatible-to-dow.patch +++ b/target/linux/bcm27xx/patches-6.18/0171-media-platform-Move-bcm2835-unicam-compatible-to-dow.patch @@ -22,11 +22,9 @@ Signed-off-by: Dave Stevenson drivers/media/platform/broadcom/bcm2835-unicam.c | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) -diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c -index 1ce6721e7650..1c4ae29d69a0 100644 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c -@@ -3381,6 +3381,11 @@ static int unicam_probe(struct platform_device *pdev) +@@ -3381,6 +3381,11 @@ static int unicam_probe(struct platform_ * device tree requests it. */ unicam->mc_api = media_controller; @@ -38,7 +36,7 @@ index 1ce6721e7650..1c4ae29d69a0 100644 if (of_property_read_bool(pdev->dev.of_node, "brcm,media-controller")) unicam->mc_api = true; -@@ -3500,7 +3505,8 @@ static void unicam_remove(struct platform_device *pdev) +@@ -3500,7 +3505,8 @@ static void unicam_remove(struct platfor } static const struct of_device_id unicam_of_match[] = { @@ -48,11 +46,9 @@ index 1ce6721e7650..1c4ae29d69a0 100644 { /* sentinel */ }, }; MODULE_DEVICE_TABLE(of, unicam_of_match); -diff --git a/drivers/media/platform/broadcom/bcm2835-unicam.c b/drivers/media/platform/broadcom/bcm2835-unicam.c -index f10064107d54..1fe30149d5e2 100644 --- a/drivers/media/platform/broadcom/bcm2835-unicam.c +++ b/drivers/media/platform/broadcom/bcm2835-unicam.c -@@ -2735,7 +2735,7 @@ static void unicam_remove(struct platform_device *pdev) +@@ -2735,7 +2735,7 @@ static void unicam_remove(struct platfor } static const struct of_device_id unicam_of_match[] = { @@ -61,6 +57,3 @@ index f10064107d54..1fe30149d5e2 100644 { /* sentinel */ }, }; MODULE_DEVICE_TABLE(of, unicam_of_match); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0172-serial-8250-bcm2835aux-defer-if-clock-is-zero.patch b/target/linux/bcm27xx/patches-6.18/0172-serial-8250-bcm2835aux-defer-if-clock-is-zero.patch index e9bab6da627..507572d1bf2 100644 --- a/target/linux/bcm27xx/patches-6.18/0172-serial-8250-bcm2835aux-defer-if-clock-is-zero.patch +++ b/target/linux/bcm27xx/patches-6.18/0172-serial-8250-bcm2835aux-defer-if-clock-is-zero.patch @@ -10,11 +10,9 @@ Signed-off-by: Phil Elwell drivers/tty/serial/8250/8250_bcm2835aux.c | 7 +++++++ 1 file changed, 7 insertions(+) -diff --git a/drivers/tty/serial/8250/8250_bcm2835aux.c b/drivers/tty/serial/8250/8250_bcm2835aux.c -index 0609582a62f7..9c587f873ba5 100644 --- a/drivers/tty/serial/8250/8250_bcm2835aux.c +++ b/drivers/tty/serial/8250/8250_bcm2835aux.c -@@ -156,6 +156,13 @@ static int bcm2835aux_serial_probe(struct platform_device *pdev) +@@ -156,6 +156,13 @@ static int bcm2835aux_serial_probe(struc */ up.port.uartclk *= 2; @@ -28,6 +26,3 @@ index 0609582a62f7..9c587f873ba5 100644 /* register the port */ ret = serial8250_register_8250_port(&up); if (ret < 0) { --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0173-leds-Add-the-actpwr-trigger.patch b/target/linux/bcm27xx/patches-6.18/0173-leds-Add-the-actpwr-trigger.patch index 5b8315eb859..14cb7ff0edc 100644 --- a/target/linux/bcm27xx/patches-6.18/0173-leds-Add-the-actpwr-trigger.patch +++ b/target/linux/bcm27xx/patches-6.18/0173-leds-Add-the-actpwr-trigger.patch @@ -15,11 +15,9 @@ Signed-off-by: Phil Elwell 3 files changed, 202 insertions(+) create mode 100644 drivers/leds/trigger/ledtrig-actpwr.c -diff --git a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig -index 011b27ef30ec..c48c1c3e9e11 100644 --- a/drivers/leds/trigger/Kconfig +++ b/drivers/leds/trigger/Kconfig -@@ -168,4 +168,15 @@ config LEDS_TRIGGER_INPUT_EVENTS +@@ -177,4 +177,15 @@ config LEDS_TRIGGER_INPUT_EVENTS When build as a module this driver will be called ledtrig-input-events. @@ -35,18 +33,13 @@ index 011b27ef30ec..c48c1c3e9e11 100644 + If unsure, say N. + endif # LEDS_TRIGGERS -diff --git a/drivers/leds/trigger/Makefile b/drivers/leds/trigger/Makefile -index 5c4653d7f4de..c17cbd1939d5 100644 --- a/drivers/leds/trigger/Makefile +++ b/drivers/leds/trigger/Makefile -@@ -17,3 +17,4 @@ obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o - obj-$(CONFIG_LEDS_TRIGGER_PATTERN) += ledtrig-pattern.o +@@ -18,3 +18,4 @@ obj-$(CONFIG_LEDS_TRIGGER_PATTERN) += le obj-$(CONFIG_LEDS_TRIGGER_TTY) += ledtrig-tty.o obj-$(CONFIG_LEDS_TRIGGER_INPUT_EVENTS) += ledtrig-input-events.o + obj-$(CONFIG_LEDS_TRIGGER_NETWORK) += ledtrig-network.o +obj-$(CONFIG_LEDS_TRIGGER_ACTPWR) += ledtrig-actpwr.o -diff --git a/drivers/leds/trigger/ledtrig-actpwr.c b/drivers/leds/trigger/ledtrig-actpwr.c -new file mode 100644 -index 000000000000..d0428f669bfb --- /dev/null +++ b/drivers/leds/trigger/ledtrig-actpwr.c @@ -0,0 +1,190 @@ @@ -240,6 +233,3 @@ index 000000000000..d0428f669bfb +MODULE_AUTHOR("Phil Elwell "); +MODULE_DESCRIPTION("ACT/PWR LED trigger"); +MODULE_LICENSE("GPL v2"); --- -2.54.0 - diff --git a/target/linux/bcm27xx/patches-6.18/0174-staging-fbtft-Add-support-for-display-variants.patch b/target/linux/bcm27xx/patches-6.18/0174-staging-fbtft-Add-support-for-display-variants.patch index 09425d42232..d05e75a9953 100644 --- a/target/linux/bcm27xx/patches-6.18/0174-staging-fbtft-Add-support-for-display-variants.patch +++ b/target/linux/bcm27xx/patches-6.18/0174-staging-fbtft-Add-support-for-display-variants.patch @@ -18,8 +18,6 @@ Signed-off-by: Phil Elwell drivers/staging/fbtft/fbtft.h | 112 +++++++++++++++++++---------- 3 files changed, 126 insertions(+), 40 deletions(-) -diff --git a/drivers/staging/fbtft/fb_st7735r.c b/drivers/staging/fbtft/fb_st7735r.c -index 9670a8989b91..a04365d1c75e 100644 --- a/drivers/staging/fbtft/fb_st7735r.c +++ b/drivers/staging/fbtft/fb_st7735r.c @@ -16,6 +16,10 @@ @@ -33,7 +31,7 @@ index 9670a8989b91..a04365d1c75e 100644 static const s16 default_init_sequence[] = { -1, MIPI_DCS_SOFT_RESET, -2, 150, /* delay */ -@@ -94,6 +98,14 @@ static void set_addr_win(struct fbtft_par *par, int xs, int ys, int xe, int ye) +@@ -94,6 +98,14 @@ static void set_addr_win(struct fbtft_pa write_reg(par, MIPI_DCS_WRITE_MEMORY_START); } @@ -86,8 +84,6 @@ index 9670a8989b91..a04365d1c75e 100644 MODULE_DESCRIPTION("FB driver for the ST7735R LCD Controller"); MODULE_AUTHOR("Noralf Tronnes"); -diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c -index 8a5ccc8ae0a1..7e0f6b14aac8 100644 --- a/drivers/staging/fbtft/fbtft-core.c +++ b/drivers/staging/fbtft/fbtft-core.c @@ -24,6 +24,8 @@ @@ -99,7 +95,7 @@ index 8a5ccc8ae0a1..7e0f6b14aac8 100644 #include